diff options
| author | Robin Houston <robin.houston@gmail.com> | 2012-02-01 22:04:40 +0000 |
|---|---|---|
| committer | Robin Houston <robin.houston@gmail.com> | 2012-02-01 22:04:40 +0000 |
| commit | a76010c99459559a29901ed75b847384248c7c6e (patch) | |
| tree | f199e3f4187091a7a7c78f7fd6901529658174f7 /spec/controllers/admin_request_controller_spec.rb | |
| parent | 9f9befeba613deff85c2325f629e77099d44af6f (diff) | |
| parent | 18c9436ba00574d44dc258a2f231d4758b378eae (diff) | |
Merge branch 'wdtk' into release/0.5
Conflicts:
locale/app.pot
Diffstat (limited to 'spec/controllers/admin_request_controller_spec.rb')
| -rw-r--r-- | spec/controllers/admin_request_controller_spec.rb | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/spec/controllers/admin_request_controller_spec.rb b/spec/controllers/admin_request_controller_spec.rb index 5e6f6c2a5..ece1fe389 100644 --- a/spec/controllers/admin_request_controller_spec.rb +++ b/spec/controllers/admin_request_controller_spec.rb @@ -2,7 +2,6 @@ require File.expand_path(File.dirname(__FILE__) + '/../spec_helper') describe AdminRequestController, "when administering requests" do integrate_views - 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 @@ -50,7 +49,6 @@ end describe AdminRequestController, "when administering the holding pen" do integrate_views - 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 |