summaryrefslogtreecommitdiff
path: root/users/test/functional
diff options
context:
space:
mode:
Diffstat (limited to 'users/test/functional')
-rw-r--r--users/test/functional/users_controller_test.rb4
1 files changed, 2 insertions, 2 deletions
diff --git a/users/test/functional/users_controller_test.rb b/users/test/functional/users_controller_test.rb
index b31a642..1fa1462 100644
--- a/users/test/functional/users_controller_test.rb
+++ b/users/test/functional/users_controller_test.rb
@@ -50,7 +50,7 @@ class UsersControllerTest < ActionController::TestCase
user.expects(:attributes=).with(user.params)
user.expects(:changed?).returns(true)
user.expects(:save).returns(true)
- user.expects(:reload).returns(user)
+ user.stubs(:email_aliases).returns([])
login user
put :update, :user => user.params, :id => user.id, :format => :json
@@ -65,7 +65,7 @@ class UsersControllerTest < ActionController::TestCase
user.expects(:attributes=).with(user.params)
user.expects(:changed?).returns(true)
user.expects(:save).returns(true)
- user.expects(:reload).returns(user)
+ user.stubs(:email_aliases).returns([])
login :is_admin? => true
put :update, :user => user.params, :id => user.id, :format => :json