diff options
| author | Azul <azul@leap.se> | 2012-11-04 17:57:03 +0100 |
|---|---|---|
| committer | Azul <azul@leap.se> | 2012-11-04 17:57:03 +0100 |
| commit | c0f92bf9f481463dcaef6f4b30343130a8910a00 (patch) | |
| tree | 3ba89c6f38d19a7b96a0ef599b7cb6364ba5821f /users/test/integration/api | |
| parent | b92d418ebec6486a9e728c57f38f82d4c3343341 (diff) | |
| parent | 19008253d01fd6d7a864e98a7ae5dc216070aee1 (diff) | |
Merge branch 'develop' into feature-warden-srp
Conflicts:
Gemfile.lock
users/app/controllers/application_controller.rb
users/leap_web_users.gemspec
Diffstat (limited to 'users/test/integration/api')
| -rw-r--r-- | users/test/integration/api/account_flow_test.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/users/test/integration/api/account_flow_test.rb b/users/test/integration/api/account_flow_test.rb index 66de1e5..5800d46 100644 --- a/users/test/integration/api/account_flow_test.rb +++ b/users/test/integration/api/account_flow_test.rb @@ -39,7 +39,7 @@ class AccountFlowTest < ActionDispatch::IntegrationTest end test "signup response" do - assert_json_response @user_params.slice(:login, :password_salt) + assert_json_response :login => @login, :ok => true assert_response :success end |