diff options
| author | Seb Bacon <seb.bacon@gmail.com> | 2012-05-15 12:55:09 +0100 |
|---|---|---|
| committer | Seb Bacon <seb.bacon@gmail.com> | 2012-05-15 12:55:09 +0100 |
| commit | 23816aff9e970e1264b2231757702f648f05e30c (patch) | |
| tree | a286daaa01c1ca2bb5f8ca7035d3370541148f43 /spec/controllers/admin_user_controller_spec.rb | |
| parent | 8c5a6f4dc2d174ed5190719d952b39720d3bf362 (diff) | |
| parent | 5097146ff016b2aaa9d3dc29f3ec65db0aadbb72 (diff) | |
Merge branch 'develop' into feature/follow-buttons
Conflicts:
app/models/track_mailer.rb
app/models/track_thing.rb
Diffstat (limited to 'spec/controllers/admin_user_controller_spec.rb')
| -rw-r--r-- | spec/controllers/admin_user_controller_spec.rb | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/spec/controllers/admin_user_controller_spec.rb b/spec/controllers/admin_user_controller_spec.rb index c2d645fd2..cf3665c9f 100644 --- a/spec/controllers/admin_user_controller_spec.rb +++ b/spec/controllers/admin_user_controller_spec.rb @@ -2,9 +2,6 @@ require File.expand_path(File.dirname(__FILE__) + '/../spec_helper') describe AdminUserController, "when administering users" do integrate_views - before do - basic_auth_login @request - end it "shows the index/list page" do get :index |