Merge branch 'master' of https://github.com/lifo/docrails

Conflicts:
	activerecord/lib/active_record/callbacks.rb

1 files changed, 19 insertions, 10 deletions

diff --git a/actionpack/test/template/date_helper_i18n_test.rb b/actionpack/test/template/date_helper_i18n_test.rb
index 63066d40cd..495a9d3f9d 100644
--- a/actionpack/test/template/date_helper_i18n_test.rb
+++ b/actionpack/test/template/date_helper_i18n_test.rb
@@ -36,16 +36,13 @@ class DateHelperDistanceOfTimeInWordsI18nTests < ActiveSupport::TestCase
     end
   end
 
-  def assert_distance_of_time_in_words_translates_key(passed, expected)
-    diff, passed_options = *passed
-    key, count = *expected
-    to = @from + diff
-
-    options = {:locale => 'en', :scope => :'datetime.distance_in_words'}
-    options[:count] = count if count
-
-    I18n.expects(:t).with(key, options)
-    distance_of_time_in_words(@from, to, passed_options.merge(:locale => 'en'))
+  def test_distance_of_time_in_words_calls_i18n_with_custom_scope
+    {
+      [30.days, { scope: :'datetime.distance_in_words_ago' }] => [:'about_x_months', 1],
+      [60.days, { scope: :'datetime.distance_in_words_ago' }] => [:'x_months',       2],
+    }.each do |passed, expected|
+      assert_distance_of_time_in_words_translates_key(passed, expected, scope: :'datetime.distance_in_words_ago')
+    end
   end
 
   def test_time_ago_in_words_passes_locale
@@ -74,6 +71,18 @@ class DateHelperDistanceOfTimeInWordsI18nTests < ActiveSupport::TestCase
       assert_equal expected, I18n.t(key, :count => count, :scope => 'datetime.distance_in_words')
     end
   end
+
+  def assert_distance_of_time_in_words_translates_key(passed, expected, expected_options = {})
+    diff, passed_options = *passed
+    key, count = *expected
+    to = @from + diff
+
+    options = { locale: 'en', scope: :'datetime.distance_in_words' }.merge!(expected_options)
+    options[:count] = count if count
+
+    I18n.expects(:t).with(key, options)
+    distance_of_time_in_words(@from, to, passed_options.merge(locale: 'en'))
+  end
 end
 
 class DateHelperSelectTagsI18nTests < ActiveSupport::TestCase