diff options
author | Azul <azul@leap.se> | 2012-12-18 14:09:25 +0100 |
---|---|---|
committer | Azul <azul@leap.se> | 2012-12-18 14:09:25 +0100 |
commit | 42a76e82c8c1911f04a71244eea3ac07275367df (patch) | |
tree | 2294f64ad66ba89a1564466ba797224865b3497e /users | |
parent | 5a35873f8a12915d44cfa77239d094960ce6971e (diff) |
adopted functional tests to new controller design
Diffstat (limited to 'users')
-rw-r--r-- | users/test/functional/users_controller_test.rb | 4 |
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 |