diff options
| author | jessib <jessib@riseup.net> | 2013-09-03 10:48:13 -0700 |
|---|---|---|
| committer | jessib <jessib@riseup.net> | 2013-09-03 10:48:13 -0700 |
| commit | 07d0f6fe1d80cb730bd12a03a107c18d18779acc (patch) | |
| tree | 8583a31661ba5032a9cd6ffd6b74273a6c862ab0 /users/test/functional/v1/users_controller_test.rb | |
| parent | f3e17149116f6a3aeb87f8a6d0ecf29e8e33ad93 (diff) | |
| parent | 29b306a4d49d395e5753e2e85f8fa1f25d18410c (diff) | |
Merge pull request #73 from azul/bugfix/3623-teardown-test-data-properly
Bugfix/3623 teardown test data properly
Diffstat (limited to 'users/test/functional/v1/users_controller_test.rb')
| -rw-r--r-- | users/test/functional/v1/users_controller_test.rb | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/users/test/functional/v1/users_controller_test.rb b/users/test/functional/v1/users_controller_test.rb index a330bf3..7cd9b0c 100644 --- a/users/test/functional/v1/users_controller_test.rb +++ b/users/test/functional/v1/users_controller_test.rb @@ -7,7 +7,7 @@ class V1::UsersControllerTest < ActionController::TestCase changed_attribs = record_attributes_for :user_with_settings account_settings = stub account_settings.expects(:update).with(changed_attribs) - AccountSettings.expects(:new).with(user).returns(account_settings) + Account.expects(:new).with(user).returns(account_settings) login user put :update, :user => changed_attribs, :id => user.id, :format => :json @@ -22,7 +22,7 @@ class V1::UsersControllerTest < ActionController::TestCase changed_attribs = record_attributes_for :user_with_settings account_settings = stub account_settings.expects(:update).with(changed_attribs) - AccountSettings.expects(:new).with(user).returns(account_settings) + Account.expects(:new).with(user).returns(account_settings) login :is_admin? => true put :update, :user => changed_attribs, :id => user.id, :format => :json @@ -41,7 +41,7 @@ class V1::UsersControllerTest < ActionController::TestCase test "should create new user" do user_attribs = record_attributes_for :user user = User.new(user_attribs) - User.expects(:create).with(user_attribs).returns(user) + Account.expects(:create).with(user_attribs).returns(user) post :create, :user => user_attribs, :format => :json @@ -55,7 +55,7 @@ class V1::UsersControllerTest < ActionController::TestCase user_attribs.slice!('login') user = User.new(user_attribs) assert !user.valid? - User.expects(:create).with(user_attribs).returns(user) + Account.expects(:create).with(user_attribs).returns(user) post :create, :user => user_attribs, :format => :json |