From 278186534c0ccf285a20497461f40d2e54aa20a0 Mon Sep 17 00:00:00 2001
From: Jeremy Kemper <jeremy@bitsweat.net>
Date: Tue, 3 Feb 2009 18:25:37 -0800
Subject: Bump mocha requirement for Ruby 1.9 compat. Remove uses_mocha.

---
 .../test/template/translation_helper_test.rb       | 36 ++++++++++------------
 1 file changed, 17 insertions(+), 19 deletions(-)

(limited to 'actionpack/test/template/translation_helper_test.rb')

diff --git a/actionpack/test/template/translation_helper_test.rb b/actionpack/test/template/translation_helper_test.rb
index d0d65cb450..6534df6bbd 100644
--- a/actionpack/test/template/translation_helper_test.rb
+++ b/actionpack/test/template/translation_helper_test.rb
@@ -5,24 +5,22 @@ class TranslationHelperTest < Test::Unit::TestCase
   include ActionView::Helpers::TranslationHelper
   
   attr_reader :request
-  uses_mocha 'translation_helper_test' do
-    def setup
-    end
-    
-    def test_delegates_to_i18n_setting_the_raise_option
-      I18n.expects(:translate).with(:foo, :locale => 'en', :raise => true)
-      translate :foo, :locale => 'en'
-    end
-    
-    def test_returns_missing_translation_message_wrapped_into_span
-      expected = '<span class="translation_missing">en, foo</span>'
-      assert_equal expected, translate(:foo)
-    end
+  def setup
+  end
+  
+  def test_delegates_to_i18n_setting_the_raise_option
+    I18n.expects(:translate).with(:foo, :locale => 'en', :raise => true)
+    translate :foo, :locale => 'en'
+  end
   
-    def test_delegates_localize_to_i18n
-      @time = Time.utc(2008, 7, 8, 12, 18, 38)
-      I18n.expects(:localize).with(@time)
-      localize @time
-    end
+  def test_returns_missing_translation_message_wrapped_into_span
+    expected = '<span class="translation_missing">en, foo</span>'
+    assert_equal expected, translate(:foo)
+  end
+
+  def test_delegates_localize_to_i18n
+    @time = Time.utc(2008, 7, 8, 12, 18, 38)
+    I18n.expects(:localize).with(@time)
+    localize @time
   end
-end
\ No newline at end of file
+end
-- 
cgit v1.2.3


From 7527cdf79c640eae5db29a6f3f9b955aa50bc29e Mon Sep 17 00:00:00 2001
From: David Heinemeier Hansson <david@loudthinking.com>
Date: Tue, 10 Feb 2009 12:57:12 +0100
Subject: Added partial scoping to TranslationHelper#translate, so if you call
 translate('.foo') from the people/index.html.erb template, you'll actually be
 calling I18n.translate(people.index.foo) [DHH]

---
 actionpack/test/template/translation_helper_test.rb | 6 ++++++
 1 file changed, 6 insertions(+)

(limited to 'actionpack/test/template/translation_helper_test.rb')

diff --git a/actionpack/test/template/translation_helper_test.rb b/actionpack/test/template/translation_helper_test.rb
index 6534df6bbd..a20f3c394c 100644
--- a/actionpack/test/template/translation_helper_test.rb
+++ b/actionpack/test/template/translation_helper_test.rb
@@ -23,4 +23,10 @@ class TranslationHelperTest < Test::Unit::TestCase
     I18n.expects(:localize).with(@time)
     localize @time
   end
+  
+  def test_scoping_by_partial
+    expects(:template).returns(stub(:path_without_format_and_extension => "people/index"))
+    I18n.expects(:translate).with("people.index.foo", :locale => 'en', :raise => true)
+    translate ".foo", :locale => 'en'
+  end
 end
-- 
cgit v1.2.3