diff options
author | Rémy Coutable <remy@rymai.me> | 2017-11-02 14:02:51 +0300 |
---|---|---|
committer | Rémy Coutable <remy@rymai.me> | 2017-11-02 14:02:51 +0300 |
commit | 0364e074479ac8204365fa6b6109011042431575 (patch) | |
tree | 78ec519957920fe37325140587c26fa4026e394b /spec | |
parent | 1c17ddba662872bf6ad9a9fe04137023476df50c (diff) |
Address Douwe's feedback
Signed-off-by: Rémy Coutable <remy@rymai.me>
Diffstat (limited to 'spec')
-rw-r--r-- | spec/support/live_debugger.rb | 5 | ||||
-rw-r--r-- | spec/support/login_helpers.rb | 8 |
2 files changed, 11 insertions, 2 deletions
diff --git a/spec/support/live_debugger.rb b/spec/support/live_debugger.rb index 8359a81059b..911eb48a8ca 100644 --- a/spec/support/live_debugger.rb +++ b/spec/support/live_debugger.rb @@ -2,9 +2,10 @@ require 'io/console' module LiveDebugger def live_debug - puts "\nCurrent example is paused for live debugging." + puts + puts "Current example is paused for live debugging." puts "Opening #{current_url} in your default browser..." - puts "The current user credentials are: #{@current_user.username} / 12345678" if @current_user + puts "The current user credentials are: #{@current_user.username} / #{@current_user.password}" if @current_user puts "Press any key to resume the execution of the example!!" `open #{current_url}` diff --git a/spec/support/login_helpers.rb b/spec/support/login_helpers.rb index 2ca05bb1778..de46d2ebf29 100644 --- a/spec/support/login_helpers.rb +++ b/spec/support/login_helpers.rb @@ -11,6 +11,13 @@ module LoginHelpers @current_user = resource end + # Overriding Devise::Test::IntegrationHelpers#sign_out to clear @current_user. + def sign_out(resource_or_scope) + super + + @current_user = nil + end + # Internal: Log in as a specific user or a new user of a specific role # # user_or_role - User object, or a role to create (e.g., :admin, :user) @@ -49,6 +56,7 @@ module LoginHelpers def gitlab_sign_out find(".header-user-dropdown-toggle").click click_link "Sign out" + @current_user = nil expect(page).to have_button('Sign in') end |