diff options
| author | jnoortheen <jnoortheen@gmail.com> | 2016-12-06 22:32:30 +0530 |
|---|---|---|
| committer | jnoortheen <jnoortheen@gmail.com> | 2016-12-12 15:04:48 +0530 |
| commit | 3c36d9dc9b3c2db45df6dce19357e9c4bdde366f (patch) | |
| tree | e721858c7f69be2406fbd712e2abeb987576aebd | |
| parent | 87f3a66c32f8cab6c814f81ec9dfea69f64d79cc (diff) | |
| download | gitlab-ce-3c36d9dc9b3c2db45df6dce19357e9c4bdde366f.tar.gz | |
fix: removed signed_out notification
test: replaced signed_out message check with check for sign_in button
fixes #25294
| -rw-r--r-- | app/controllers/sessions_controller.rb | 6 | ||||
| -rw-r--r-- | changelogs/unreleased/25294-remove-signed-out-msg.yml | 4 | ||||
| -rw-r--r-- | spec/support/login_helpers.rb | 3 |
3 files changed, 12 insertions, 1 deletions
diff --git a/app/controllers/sessions_controller.rb b/app/controllers/sessions_controller.rb index 38e7c6f4a48..8c698695202 100644 --- a/app/controllers/sessions_controller.rb +++ b/app/controllers/sessions_controller.rb @@ -37,6 +37,12 @@ class SessionsController < Devise::SessionsController end end + def destroy + super + # hide the signed_out notice + flash[:notice] = nil + end + private # Handle an "initial setup" state, where there's only one user, it's an admin, diff --git a/changelogs/unreleased/25294-remove-signed-out-msg.yml b/changelogs/unreleased/25294-remove-signed-out-msg.yml new file mode 100644 index 00000000000..567294fe5f7 --- /dev/null +++ b/changelogs/unreleased/25294-remove-signed-out-msg.yml @@ -0,0 +1,4 @@ +--- +title: 'fix: removed signed_out notification' +merge_request: 7958 +author: jnoortheen diff --git a/spec/support/login_helpers.rb b/spec/support/login_helpers.rb index c0b3e83244d..ad1eed5b369 100644 --- a/spec/support/login_helpers.rb +++ b/spec/support/login_helpers.rb @@ -75,7 +75,8 @@ module LoginHelpers def logout find(".header-user-dropdown-toggle").click click_link "Sign out" - expect(page).to have_content('Signed out successfully') + # check the sign_in button + expect(page).to have_button('Sign in') end # Logout without JavaScript driver |