From 742ea045560f91e472901bea3d932669f1c50d61 Mon Sep 17 00:00:00 2001 From: Robin Houston Date: Fri, 20 Jan 2012 13:30:42 +0000 Subject: Improved test isolation MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The test “AdminRequestController when administering requests shows a public body” would fail when this spec is run on its own twice in succession. --- spec/controllers/admin_request_controller_spec.rb | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'spec/controllers/admin_request_controller_spec.rb') diff --git a/spec/controllers/admin_request_controller_spec.rb b/spec/controllers/admin_request_controller_spec.rb index 635d73b9e..77f336eee 100644 --- a/spec/controllers/admin_request_controller_spec.rb +++ b/spec/controllers/admin_request_controller_spec.rb @@ -5,6 +5,10 @@ describe AdminRequestController, "when administering requests" do fixtures :users, :public_bodies, :public_body_translations, :public_body_versions, :info_requests, :raw_emails, :incoming_messages, :outgoing_messages, :comments, :info_request_events, :track_things before { basic_auth_login @request } + before(:each) do + load_raw_emails_data(raw_emails) + end + it "shows the index/list page" do get :index end -- cgit v1.2.3 From bcb7d7434e804a118787bce1365c4bc28f6a1784 Mon Sep 17 00:00:00 2001 From: Robin Houston Date: Fri, 20 Jan 2012 13:41:05 +0000 Subject: Clear routing filters while tests are running This fixes a test failure that would show up when running this spec in isolation -- but not necessarily when running all tests, depending on the order they run in. --- spec/controllers/admin_request_controller_spec.rb | 10 ++++++++++ 1 file changed, 10 insertions(+) (limited to 'spec/controllers/admin_request_controller_spec.rb') diff --git a/spec/controllers/admin_request_controller_spec.rb b/spec/controllers/admin_request_controller_spec.rb index 77f336eee..6d3c955bb 100644 --- a/spec/controllers/admin_request_controller_spec.rb +++ b/spec/controllers/admin_request_controller_spec.rb @@ -7,6 +7,11 @@ describe AdminRequestController, "when administering requests" do before(:each) do load_raw_emails_data(raw_emails) + @old_filters = ActionController::Routing::Routes.filters + ActionController::Routing::Routes.filters = RoutingFilter::Chain.new + end + after do + ActionController::Routing::Routes.filters = @old_filters end it "shows the index/list page" do @@ -49,6 +54,11 @@ describe AdminRequestController, "when administering the holding pen" do before(:each) do basic_auth_login @request load_raw_emails_data(raw_emails) + @old_filters = ActionController::Routing::Routes.filters + ActionController::Routing::Routes.filters = RoutingFilter::Chain.new + end + after do + ActionController::Routing::Routes.filters = @old_filters end it "shows a rejection reason for an incoming message from an invalid address" do -- cgit v1.2.3