Commit 3335d3dd authored by Robert Speicher's avatar Robert Speicher

Change `logout` uses to `gitlab_sign_out`

Change `logout_direct` uses to `gitlab_sign_out_direct`
parent 0f73a19d
...@@ -537,7 +537,7 @@ describe 'Issue Boards', feature: true, js: true do ...@@ -537,7 +537,7 @@ describe 'Issue Boards', feature: true, js: true do
context 'signed out user' do context 'signed out user' do
before do before do
logout gitlab_sign_out
visit namespace_project_boards_path(project.namespace, project) visit namespace_project_boards_path(project.namespace, project)
wait_for_requests wait_for_requests
end end
...@@ -560,7 +560,7 @@ describe 'Issue Boards', feature: true, js: true do ...@@ -560,7 +560,7 @@ describe 'Issue Boards', feature: true, js: true do
before do before do
project.team << [user_guest, :guest] project.team << [user_guest, :guest]
logout gitlab_sign_out
gitlab_sign_in(user_guest) gitlab_sign_in(user_guest)
visit namespace_project_boards_path(project.namespace, project) visit namespace_project_boards_path(project.namespace, project)
wait_for_requests wait_for_requests
......
...@@ -108,7 +108,7 @@ feature 'Group', feature: true do ...@@ -108,7 +108,7 @@ feature 'Group', feature: true do
before do before do
group.add_owner(user) group.add_owner(user)
logout gitlab_sign_out
gitlab_sign_in(user) gitlab_sign_in(user)
visit subgroups_group_path(group) visit subgroups_group_path(group)
...@@ -128,7 +128,7 @@ feature 'Group', feature: true do ...@@ -128,7 +128,7 @@ feature 'Group', feature: true do
it 'checks permissions to avoid exposing groups by parent_id' do it 'checks permissions to avoid exposing groups by parent_id' do
group = create(:group, :private, path: 'secret-group') group = create(:group, :private, path: 'secret-group')
logout gitlab_sign_out
gitlab_sign_in(:user) gitlab_sign_in(:user)
visit new_group_path(parent_id: group.id) visit new_group_path(parent_id: group.id)
......
...@@ -41,7 +41,7 @@ feature 'Issues > User uses quick actions', feature: true, js: true do ...@@ -41,7 +41,7 @@ feature 'Issues > User uses quick actions', feature: true, js: true do
let(:guest) { create(:user) } let(:guest) { create(:user) }
before do before do
project.team << [guest, :guest] project.team << [guest, :guest]
logout gitlab_sign_out
gitlab_sign_in(guest) gitlab_sign_in(guest)
visit namespace_project_issue_path(project.namespace, project, issue) visit namespace_project_issue_path(project.namespace, project, issue)
end end
...@@ -81,7 +81,7 @@ feature 'Issues > User uses quick actions', feature: true, js: true do ...@@ -81,7 +81,7 @@ feature 'Issues > User uses quick actions', feature: true, js: true do
let(:guest) { create(:user) } let(:guest) { create(:user) }
before do before do
project.team << [guest, :guest] project.team << [guest, :guest]
logout gitlab_sign_out
gitlab_sign_in(guest) gitlab_sign_in(guest)
visit namespace_project_issue_path(project.namespace, project, issue) visit namespace_project_issue_path(project.namespace, project, issue)
end end
...@@ -181,7 +181,7 @@ feature 'Issues > User uses quick actions', feature: true, js: true do ...@@ -181,7 +181,7 @@ feature 'Issues > User uses quick actions', feature: true, js: true do
let(:guest) { create(:user) } let(:guest) { create(:user) }
before do before do
project.team << [guest, :guest] project.team << [guest, :guest]
logout gitlab_sign_out
gitlab_sign_in(guest) gitlab_sign_in(guest)
visit namespace_project_issue_path(project.namespace, project, issue) visit namespace_project_issue_path(project.namespace, project, issue)
end end
...@@ -219,7 +219,7 @@ feature 'Issues > User uses quick actions', feature: true, js: true do ...@@ -219,7 +219,7 @@ feature 'Issues > User uses quick actions', feature: true, js: true do
let(:guest) { create(:user) } let(:guest) { create(:user) }
before do before do
project.team << [guest, :guest] project.team << [guest, :guest]
logout gitlab_sign_out
gitlab_sign_in(guest) gitlab_sign_in(guest)
visit namespace_project_issue_path(project.namespace, project, issue) visit namespace_project_issue_path(project.namespace, project, issue)
end end
......
...@@ -498,7 +498,7 @@ describe 'Issues', feature: true do ...@@ -498,7 +498,7 @@ describe 'Issues', feature: true do
end end
it 'shows assignee text', js: true do it 'shows assignee text', js: true do
logout gitlab_sign_out
gitlab_sign_in guest gitlab_sign_in guest
visit namespace_project_issue_path(project.namespace, project, issue) visit namespace_project_issue_path(project.namespace, project, issue)
...@@ -582,7 +582,7 @@ describe 'Issues', feature: true do ...@@ -582,7 +582,7 @@ describe 'Issues', feature: true do
end end
it 'shows milestone text', js: true do it 'shows milestone text', js: true do
logout gitlab_sign_out
gitlab_sign_in guest gitlab_sign_in guest
visit namespace_project_issue_path(project.namespace, project, issue) visit namespace_project_issue_path(project.namespace, project, issue)
...@@ -596,7 +596,7 @@ describe 'Issues', feature: true do ...@@ -596,7 +596,7 @@ describe 'Issues', feature: true do
context 'by unauthenticated user' do context 'by unauthenticated user' do
before do before do
logout gitlab_sign_out
end end
it 'redirects to signin then back to new issue after signin' do it 'redirects to signin then back to new issue after signin' do
......
...@@ -51,7 +51,7 @@ feature 'Merge Requests > User uses quick actions', feature: true, js: true do ...@@ -51,7 +51,7 @@ feature 'Merge Requests > User uses quick actions', feature: true, js: true do
let(:guest) { create(:user) } let(:guest) { create(:user) }
before do before do
project.team << [guest, :guest] project.team << [guest, :guest]
logout gitlab_sign_out
gitlab_sign_in(guest) gitlab_sign_in(guest)
visit namespace_project_merge_request_path(project.namespace, project, merge_request) visit namespace_project_merge_request_path(project.namespace, project, merge_request)
end end
...@@ -97,7 +97,7 @@ feature 'Merge Requests > User uses quick actions', feature: true, js: true do ...@@ -97,7 +97,7 @@ feature 'Merge Requests > User uses quick actions', feature: true, js: true do
let(:guest) { create(:user) } let(:guest) { create(:user) }
before do before do
project.team << [guest, :guest] project.team << [guest, :guest]
logout gitlab_sign_out
gitlab_sign_in(guest) gitlab_sign_in(guest)
visit namespace_project_merge_request_path(project.namespace, project, merge_request) visit namespace_project_merge_request_path(project.namespace, project, merge_request)
end end
...@@ -125,7 +125,7 @@ feature 'Merge Requests > User uses quick actions', feature: true, js: true do ...@@ -125,7 +125,7 @@ feature 'Merge Requests > User uses quick actions', feature: true, js: true do
let(:new_url_opts) { { merge_request: { source_branch: 'feature' } } } let(:new_url_opts) { { merge_request: { source_branch: 'feature' } } }
before do before do
logout gitlab_sign_out
another_project.team << [user, :master] another_project.team << [user, :master]
gitlab_sign_in(user) gitlab_sign_in(user)
end end
...@@ -181,7 +181,7 @@ feature 'Merge Requests > User uses quick actions', feature: true, js: true do ...@@ -181,7 +181,7 @@ feature 'Merge Requests > User uses quick actions', feature: true, js: true do
let(:guest) { create(:user) } let(:guest) { create(:user) }
before do before do
project.team << [guest, :guest] project.team << [guest, :guest]
logout gitlab_sign_out
gitlab_sign_in(guest) gitlab_sign_in(guest)
visit namespace_project_merge_request_path(project.namespace, project, merge_request) visit namespace_project_merge_request_path(project.namespace, project, merge_request)
end end
......
...@@ -232,7 +232,7 @@ describe 'Merge request', :feature, :js do ...@@ -232,7 +232,7 @@ describe 'Merge request', :feature, :js do
before do before do
project.team << [user2, :master] project.team << [user2, :master]
logout gitlab_sign_out
gitlab_sign_in user2 gitlab_sign_in user2
merge_request.update(target_project: fork_project) merge_request.update(target_project: fork_project)
visit namespace_project_merge_request_path(project.namespace, project, merge_request) visit namespace_project_merge_request_path(project.namespace, project, merge_request)
......
...@@ -124,7 +124,7 @@ feature 'issuable templates', feature: true, js: true do ...@@ -124,7 +124,7 @@ feature 'issuable templates', feature: true, js: true do
let(:merge_request) { create(:merge_request, :with_diffs, source_project: fork_project, target_project: project) } let(:merge_request) { create(:merge_request, :with_diffs, source_project: fork_project, target_project: project) }
background do background do
logout gitlab_sign_out
project.team << [fork_user, :developer] project.team << [fork_user, :developer]
fork_project.team << [fork_user, :master] fork_project.team << [fork_user, :master]
create(:forked_project_link, forked_to_project: fork_project, forked_from_project: project) create(:forked_project_link, forked_to_project: fork_project, forked_from_project: project)
......
...@@ -381,7 +381,7 @@ feature 'Jobs', :feature do ...@@ -381,7 +381,7 @@ feature 'Jobs', :feature do
job.cancel! job.cancel!
project.update(visibility_level: Gitlab::VisibilityLevel::PUBLIC) project.update(visibility_level: Gitlab::VisibilityLevel::PUBLIC)
logout_direct gitlab_sign_out_direct
gitlab_sign_in(create(:user)) gitlab_sign_in(create(:user))
visit namespace_project_job_path(project.namespace, project, job) visit namespace_project_job_path(project.namespace, project, job)
end end
......
...@@ -93,7 +93,7 @@ feature 'Using U2F (Universal 2nd Factor) Devices for Authentication', :js do ...@@ -93,7 +93,7 @@ feature 'Using U2F (Universal 2nd Factor) Devices for Authentication', :js do
manage_two_factor_authentication manage_two_factor_authentication
u2f_device = register_u2f_device u2f_device = register_u2f_device
expect(page).to have_content('Your U2F device was registered') expect(page).to have_content('Your U2F device was registered')
logout gitlab_sign_out
# Second user # Second user
user = gitlab_sign_in(:user) user = gitlab_sign_in(:user)
...@@ -152,7 +152,7 @@ feature 'Using U2F (Universal 2nd Factor) Devices for Authentication', :js do ...@@ -152,7 +152,7 @@ feature 'Using U2F (Universal 2nd Factor) Devices for Authentication', :js do
visit profile_account_path visit profile_account_path
manage_two_factor_authentication manage_two_factor_authentication
@u2f_device = register_u2f_device @u2f_device = register_u2f_device
logout gitlab_sign_out
end end
describe "when 2FA via OTP is disabled" do describe "when 2FA via OTP is disabled" do
...@@ -200,7 +200,7 @@ feature 'Using U2F (Universal 2nd Factor) Devices for Authentication', :js do ...@@ -200,7 +200,7 @@ feature 'Using U2F (Universal 2nd Factor) Devices for Authentication', :js do
visit profile_account_path visit profile_account_path
manage_two_factor_authentication manage_two_factor_authentication
register_u2f_device(name: 'My other device') register_u2f_device(name: 'My other device')
logout gitlab_sign_out
# Try authenticating user with the old U2F device # Try authenticating user with the old U2F device
gitlab_sign_in(current_user) gitlab_sign_in(current_user)
...@@ -218,7 +218,7 @@ feature 'Using U2F (Universal 2nd Factor) Devices for Authentication', :js do ...@@ -218,7 +218,7 @@ feature 'Using U2F (Universal 2nd Factor) Devices for Authentication', :js do
visit profile_account_path visit profile_account_path
manage_two_factor_authentication manage_two_factor_authentication
register_u2f_device(@u2f_device) register_u2f_device(@u2f_device)
logout gitlab_sign_out
# Try authenticating user with the same U2F device # Try authenticating user with the same U2F device
gitlab_sign_in(current_user) gitlab_sign_in(current_user)
...@@ -254,7 +254,7 @@ feature 'Using U2F (Universal 2nd Factor) Devices for Authentication', :js do ...@@ -254,7 +254,7 @@ feature 'Using U2F (Universal 2nd Factor) Devices for Authentication', :js do
visit profile_two_factor_auth_path visit profile_two_factor_auth_path
expect(page).to have_content("Your U2F device needs to be set up.") expect(page).to have_content("Your U2F device needs to be set up.")
second_device = register_u2f_device(name: 'My other device') second_device = register_u2f_device(name: 'My other device')
logout gitlab_sign_out
# Authenticate as both devices # Authenticate as both devices
[first_device, second_device].each do |device| [first_device, second_device].each do |device|
...@@ -264,7 +264,7 @@ feature 'Using U2F (Universal 2nd Factor) Devices for Authentication', :js do ...@@ -264,7 +264,7 @@ feature 'Using U2F (Universal 2nd Factor) Devices for Authentication', :js do
expect(page).to have_css('.sign-out-link', visible: false) expect(page).to have_css('.sign-out-link', visible: false)
logout gitlab_sign_out
end end
end end
end end
...@@ -307,7 +307,7 @@ feature 'Using U2F (Universal 2nd Factor) Devices for Authentication', :js do ...@@ -307,7 +307,7 @@ feature 'Using U2F (Universal 2nd Factor) Devices for Authentication', :js do
describe 'when no u2f device is registered' do describe 'when no u2f device is registered' do
before do before do
logout gitlab_sign_out
gitlab_sign_in(user) gitlab_sign_in(user)
end end
...@@ -320,7 +320,7 @@ feature 'Using U2F (Universal 2nd Factor) Devices for Authentication', :js do ...@@ -320,7 +320,7 @@ feature 'Using U2F (Universal 2nd Factor) Devices for Authentication', :js do
before do before do
manage_two_factor_authentication manage_two_factor_authentication
@u2f_device = register_u2f_device @u2f_device = register_u2f_device
logout gitlab_sign_out
gitlab_sign_in(user) gitlab_sign_in(user)
end end
......
...@@ -105,7 +105,7 @@ shared_examples 'issuable record that supports quick actions in its description ...@@ -105,7 +105,7 @@ shared_examples 'issuable record that supports quick actions in its description
context "when current user cannot close #{issuable_type}" do context "when current user cannot close #{issuable_type}" do
before do before do
logout gitlab_sign_out
gitlab_sign_in(guest) gitlab_sign_in(guest)
visit public_send("namespace_project_#{issuable_type}_path", project.namespace, project, issuable) visit public_send("namespace_project_#{issuable_type}_path", project.namespace, project, issuable)
end end
...@@ -140,7 +140,7 @@ shared_examples 'issuable record that supports quick actions in its description ...@@ -140,7 +140,7 @@ shared_examples 'issuable record that supports quick actions in its description
context "when current user cannot reopen #{issuable_type}" do context "when current user cannot reopen #{issuable_type}" do
before do before do
logout gitlab_sign_out
gitlab_sign_in(guest) gitlab_sign_in(guest)
visit public_send("namespace_project_#{issuable_type}_path", project.namespace, project, issuable) visit public_send("namespace_project_#{issuable_type}_path", project.namespace, project, issuable)
end end
...@@ -170,7 +170,7 @@ shared_examples 'issuable record that supports quick actions in its description ...@@ -170,7 +170,7 @@ shared_examples 'issuable record that supports quick actions in its description
context "when current user cannot change title of #{issuable_type}" do context "when current user cannot change title of #{issuable_type}" do
before do before do
logout gitlab_sign_out
gitlab_sign_in(guest) gitlab_sign_in(guest)
visit public_send("namespace_project_#{issuable_type}_path", project.namespace, project, issuable) visit public_send("namespace_project_#{issuable_type}_path", project.namespace, project, issuable)
end end
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment