From 42a76e82c8c1911f04a71244eea3ac07275367df Mon Sep 17 00:00:00 2001 From: Azul Date: Tue, 18 Dec 2012 14:09:25 +0100 Subject: adopted functional tests to new controller design --- users/test/functional/users_controller_test.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'users/test') 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 -- cgit v1.2.3