aboutsummaryrefslogtreecommitdiffstats
path: root/spec/controllers/public_body_controller_spec.rb
diff options
context:
space:
mode:
authorRobin Houston <robin.houston@gmail.com>2011-08-09 21:09:10 +0100
committerRobin Houston <robin.houston@gmail.com>2011-08-09 21:09:10 +0100
commit7d1eb5df0c1bcc6a7a92755004faf85bc00496d4 (patch)
tree6f2cda5408b633662b865c1bc435cbb63b110ac8 /spec/controllers/public_body_controller_spec.rb
parentb6860bea9d4569a52801d72734fa86849c232721 (diff)
parente6fda87211f3c525c17b0d8a2c039192a6c18bb6 (diff)
Merge branch 'master' into wdtk
Diffstat (limited to 'spec/controllers/public_body_controller_spec.rb')
-rw-r--r--spec/controllers/public_body_controller_spec.rb4
1 files changed, 2 insertions, 2 deletions
diff --git a/spec/controllers/public_body_controller_spec.rb b/spec/controllers/public_body_controller_spec.rb
index d15482e51..0050678d2 100644
--- a/spec/controllers/public_body_controller_spec.rb
+++ b/spec/controllers/public_body_controller_spec.rb
@@ -72,13 +72,13 @@ describe PublicBodyController, "when listing bodies" do
end
it "should list bodies in alphabetical order with different locale" do
- I18n.locale = :es
+ 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 == "all"
- I18n.locale = :en
+ I18n.default_locale = :en
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