2 files changed, 11 insertions, 19 deletions
diff --git a/users/test/functional/application_controller_test.rb b/users/test/functional/application_controller_test.rb
index d13a354..4397e1d 100644
--- a/users/test/functional/application_controller_test.rb
+++ b/users/test/functional/application_controller_test.rb
@@ -3,39 +3,37 @@ require 'test_helper'
 class ApplicationControllerTest < ActionController::TestCase
 
   def setup
-    @user_id = stub
-    @user = stub
-    session[:user_id] = @user_id
     # so we can test the effect on the response
     @controller.response = @response
   end
 
   def test_authorize_redirect
-    session[:user_id] = nil
+    stub_logged_out
     @controller.send(:authorize)
     assert_access_denied
   end
 
   def test_current_user_with_caching
-    User.expects(:find).once.with(@user_id).returns(@user)
+    @user = stub_logged_in
     assert_equal @user, @controller.send(:current_user)
     assert_equal @user, @controller.send(:current_user) # tests caching
   end
 
   def test_authorized
-    User.expects(:find).once.with(@user_id).returns(@user)
+    @user = stub_logged_in
     @controller.send(:authorize)
+    assert_access_denied(false)
   end
 
   def test_admin
     bool = stub
-    User.expects(:find).once.with(@user_id).returns(@user)
+    @user = stub_logged_in
     @user.expects(:is_admin?).returns(bool)
     assert_equal bool, @controller.send(:admin?)
   end
 
   def test_authorize_admin
-    User.expects(:find).once.with(@user_id).returns(@user)
+    @user = stub_logged_in
     @user.expects(:is_admin?).returns(false)
     @controller.send(:authorize_admin)
     assert_access_denied
diff --git a/users/test/functional/helper_methods_test.rb b/users/test/functional/helper_methods_test.rb
index 0d76f63..c0eaf61 100644
--- a/users/test/functional/helper_methods_test.rb
+++ b/users/test/functional/helper_methods_test.rb
@@ -16,31 +16,25 @@ class HelperMethodsTest < ActionController::TestCase
     @controller
   end
 
-  def setup
-    @user_id = stub
-    @user = stub
-    session[:user_id] = @user_id
-  end
-
   def test_current_user_with_caching
-    User.expects(:find).once.with(@user_id).returns(@user)
+    @user = stub_logged_in
     assert_equal @user, current_user
     assert_equal @user, current_user # tests caching
   end
 
   def test_logged_in
-    User.expects(:find).once.with(@user_id).returns(@user)
+    @user = stub_logged_in
     assert logged_in?
   end
 
-  def test_logged_in
-    User.expects(:find).once.with(@user_id).returns(nil)
+  def test_logged_out
+    stub_logged_out
     assert !logged_in?
   end
 
   def test_admin
     bool = stub
-    User.expects(:find).once.with(@user_id).returns(@user)
+    @user = stub_logged_in
     @user.expects(:is_admin?).returns(bool)
     assert_equal bool, admin?
   end