diff options
| author | Seb Bacon <seb.bacon@gmail.com> | 2012-01-25 08:22:42 +0000 |
|---|---|---|
| committer | Seb Bacon <seb.bacon@gmail.com> | 2012-01-25 08:22:42 +0000 |
| commit | 4cbdf45b2077541a7bbc7e0a719289442c1d0fa3 (patch) | |
| tree | 9a9d370d3d2d8f6bc5500b557cda3eb1a565b785 /spec/controllers/admin_user_controller_spec.rb | |
| parent | 498cbca64bf3e4075e74f110b1e02b47c39b45fc (diff) | |
| parent | 05b8714c5f8d69c310f554d403a86a64781ee70a (diff) | |
Merge branch 'wdtk' of github.com:sebbacon/alaveteli into wdtk
Conflicts:
app/controllers/request_controller.rb
Diffstat (limited to 'spec/controllers/admin_user_controller_spec.rb')
| -rw-r--r-- | spec/controllers/admin_user_controller_spec.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/spec/controllers/admin_user_controller_spec.rb b/spec/controllers/admin_user_controller_spec.rb index b2b2d0626..55b49f9da 100644 --- a/spec/controllers/admin_user_controller_spec.rb +++ b/spec/controllers/admin_user_controller_spec.rb @@ -2,7 +2,7 @@ require File.expand_path(File.dirname(__FILE__) + '/../spec_helper') describe AdminUserController, "when administering users" do integrate_views - fixtures :users, :info_requests, :incoming_messages, :outgoing_messages, :comments, :info_request_events, :track_things + fixtures :users, :info_requests, :incoming_messages, :outgoing_messages, :comments, :info_request_events, :track_things, :public_bodies, :public_body_versions, :public_body_translations before { basic_auth_login @request } it "shows the index/list page" do |