summaryrefslogtreecommitdiff
path: root/test/controllers
diff options
context:
space:
mode:
Diffstat (limited to 'test/controllers')
-rw-r--r--test/controllers/sessions_controller_test.rb6
-rw-r--r--test/controllers/users_controller_test.rb2
2 files changed, 1 insertions, 7 deletions
diff --git a/test/controllers/sessions_controller_test.rb b/test/controllers/sessions_controller_test.rb
index bfcc647..a5f511f 100644
--- a/test/controllers/sessions_controller_test.rb
+++ b/test/controllers/sessions_controller_test.rb
@@ -1,12 +1,6 @@
1require File.dirname(__FILE__) + '/../test_helper' 1require File.dirname(__FILE__) + '/../test_helper'
2require 'sessions_controller'
3
4# Re-raise errors caught by the controller.
5class SessionsController; def rescue_action(e) raise e end; end
6 2
7class SessionsControllerTest < ActionController::TestCase 3class SessionsControllerTest < ActionController::TestCase
8 # Be sure to include AuthenticatedTestHelper in test/test_helper.rb instead
9 # Then, you can remove it from this and the units test.
10 include AuthenticatedTestHelper 4 include AuthenticatedTestHelper
11 5
12 fixtures :users 6 fixtures :users
diff --git a/test/controllers/users_controller_test.rb b/test/controllers/users_controller_test.rb
index d37b428..5cd5ad4 100644
--- a/test/controllers/users_controller_test.rb
+++ b/test/controllers/users_controller_test.rb
@@ -13,7 +13,7 @@ class UsersControllerTest < ActionController::TestCase
13 login_as :aaron 13 login_as :aaron
14 get :index 14 get :index
15 assert_response :success 15 assert_response :success
16 assert_select "input[type=submit][value=destroy]" 16 assert_select "button[type=submit]", "destroy"
17 assert_select "a", "show" 17 assert_select "a", "show"
18 end 18 end
19 19