diff options
| author | Seb Bacon <seb.bacon@gmail.com> | 2011-07-14 08:43:40 +0100 |
|---|---|---|
| committer | Seb Bacon <seb.bacon@gmail.com> | 2011-07-14 08:43:40 +0100 |
| commit | bb790631de2973f8009af558cc9d9a6a70a6efc9 (patch) | |
| tree | f8b4eea6246690b724a45adb522d45e1c6708b55 /spec/controllers | |
| parent | 13885a4933e7ac4c9e54116dc216e2132ada77da (diff) | |
| parent | 4f3f88db01057af00db2796cd5a996e7f69fc8cd (diff) | |
Merge branch 'master' of github.com:sebbacon/alaveteli
Conflicts:
app/views/request/_request_listing_single.rhtml
Diffstat (limited to 'spec/controllers')
| -rw-r--r-- | spec/controllers/admin_general_controller_spec.rb | 1 | ||||
| -rw-r--r-- | spec/controllers/admin_request_controller_spec.rb | 3 | ||||
| -rw-r--r-- | spec/controllers/admin_user_controller_spec.rb | 1 |
3 files changed, 4 insertions, 1 deletions
diff --git a/spec/controllers/admin_general_controller_spec.rb b/spec/controllers/admin_general_controller_spec.rb index d1ac4cbb2..4c3708268 100644 --- a/spec/controllers/admin_general_controller_spec.rb +++ b/spec/controllers/admin_general_controller_spec.rb @@ -2,6 +2,7 @@ require File.expand_path(File.dirname(__FILE__) + '/../spec_helper') describe AdminGeneralController, "when viewing front page of admin interface" do integrate_views + before { basic_auth_login @request } it "should render the front page" do get :index diff --git a/spec/controllers/admin_request_controller_spec.rb b/spec/controllers/admin_request_controller_spec.rb index c6e9ca5bb..d82e4a49c 100644 --- a/spec/controllers/admin_request_controller_spec.rb +++ b/spec/controllers/admin_request_controller_spec.rb @@ -3,7 +3,8 @@ require File.expand_path(File.dirname(__FILE__) + '/../spec_helper') describe AdminRequestController, "when administering requests" do integrate_views fixtures :info_requests, :outgoing_messages, :users, :info_request_events - + before { basic_auth_login @request } + it "shows the index/list page" do get :index end diff --git a/spec/controllers/admin_user_controller_spec.rb b/spec/controllers/admin_user_controller_spec.rb index a9159f529..313f3f328 100644 --- a/spec/controllers/admin_user_controller_spec.rb +++ b/spec/controllers/admin_user_controller_spec.rb @@ -3,6 +3,7 @@ require File.expand_path(File.dirname(__FILE__) + '/../spec_helper') describe AdminUserController, "when administering users" do integrate_views fixtures :users + before { basic_auth_login @request } it "shows the index/list page" do get :index |