Merge pull request #4608 from indrekj/translated_date_order

Raise exception when date.order includes invalid elements

2 files changed, 17 insertions, 1 deletions

diff --git a/actionpack/lib/action_view/helpers/date_helper.rb b/actionpack/lib/action_view/helpers/date_helper.rb
index f5077b034a..e095f832d1 100644
--- a/actionpack/lib/action_view/helpers/date_helper.rb
+++ b/actionpack/lib/action_view/helpers/date_helper.rb
@@ -836,7 +836,15 @@ module ActionView
         end
 
         def translated_date_order
-          I18n.translate(:'date.order', :locale => @options[:locale]) || []
+          date_order = I18n.translate(:'date.order', :locale => @options[:locale]) || []
+
+          forbidden_elements = date_order - [:year, :month, :day]
+          if forbidden_elements.any?
+            raise StandardError,
+              "#{@options[:locale]}.date.order only accepts :year, :month and :day"
+          end
+
+          date_order
         end
 
         # Build full select tag from date type and options.
diff --git a/actionpack/test/template/date_helper_i18n_test.rb b/actionpack/test/template/date_helper_i18n_test.rb
index e3d3d5ff77..ef3d7d97ee 100644
--- a/actionpack/test/template/date_helper_i18n_test.rb
+++ b/actionpack/test/template/date_helper_i18n_test.rb
@@ -118,4 +118,12 @@ class DateHelperSelectTagsI18nTests < ActiveSupport::TestCase
     I18n.expects(:translate).with(:'date.order', :locale => 'en').returns [:year, :month, :day]
     datetime_select('post', 'updated_at', :locale => 'en')
   end
+
+  def test_date_or_time_select_given_invalid_order
+    I18n.expects(:translate).with(:'date.order', :locale => 'en').returns [:invalid, :month, :day]
+
+    assert_raise StandardError do
+      datetime_select('post', 'updated_at', :locale => 'en')
+    end
+  end
 end