From 3cf2a7184bccfb15945980d52da9666ff05c5dfd Mon Sep 17 00:00:00 2001
From: Marek <marek.kirejczyk@gmail.com>
Date: Sun, 5 Jun 2016 13:12:23 +0200
Subject: Make select_year work with include_position: true option, fix #25267

---
 actionview/lib/action_view/helpers/date_helper.rb | 2 +-
 actionview/test/template/date_helper_test.rb      | 7 +++++++
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/actionview/lib/action_view/helpers/date_helper.rb b/actionview/lib/action_view/helpers/date_helper.rb
index 9042b9cffd..cee056206c 100644
--- a/actionview/lib/action_view/helpers/date_helper.rb
+++ b/actionview/lib/action_view/helpers/date_helper.rb
@@ -1058,7 +1058,7 @@ module ActionView
           prefix = @options[:prefix] || ActionView::Helpers::DateTimeSelector::DEFAULT_PREFIX
           prefix += "[#{@options[:index]}]" if @options.has_key?(:index)
 
-          field_name = @options[:field_name] || type
+          field_name = @options[:field_name] || type.to_s
           if @options[:include_position]
             field_name += "(#{ActionView::Helpers::DateTimeSelector::POSITION[type]}i)"
           end
diff --git a/actionview/test/template/date_helper_test.rb b/actionview/test/template/date_helper_test.rb
index e67d5d0e8c..0f89f2ca09 100644
--- a/actionview/test/template/date_helper_test.rb
+++ b/actionview/test/template/date_helper_test.rb
@@ -534,6 +534,13 @@ class DateHelperTest < ActionView::TestCase
 
     assert_dom_equal expected, select_year(nil, start_year: 2003, end_year: 2005, with_css_classes: { year: 'my-year' })
   end
+  
+  def test_select_year_with_position
+    expected = %(<select id="date_year_1i" name="date[year(1i)]">\n)
+    expected << %(<option value="2003">2003</option>\n<option value="2004">2004</option>\n<option value="2005">2005</option>\n)
+    expected << "</select>\n"
+    assert_dom_equal expected, select_year(Date.current, include_position: true,  start_year: 2003, end_year: 2005)
+  end
 
   def test_select_hour
     expected = %(<select id="date_hour" name="date[hour]">\n)
-- 
cgit v1.2.3