diff options
Diffstat (limited to 'spec/requests/api/users_spec.rb')
| -rw-r--r-- | spec/requests/api/users_spec.rb | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/spec/requests/api/users_spec.rb b/spec/requests/api/users_spec.rb index 2a7689eaddf..01a24be9f20 100644 --- a/spec/requests/api/users_spec.rb +++ b/spec/requests/api/users_spec.rb @@ -928,7 +928,8 @@ RSpec.describe API::Users do end it "creates user with random password" do - params = attributes_for(:user, force_random_password: true, reset_password: true) + params = attributes_for(:user, force_random_password: true) + params.delete(:password) post api('/users', admin), params: params expect(response).to have_gitlab_http_status(:created) @@ -936,8 +937,7 @@ RSpec.describe API::Users do user_id = json_response['id'] new_user = User.find(user_id) - expect(new_user.valid_password?(params[:password])).to eq(false) - expect(new_user.recently_sent_password_reset?).to eq(true) + expect(new_user.encrypted_password).to be_present end it "creates user with private profile" do @@ -1795,8 +1795,7 @@ RSpec.describe API::Users do post api("/users/#{user.id}/emails", admin), params: email_attrs end.to change { user.emails.count }.by(1) - email = Email.find_by(user_id: user.id, email: email_attrs[:email]) - expect(email).not_to be_confirmed + expect(json_response['confirmed_at']).to be_nil end it "returns a 400 for invalid ID" do @@ -1813,8 +1812,7 @@ RSpec.describe API::Users do expect(response).to have_gitlab_http_status(:created) - email = Email.find_by(user_id: user.id, email: email_attrs[:email]) - expect(email).to be_confirmed + expect(json_response['confirmed_at']).not_to be_nil end end |