aboutsummaryrefslogtreecommitdiffstats
path: root/spec/controllers/admin_public_body_controller_spec.rb
diff options
context:
space:
mode:
authorDavid Cabo <david@calibea.com>2011-08-12 13:12:50 +0200
committerDavid Cabo <david@calibea.com>2011-08-12 13:12:50 +0200
commitdf1754847892bb6abce2681a42d8c50cf8d3a2da (patch)
tree73c518103906ad446cedd55c69690d8d91f0f362 /spec/controllers/admin_public_body_controller_spec.rb
parenta63e598b9e0ddfa7ac695b1be41aaace6c0eb628 (diff)
parent766df1c7de8f820bd6e451526787632a136bc635 (diff)
Merge branch 'master' of github.com:sebbacon/alaveteli into asktheeu
Conflicts: locale/cy/app.po locale/de/app.po locale/es/app.po locale/fr/app.po locale/sq/app.po locale/sr/app.po locale/sr@latin/app.po
Diffstat (limited to 'spec/controllers/admin_public_body_controller_spec.rb')
-rw-r--r--spec/controllers/admin_public_body_controller_spec.rb12
1 files changed, 6 insertions, 6 deletions
diff --git a/spec/controllers/admin_public_body_controller_spec.rb b/spec/controllers/admin_public_body_controller_spec.rb
index 6b88fe39d..357564211 100644
--- a/spec/controllers/admin_public_body_controller_spec.rb
+++ b/spec/controllers/admin_public_body_controller_spec.rb
@@ -110,27 +110,27 @@ describe AdminPublicBodyController, "when administering public bodies with i18n"
end
it "creates a new public body" do
- I18n.locale = :es
+ I18n.default_locale = :es
PublicBody.count.should == 2
post :create, { :public_body => { :name => "New Quango", :short_name => "", :tag_string => "blah", :request_email => 'newquango@localhost', :last_edit_comment => 'From test code' } }
PublicBody.count.should == 3
- I18n.locale = :en
+ I18n.default_locale = :en
end
it "edits a public body" do
- I18n.locale = :es
+ I18n.default_locale = :es
get :edit, {:id => 3, :locale => :es}
response.body.should include('Baguette')
- I18n.locale = :en
+ I18n.default_locale = :en
end
it "saves edits to a public body" do
- I18n.locale = :es
+ I18n.default_locale = :es
pb = PublicBody.find(id=3)
pb.name.should == "El Department for Humpadinking"
post :update, { :id => 3, :public_body => { :name => "Renamed", :short_name => "", :tag_string => "some tags", :request_email => 'edited@localhost', :last_edit_comment => 'From test code' }}
response.flash[:notice].should include('successful')
- I18n.locale = :en
+ I18n.default_locale = :en
pb = PublicBody.find(public_bodies(:humpadink_public_body).id)
PublicBody.with_locale(:es) do