Merge pull request #6 from yuri-zubov/master

Fixes tests:
- Add Ruby 2.1 - 2.6 and Rails 5, 6 to Travis matrix
- Add Rails 5, 6 to Appraisals config
- Fixes implementation for form helper tests

Author: abrom

.travis.yml

@@ -1,15 +1,26 @@
 rvm:
-  - 1.9.2
   - 1.9.3
-  - 2.0.0
+  - 2.0
+  - 2.1
+  - 2.2
+  - 2.3
+  - 2.4
+  - 2.5
+  - 2.6
 env:
   - "RAILS_VERSION=3.1.0"
   - "RAILS_VERSION=3.2.0"
   - "RAILS_VERSION=4.0.0"
+  - "RAILS_VERSION=4.1.0"
+  - "RAILS_VERSION=4.3.0"
+  - "RAILS_VERSION=5.0.0"
+  - "RAILS_VERSION=5.1.0"
+  - "RAILS_VERSION=5.2.0"
+  - "RAILS_VERSION=6.0.0"
 matrix:
   exclude:
     - rvm: 1.9.2
-      env: "RAILS_VERSION=4.0.0"
+      env: "RAILS_VERSION=3.1.0"
 branches:
   only:
     - master

Appraisals

@@ -5,3 +5,11 @@ end
 appraise "rails-4" do
   gem "rails", "~> 4.0"
 end
+
+appraise "rails-5" do
+  gem "rails", "~> 5.0"
+end
+
+appraise "rails-6" do
+  gem "rails", "~> 6.0"
+end

Gemfile

@@ -2,5 +2,4 @@ source "http://rubygems.org"
 
 gemspec
 
-gem 'appraisal', "1.0.0.beta3"
-gem "debugger"
+gem 'appraisal', "2.2.0"

test/carmen/action_view/helpers/form_helper_test.rb test/carmen/action_view/helpers/carmen_view_helper_test.rb

@@ -1,12 +1,18 @@
 require 'test_helper'
 
-class CarmenViewHelperTest < MiniTest::Unit::TestCase
+class CarmenViewHelperTest < MiniTest::Test
   include ActionView::Helpers::FormOptionsHelper
   include ActionView::Helpers::FormTagHelper
-  include ActionDispatch::Assertions::SelectorAssertions
+
+  if ::Rails.const_defined?(:Dom)
+    include ::Rails::Dom::Testing::Assertions::SelectorAssertions
+  else
+    include ActionDispatch::Assertions::SelectorAssertions
+  end
 
   def setup
     @object = OpenStruct.new
+
     def @object.to_s; 'object'; end
   end
 
@@ -27,6 +33,10 @@ def test_basic_country_select
     assert_equal_markup(expected, html)
   end
 
+  def document_root_element
+    Nokogiri.parse(@html)
+  end
+
   def test_country_selected_value
     @html = country_select(:object, :country_code, :selected => 'OC')
     assert_select('option[selected="selected"][value="OC"]')
@@ -123,6 +133,7 @@ def test_basic_subregion_select
     expected = <<-HTML
       <select id="object_subregion_code" name="object[subregion_code]">
         <option value="AO">Airstrip One</option>
+        <option value="AT">Airstrip-Two</option>
       </select>
     HTML
 
@@ -135,6 +146,7 @@ def test_subregion_select_using_parent_code
     expected = <<-HTML
       <select id="object_subregion_code" name="object[subregion_code]">
         <option value="AO">Airstrip One</option>
+        <option value="AT">Airstrip-Two</option>
       </select>
     HTML
 
@@ -181,6 +193,7 @@ def test_basic_subregion_select_tag
     expected = <<-HTML
       <select id="subregion_code" name="subregion_code">
         <option value="AO">Airstrip One</option>
+        <option value="AT">Airstrip-Two</option>
       </select>
     HTML
 
@@ -196,6 +209,7 @@ def test_subregion_select_tag_with_priority
         <option value="AO">Airstrip One</option>
         <option disabled>-------------</option>
         <option value="AO">Airstrip One</option>
+        <option value="AT">Airstrip-Two</option>
       </select>
     HTML
 
@@ -210,6 +224,7 @@ def test_subregion_select_tag_with_prompt
       <select id="subregion_code" name="subregion_code">
         <option value="">Please select</option>
         <option value="AO">Airstrip One</option>
+        <option value="AT">Airstrip-Two</option>
       </select>
     HTML
 
@@ -252,7 +267,7 @@ def test_region_options_for_select_with_array_of_regions_and_priority
   end
 
   def test_form_builder_country_select
-    form = ActionView::Helpers::FormBuilder.new(:object, @object, self, {}, lambda{})
+    form = ActionView::Helpers::FormBuilder.new(:object, @object, self, {})
 
     html = form.country_select('attribute_name')
     expected = <<-HTML
@@ -268,14 +283,14 @@ def test_form_builder_country_select
 
   def test_form_builder_selected_country
     @object.country_code = 'OC'
-    form = ActionView::Helpers::FormBuilder.new(:object, @object, self, {}, lambda{})
+    form = ActionView::Helpers::FormBuilder.new(:object, @object, self, {})
     @html = form.country_select('country_code')
 
     assert_select('option[selected="selected"][value="OC"]')
   end
 
   def test_form_builder_country_select_deprecated_api
-    form = ActionView::Helpers::FormBuilder.new(:object, @object, self, {}, lambda{})
+    form = ActionView::Helpers::FormBuilder.new(:object, @object, self, {})
 
     html = form.country_select('attribute_name', ['ES'])
     expected = <<-HTML
@@ -292,11 +307,12 @@ def test_form_builder_country_select_deprecated_api
   end
 
   def test_form_builder_subregion_select
-    form = ActionView::Helpers::FormBuilder.new(:object, @object, self, {}, lambda{})
+    form = ActionView::Helpers::FormBuilder.new(:object, @object, self, {})
     html = form.subregion_select(:subregion_code, 'OC')
     expected = <<-HTML
       <select id="object_subregion_code" name="object[subregion_code]">
         <option value="AO">Airstrip One</option>
+        <option value="AT">Airstrip-Two</option>
       </select>
     HTML
 
@@ -305,7 +321,7 @@ def test_form_builder_subregion_select
 
   def test_form_builder_selected_subregion
     @object.subregion_code = 'AO'
-    form = ActionView::Helpers::FormBuilder.new(:object, @object, self, {}, lambda{})
+    form = ActionView::Helpers::FormBuilder.new(:object, @object, self, {})
     @html = form.subregion_select(:subregion_code, 'OC')
 
     assert_select('option[selected="selected"][value="AO"]')

test/spec_data/data/world.yml

@@ -0,0 +1,13 @@
+--- 
+- alpha_2_code: OC
+  alpha_3_code: OCE
+  numeric_code: "001"
+  type: country
+- alpha_2_code: EU
+  alpha_3_code: EUR
+  numeric_code: "002"
+  type: country
+- alpha_2_code: ES
+  alpha_3_code: EST
+  numeric_code: "003"
+  type: country

test/spec_data/data/world/oc.yml

@@ -0,0 +1,5 @@
+---
+- code: AO
+  type: province
+- code: AT
+  type: province

test/spec_data/data/world/oc/ao.yml

@@ -0,0 +1,3 @@
+---
+- code: LO
+  type: city

test/spec_data/locale/de/world.yml

@@ -0,0 +1,7 @@
+--- 
+de:
+  world:
+    eu:
+      common_name: Eurasia
+      name: Das großartige Staat von Eurasia
+      official_name: Das großartige Staat von Eurasia

test/spec_data/locale/en/world.yml

@@ -0,0 +1,15 @@
+--- 
+en:
+  world:
+    oc:
+      common_name: Oceania
+      name: Oceania
+      official_name: The Superstate of Oceania
+    eu:
+      common_name: Eurasia
+      name: Eurasia
+      official_name: The Superstate of Eurasia
+    es:
+      common_name: Eastasia
+      name: Eastasia
+      official_name: The Superstate of Eastasia

test/spec_data/locale/en/world/oc.yml

@@ -0,0 +1,8 @@
+---
+en:
+  world:
+    oc:
+      ao:
+        name: Airstrip One
+      at:
+        name: Airstrip-Two

test/spec_data/locale/en/world/oc/ao.yml

@@ -0,0 +1,7 @@
+---
+en:
+  world:
+    oc:
+      ao:
+        lo:
+          name: London

test/spec_data/overlay/data/world.yml

@@ -0,0 +1,12 @@
+---
+- alpha_2_code: SE
+  alpha_3_code: SEA
+  numeric_code: "004"
+  common_name: Sealand
+  name: Sealand
+  official_name: The Principality of Sealand
+  type: fort
+- alpha_2_code: EU
+  _enabled: false
+- alpha_2_code: ES
+  official_name: The Wonderous Country of Eastasia

test/spec_data/overlay/locale/de/world.yml

@@ -0,0 +1,3 @@
+---
+de:
+  world:

test/spec_data/overlay/locale/en/world.yml

@@ -0,0 +1,10 @@
+---
+en:
+  world:
+    es:
+      official_name: The Wonderous Country of Eastasia
+    se:
+      common_name: Sealand
+      name: Sealand
+      official_name: The Principality of Sealand
+

test/spec_data/overlay/locale/en/world/oc.yml

@@ -0,0 +1,6 @@
+---
+en:
+  world:
+    oc:
+      ao:
+        name: Airstrip Uno

test/spec_data/overlay/locale/zz/world.yml

@@ -0,0 +1,5 @@
+---
+zz:
+  world:
+    es:
+      official_name: The Zonderous Zountry of Zeastasia

test/spec_data/overlay/locale/zz/world/oc.yml

@@ -0,0 +1,6 @@
+---
+zz:
+  world:
+    oc:
+      ao:
+        name: Zairstrip Zuno

test/test_helper.rb

@@ -9,20 +9,19 @@
 require 'rails'
 require 'carmen-rails'
 require 'ostruct'
-require 'debugger'
 
 MiniTest::Spec.register_spec_type(/.*/, ActionView::TestCase)
 
 Carmen.clear_data_paths
 
-carmen_path = File.expand_path('../../../carmen', __FILE__)
+carmen_path = File.expand_path('..', __FILE__)
 
 Carmen.append_data_path(carmen_path + '/spec_data/data')
 
 locale_path = carmen_path + '/spec_data/locale'
 Carmen.i18n_backend = Carmen::I18n::Simple.new(locale_path)
 
-class MiniTest::Unit::TestCase
+class MiniTest::Test
   def assert_equal_markup(expected, actual, message=nil)
     assert_equal(clean_markup(expected), clean_markup(actual), message)
   end