diff options
| author | Robin Houston <robin.houston@gmail.com> | 2012-01-29 20:24:39 +0000 |
|---|---|---|
| committer | Robin Houston <robin.houston@gmail.com> | 2012-01-29 20:24:39 +0000 |
| commit | 59b5b15d56600ffc26d657dfea134ffcfc879725 (patch) | |
| tree | 46b2fd44234965ff32725c499571b4c9d2814ec4 /spec/controllers/admin_request_controller_spec.rb | |
| parent | cb9c215d3eb3369d7f619d98c55e357247ca72d1 (diff) | |
| parent | 500b4d37702cdbad113ccb94c875e90dd770231a (diff) | |
Merge branch 'release/0.5' into develop
Diffstat (limited to 'spec/controllers/admin_request_controller_spec.rb')
| -rw-r--r-- | spec/controllers/admin_request_controller_spec.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/spec/controllers/admin_request_controller_spec.rb b/spec/controllers/admin_request_controller_spec.rb index 6d3c955bb..5e6f6c2a5 100644 --- a/spec/controllers/admin_request_controller_spec.rb +++ b/spec/controllers/admin_request_controller_spec.rb @@ -6,7 +6,7 @@ describe AdminRequestController, "when administering requests" do before { basic_auth_login @request } before(:each) do - load_raw_emails_data(raw_emails) + load_raw_emails_data @old_filters = ActionController::Routing::Routes.filters ActionController::Routing::Routes.filters = RoutingFilter::Chain.new end @@ -53,7 +53,7 @@ describe AdminRequestController, "when administering the holding pen" 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(:each) do basic_auth_login @request - load_raw_emails_data(raw_emails) + load_raw_emails_data @old_filters = ActionController::Routing::Routes.filters ActionController::Routing::Routes.filters = RoutingFilter::Chain.new end |