2 files changed, 13 insertions, 17 deletions
diff --git a/spec/controllers/admin_public_body_controller_spec.rb b/spec/controllers/admin_public_body_controller_spec.rb
index 28182a3cd..317c186fa 100644
--- a/spec/controllers/admin_public_body_controller_spec.rb
+++ b/spec/controllers/admin_public_body_controller_spec.rb
@@ -301,7 +301,7 @@ describe AdminPublicBodyController, "when administering public bodies with i18n"
     end
 
     it "saves edits to a public body" do
-        PublicBody.with_locale(:es) do
+        I18n.with_locale(:es) do
             pb = PublicBody.find(id=3)
             pb.name.should == "El Department for Humpadinking"
             post :update, {
@@ -321,10 +321,10 @@ describe AdminPublicBodyController, "when administering public bodies with i18n"
         end
 
         pb = PublicBody.find(public_bodies(:humpadink_public_body).id)
-        PublicBody.with_locale(:es) do
+        I18n.with_locale(:es) do
            pb.name.should == "Renamed"
         end
-        PublicBody.with_locale(:en) do
+        I18n.with_locale(:en) do
            pb.name.should == "Department for Humpadinking"
         end
     end
@@ -370,12 +370,12 @@ describe AdminPublicBodyController, "when creating public bodies with i18n" do
 
         body = PublicBody.find_by_name("New Quango")
         body.translations.map {|t| t.locale.to_s}.sort.should == ["en", "es"]
-        PublicBody.with_locale(:en) do
+        I18n.with_locale(:en) do
             body.name.should == "New Quango"
             body.url_name.should == "new_quango"
             body.first_letter.should == "N"
         end
-        PublicBody.with_locale(:es) do
+        I18n.with_locale(:es) do
             body.name.should == "Mi Nuevo Quango"
             body.url_name.should == "mi_nuevo_quango"
             body.first_letter.should == "M"
diff --git a/spec/controllers/public_body_controller_spec.rb b/spec/controllers/public_body_controller_spec.rb
index 5f4012737..8f5b79489 100644
--- a/spec/controllers/public_body_controller_spec.rb
+++ b/spec/controllers/public_body_controller_spec.rb
@@ -43,18 +43,14 @@ describe PublicBodyController, "when showing a body" do
             :conditions => ["public_body_id = ?", public_bodies(:humpadink_public_body).id])
     end
 
-    it "should assign the body using different locale from that used for url_name" do
-        PublicBody.with_locale(:es) do
-            get :show, {:url_name => "dfh", :view => 'all'}
-            assigns[:public_body].notes.should == "Baguette"
-        end
+    it "should redirect to the canonical name in the chosen locale" do
+        get :show, {:url_name => "dfh", :view => 'all', :show_locale => "es"}
+        response.should redirect_to "http://test.host/es/body/edfh"
     end
 
     it "should assign the body using same locale as that used in url_name" do
-        PublicBody.with_locale(:es) do
-            get :show, {:url_name => "edfh", :view => 'all'}
-            assigns[:public_body].notes.should == "Baguette"
-        end
+        get :show, {:url_name => "edfh", :view => 'all', :show_locale => "es"}
+        response.should include_text("Baguette")
     end
 
     it "should redirect use to the relevant locale even when url_name is for a different locale" do
@@ -69,7 +65,7 @@ describe PublicBodyController, "when showing a body" do
 
     it "should remember the filter (view) setting on redirecting" do
         get :show, :show_locale => "es", :url_name => "tgq", :view => 'successful'
-        response.should redirect_to show_public_body_successful_url(:url_name => "etgq")
+        response.should redirect_to 'http://test.host/es/body/etgq/successful'
     end
 
     it "should redirect to newest name if you use historic name of public body in URL" do
@@ -92,7 +88,7 @@ describe PublicBodyController, "when listing bodies" do
     end
 
     it "should list all bodies from default locale, even when there are no translations for selected locale" do
-        PublicBody.with_locale(:en) do
+        I18n.with_locale(:en) do
             @english_only = PublicBody.new(:name => 'English only',
                                           :short_name => 'EO',
                                           :request_email => 'english@flourish.org',
@@ -100,7 +96,7 @@ describe PublicBodyController, "when listing bodies" do
                                           :last_edit_comment => '')
             @english_only.save
         end
-        PublicBody.with_locale(:es) do
+        I18n.with_locale(:es) do
             get :list
             assigns[:public_bodies].include?(@english_only).should == true
         end