diff options
| author | jessib <jessib@riseup.net> | 2013-08-08 11:54:19 -0700 |
|---|---|---|
| committer | jessib <jessib@riseup.net> | 2013-08-08 11:54:19 -0700 |
| commit | bca39b8f0d44dc31f77a3bfc8a94d452b4c77670 (patch) | |
| tree | e3ee949bf6e02fc1bbc2ab8e3f247105b962b08e /users/test/functional | |
| parent | 31441fc921c3a60bff7c606f1da343fdd62d80d5 (diff) | |
| parent | b1065710102193ba11e2a18b5f6506ba1d5b31f9 (diff) | |
Merge pull request #64 from azul/feature/identity-rewrite
Feature/identity rewrite
Diffstat (limited to 'users/test/functional')
| -rw-r--r-- | users/test/functional/v1/users_controller_test.rb | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/users/test/functional/v1/users_controller_test.rb b/users/test/functional/v1/users_controller_test.rb index 0d44e50..a330bf3 100644 --- a/users/test/functional/v1/users_controller_test.rb +++ b/users/test/functional/v1/users_controller_test.rb @@ -5,7 +5,9 @@ class V1::UsersControllerTest < ActionController::TestCase test "user can change settings" do user = find_record :user changed_attribs = record_attributes_for :user_with_settings - user.expects(:update_attributes).with(changed_attribs) + account_settings = stub + account_settings.expects(:update).with(changed_attribs) + AccountSettings.expects(:new).with(user).returns(account_settings) login user put :update, :user => changed_attribs, :id => user.id, :format => :json @@ -18,7 +20,9 @@ class V1::UsersControllerTest < ActionController::TestCase test "admin can update user" do user = find_record :user changed_attribs = record_attributes_for :user_with_settings - user.expects(:update_attributes).with(changed_attribs) + account_settings = stub + account_settings.expects(:update).with(changed_attribs) + AccountSettings.expects(:new).with(user).returns(account_settings) login :is_admin? => true put :update, :user => changed_attribs, :id => user.id, :format => :json |