Merge branch 'fixes-for-upstream-globalize' into rails-3-develop

1 files changed, 23 insertions, 21 deletions

diff --git a/spec/controllers/public_body_controller_spec.rb b/spec/controllers/public_body_controller_spec.rb
index 6800765f2..0e0b0a575 100644
--- a/spec/controllers/public_body_controller_spec.rb
+++ b/spec/controllers/public_body_controller_spec.rb
@@ -82,21 +82,23 @@ describe PublicBodyController, "when listing bodies" do
 
     def make_single_language_example(locale)
         result = nil
-        I18n.with_locale(locale) do
-            case locale
-            when :en
-                result = PublicBody.new(:name => 'English only',
-                                        :short_name => 'EO')
-            when :es
-                result = PublicBody.new(:name => 'Español Solamente',
-                                        :short_name => 'ES')
-            else
-                raise StandardError.new "Unknown locale #{locale}"
+        with_default_locale(locale) do
+            I18n.with_locale(locale) do
+                case locale
+                when :en
+                    result = PublicBody.new(:name => 'English only',
+                                            :short_name => 'EO')
+                when :es
+                    result = PublicBody.new(:name => 'Español Solamente',
+                                            :short_name => 'ES')
+                else
+                    raise StandardError.new "Unknown locale #{locale}"
+                end
+                result.request_email = "#{locale}@example.org"
+                result.last_edit_editor = 'test'
+                result.last_edit_comment = ''
+                result.save
             end
-            result.request_email = "#{locale}@example.org"
-            result.last_edit_editor = 'test'
-            result.last_edit_comment = ''
-            result.save
         end
         result
     end
@@ -188,13 +190,13 @@ describe PublicBodyController, "when listing bodies" do
     end
 
     it "should list bodies in alphabetical order with different locale" do
-        I18n.default_locale = :es
-        get :list
-        response.should render_template('list')
-        assigns[:public_bodies].should == [ public_bodies(:geraldine_public_body), public_bodies(:humpadink_public_body) ]
-        assigns[:tag].should == "all"
-        assigns[:description].should == ""
-        I18n.default_locale = :en
+        with_default_locale(:es) do
+            get :list
+            response.should render_template('list')
+            assigns[:public_bodies].should == [ public_bodies(:geraldine_public_body), public_bodies(:humpadink_public_body) ]
+            assigns[:tag].should == "all"
+            assigns[:description].should == ""
+        end
     end
 
     it "should list a tagged thing on the appropriate list page, and others on the other page, and all still on the all page" do