diff options
author | azul <azul@riseup.net> | 2012-12-20 01:53:32 -0800 |
---|---|---|
committer | azul <azul@riseup.net> | 2012-12-20 01:53:32 -0800 |
commit | 69a6c34998328b2168053184e1e487b60e1cc536 (patch) | |
tree | 361b0be19535b0d7ddb3eaac7acdfcebc7a0e3a8 /users/test/functional | |
parent | e899e5c3f33acb3228fac295013d7cc8b6e4eb04 (diff) | |
parent | dc827d0a80360aa245d4d724dc42bc47571faea6 (diff) |
Merge pull request #5 from leapcode/feature/removing-email-aliases
Removing email aliases - proper error display
Diffstat (limited to 'users/test/functional')
-rw-r--r-- | users/test/functional/users_controller_test.rb | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/users/test/functional/users_controller_test.rb b/users/test/functional/users_controller_test.rb index ce17500..1fa1462 100644 --- a/users/test/functional/users_controller_test.rb +++ b/users/test/functional/users_controller_test.rb @@ -45,11 +45,12 @@ class UsersControllerTest < ActionController::TestCase assert_equal user, assigns[:user] end - test "should process updated params" do + test "user can change settings" do user = find_record User user.expects(:attributes=).with(user.params) user.expects(:changed?).returns(true) user.expects(:save).returns(true) + user.stubs(:email_aliases).returns([]) login user put :update, :user => user.params, :id => user.id, :format => :json @@ -64,6 +65,7 @@ class UsersControllerTest < ActionController::TestCase user.expects(:attributes=).with(user.params) user.expects(:changed?).returns(true) user.expects(:save).returns(true) + user.stubs(:email_aliases).returns([]) login :is_admin? => true put :update, :user => user.params, :id => user.id, :format => :json |