diff options
author | Robin Houston <robin.houston@gmail.com> | 2011-12-04 22:53:43 +0000 |
---|---|---|
committer | Robin Houston <robin.houston@gmail.com> | 2011-12-04 22:53:43 +0000 |
commit | 40f0d929727694eba21c934cb3732574cf84f6b6 (patch) | |
tree | f4995e43c897bda5a5d878dbdc6df3fb65eddf97 /spec/controllers/admin_user_controller_spec.rb | |
parent | fe6d2c7a1609d9088c136762d7d89f7dc01a21ea (diff) | |
parent | 00caf911d7b60cbd3dea0ec070321b5b6aa6a79d (diff) |
Merge branch 'develop' of github.com:sebbacon/alaveteli into develop
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 313f3f328..b2b2d0626 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 + fixtures :users, :info_requests, :incoming_messages, :outgoing_messages, :comments, :info_request_events, :track_things before { basic_auth_login @request } it "shows the index/list page" do |