summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobert Speicher <rspeicher@gmail.com>2017-06-23 13:20:07 -0500
committerRobert Speicher <rspeicher@gmail.com>2017-06-29 12:18:23 -0400
commit0c529b4a49fa469d6982e52fc6228036204bfbab (patch)
tree78f46a408db01cda65e905751ad1b040f7c2b4af
parent7b674d5d55ac07d3261f9788bc2d2c17ec8b7513 (diff)
downloadgitlab-ce-0c529b4a49fa469d6982e52fc6228036204bfbab.tar.gz
Remove gitlab_sign_out_direct helper
-rw-r--r--spec/features/projects/jobs_spec.rb2
-rw-r--r--spec/support/login_helpers.rb7
2 files changed, 2 insertions, 7 deletions
diff --git a/spec/features/projects/jobs_spec.rb b/spec/features/projects/jobs_spec.rb
index 006a5011a2e..fbbdfcf982b 100644
--- a/spec/features/projects/jobs_spec.rb
+++ b/spec/features/projects/jobs_spec.rb
@@ -392,7 +392,7 @@ feature 'Jobs', :feature do
job.cancel!
project.update(visibility_level: Gitlab::VisibilityLevel::PUBLIC)
- gitlab_sign_out_direct
+ sign_out(:user)
sign_in(create(:user))
visit namespace_project_job_path(project.namespace, project, job)
end
diff --git a/spec/support/login_helpers.rb b/spec/support/login_helpers.rb
index 4c88958264b..aa3b7c7bb84 100644
--- a/spec/support/login_helpers.rb
+++ b/spec/support/login_helpers.rb
@@ -35,13 +35,8 @@ module LoginHelpers
def gitlab_sign_out
find(".header-user-dropdown-toggle").click
click_link "Sign out"
- # check the sign_in button
- expect(page).to have_button('Sign in')
- end
- # Logout without JavaScript driver
- def gitlab_sign_out_direct
- page.driver.submit :delete, '/users/sign_out', {}
+ expect(page).to have_button('Sign in')
end
private