aboutsummaryrefslogtreecommitdiffstats
path: root/spec/controllers/admin_public_body_controller_spec.rb
diff options
context:
space:
mode:
authorRobin Houston <robin.houston@gmail.com>2012-01-23 21:53:10 +0000
committerRobin Houston <robin.houston@gmail.com>2012-01-23 21:53:10 +0000
commit0e546a79b205124d7b95b89e4a2e9cc520a4fc10 (patch)
tree791ae964c0dd4aba79cc9a3a6537db49c594cedf /spec/controllers/admin_public_body_controller_spec.rb
parent2c97a42455edb338a4ffeb529c9dd08bdf2864e0 (diff)
parent000a4b3bc2858124301eb36553b018266cfe2cae (diff)
Merge branch 'release/0.5' into develop
Diffstat (limited to 'spec/controllers/admin_public_body_controller_spec.rb')
-rw-r--r--spec/controllers/admin_public_body_controller_spec.rb7
1 files changed, 6 insertions, 1 deletions
diff --git a/spec/controllers/admin_public_body_controller_spec.rb b/spec/controllers/admin_public_body_controller_spec.rb
index 97636023a..2670f2add 100644
--- a/spec/controllers/admin_public_body_controller_spec.rb
+++ b/spec/controllers/admin_public_body_controller_spec.rb
@@ -198,8 +198,13 @@ describe AdminPublicBodyController, "when creating public bodies with i18n" do
password = MySociety::Config.get('ADMIN_PASSWORD', '')
basic_auth_login @request
- ActionController::Routing::Routes.filters.clear # don't auto-insert locale, complicates assertions
+ @old_filters = ActionController::Routing::Routes.filters
+ ActionController::Routing::Routes.filters = RoutingFilter::Chain.new
end
+ after do
+ ActionController::Routing::Routes.filters = @old_filters
+ end
+
it "creates a new public body in one locale" do
PublicBody.count.should == 2