diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-01-30 03:08:50 +0000 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-01-30 03:08:50 +0000 |
commit | 1d388ed855838a2d50588c131f9f23815f148344 (patch) | |
tree | d9278b42419b6a91c90aa4940c69684077d34273 /spec/controllers/sessions_controller_spec.rb | |
parent | c36e59283ebcfd75281a9dda227ed060eeb5fbe7 (diff) | |
download | gitlab-ce-1d388ed855838a2d50588c131f9f23815f148344.tar.gz |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'spec/controllers/sessions_controller_spec.rb')
-rw-r--r-- | spec/controllers/sessions_controller_spec.rb | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/spec/controllers/sessions_controller_spec.rb b/spec/controllers/sessions_controller_spec.rb index 63797e22b38..2f597fd5cb3 100644 --- a/spec/controllers/sessions_controller_spec.rb +++ b/spec/controllers/sessions_controller_spec.rb @@ -394,8 +394,7 @@ describe SessionsController do end it 'warns about invalid login' do - expect(response).to set_flash.now[:alert] - .to /Invalid Login or password/ + expect(response).to set_flash.now[:alert].to /Your account is locked./ end it 'locks the user' do @@ -405,8 +404,7 @@ describe SessionsController do it 'keeps the user locked on future login attempts' do post(:create, params: { user: { login: user.username, password: user.password } }) - expect(response) - .to set_flash.now[:alert].to /Invalid Login or password/ + expect(response).to set_flash.now[:alert].to /Your account is locked./ end end end |