Merge branch 'rs-gitlab_sign_in' into 'master'

Prepare for bypassing GitLab sign in in feature specs

See merge request !11913

spec/features/abuse_report_spec.rb

@@ -4,7 +4,7 @@ feature 'Abuse reports', feature: true do
   let(:another_user) { create(:user) }
 
   before do
-    login_as :user
+    gitlab_sign_in :user
   end
 
   scenario 'Report abuse' do

spec/features/admin/admin_abuse_reports_spec.rb

@@ -5,7 +5,7 @@ describe "Admin::AbuseReports", feature: true, js: true  do
 
   context 'as an admin' do
     before do
-      login_as :admin
+      gitlab_sign_in :admin
     end
 
     describe 'if a user has been reported for abuse' do

spec/features/admin/admin_active_tab_spec.rb

@@ -2,7 +2,7 @@ require 'spec_helper'
 
 RSpec.describe 'admin active tab' do
   before do
-    login_as :admin
+    gitlab_sign_in :admin
   end
 
   shared_examples 'page has active tab' do |title|

spec/features/admin/admin_appearance_spec.rb

@@ -4,7 +4,7 @@ feature 'Admin Appearance', feature: true do
   let!(:appearance) { create(:appearance) }
 
   scenario 'Create new appearance' do
-    login_as :admin
+    gitlab_sign_in :admin
     visit admin_appearances_path
 
     fill_in 'appearance_title', with: 'MyCompany'
@@ -20,7 +20,7 @@ feature 'Admin Appearance', feature: true do
   end
 
   scenario 'Preview appearance' do
-    login_as :admin
+    gitlab_sign_in :admin
 
     visit admin_appearances_path
     click_link "Preview"
@@ -34,7 +34,7 @@ feature 'Admin Appearance', feature: true do
   end
 
   scenario 'Appearance logo' do
-    login_as :admin
+    gitlab_sign_in :admin
     visit admin_appearances_path
 
     attach_file(:appearance_logo, logo_fixture)
@@ -46,7 +46,7 @@ feature 'Admin Appearance', feature: true do
   end
 
   scenario 'Header logos' do
-    login_as :admin
+    gitlab_sign_in :admin
     visit admin_appearances_path
 
     attach_file(:appearance_header_logo, logo_fixture)

spec/features/admin/admin_broadcast_messages_spec.rb

@@ -2,7 +2,7 @@ require 'spec_helper'
 
 feature 'Admin Broadcast Messages', feature: true do
   before do
-    login_as :admin
+    gitlab_sign_in :admin
     create(:broadcast_message, :expired, message: 'Migration to new server')
     visit admin_broadcast_messages_path
   end

spec/features/admin/admin_browse_spam_logs_spec.rb

@@ -4,7 +4,7 @@ describe 'Admin browse spam logs' do
   let!(:spam_log) { create(:spam_log, description: 'abcde ' * 20) }
 
   before do
-    login_as :admin
+    gitlab_sign_in :admin
   end
 
   scenario 'Browse spam logs' do

spec/features/admin/admin_browses_logs_spec.rb

@@ -2,7 +2,7 @@ require 'spec_helper'
 
 describe 'Admin browses logs' do
   before do
-    login_as :admin
+    gitlab_sign_in :admin
   end
 
   it 'shows available log files' do

spec/features/admin/admin_builds_spec.rb

@@ -2,7 +2,7 @@ require 'spec_helper'
 
 describe 'Admin Builds' do
   before do
-    login_as :admin
+    gitlab_sign_in :admin
   end
 
   describe 'GET /admin/builds' do

spec/features/admin/admin_cohorts_spec.rb

@@ -2,7 +2,7 @@ require 'rails_helper'
 
 feature 'Admin cohorts page', feature: true do
   before do
-    login_as :admin
+    gitlab_sign_in :admin
   end
 
   scenario 'See users count per month' do

spec/features/admin/admin_conversational_development_index_spec.rb

@@ -2,7 +2,7 @@ require 'spec_helper'
 
 describe 'Admin Conversational Development Index' do
   before do
-    login_as :admin
+    gitlab_sign_in :admin
   end
 
   context 'when usage ping is disabled' do

spec/features/admin/admin_deploy_keys_spec.rb

@@ -5,7 +5,7 @@ RSpec.describe 'admin deploy keys', type: :feature do
   let!(:another_deploy_key) { create(:another_deploy_key, public: true) }
 
   before do
-    login_as(:admin)
+    gitlab_sign_in(:admin)
   end
 
   it 'show all public deploy keys' do

spec/features/admin/admin_disables_git_access_protocol_spec.rb

@@ -8,7 +8,7 @@ feature 'Admin disables Git access protocol', feature: true do
 
   background do
     stub_env('IN_MEMORY_APPLICATION_SETTINGS', 'false')
-    login_as(admin)
+    gitlab_sign_in(admin)
   end
 
   context 'with HTTP disabled' do

spec/features/admin/admin_disables_two_factor_spec.rb

@@ -2,7 +2,7 @@ require 'rails_helper'
 
 feature 'Admin disables 2FA for a user', feature: true do
   scenario 'successfully', js: true do
-    login_as(:admin)
+    gitlab_sign_in(:admin)
     user = create(:user, :two_factor)
 
     edit_user(user)
@@ -17,7 +17,7 @@ feature 'Admin disables 2FA for a user', feature: true do
   end
 
   scenario 'for a user without 2FA enabled' do
-    login_as(:admin)
+    gitlab_sign_in(:admin)
     user = create(:user)
 
     edit_user(user)

spec/features/admin/admin_groups_spec.rb

@@ -6,7 +6,7 @@ feature 'Admin Groups', feature: true do
   let(:internal) { Gitlab::VisibilityLevel::INTERNAL }
   let(:user) { create :user }
   let!(:group) { create :group }
-  let!(:current_user) { login_as :admin }
+  let!(:current_user) { gitlab_sign_in :admin }
 
   before do
     stub_application_setting(default_group_visibility: internal)

spec/features/admin/admin_health_check_spec.rb

@@ -5,7 +5,7 @@ feature "Admin Health Check", feature: true do
 
   before do
     stub_env('IN_MEMORY_APPLICATION_SETTINGS', 'false')
-    login_as :admin
+    gitlab_sign_in :admin
   end
 
   describe '#show' do

spec/features/admin/admin_hook_logs_spec.rb

@@ -6,7 +6,7 @@ feature 'Admin::HookLogs', feature: true do
   let(:hook_log) { create(:web_hook_log, web_hook: system_hook, internal_error_message: 'some error') }
 
   before do
-    login_as :admin
+    gitlab_sign_in :admin
   end
 
   scenario 'show list of hook logs' do

spec/features/admin/admin_hooks_spec.rb

@@ -3,7 +3,7 @@ require 'spec_helper'
 describe 'Admin::Hooks', feature: true do
   before do
     @project = create(:project)
-    login_as :admin
+    gitlab_sign_in :admin
 
     @system_hook = create(:system_hook)
   end

spec/features/admin/admin_labels_spec.rb

@@ -5,7 +5,7 @@ RSpec.describe 'admin issues labels' do
   let!(:feature_label) { Label.create(title: 'feature', template: true) }
 
   before do
-    login_as :admin
+    gitlab_sign_in :admin
   end
 
   describe 'list' do

spec/features/admin/admin_manage_applications_spec.rb

@@ -2,7 +2,7 @@ require 'spec_helper'
 
 RSpec.describe 'admin manage applications', feature: true do
   before do
-    login_as :admin
+    gitlab_sign_in :admin
   end
 
   it do

spec/features/admin/admin_projects_spec.rb

@@ -6,7 +6,7 @@ describe "Admin::Projects", feature: true  do
   let(:user) { create :user }
   let!(:project) { create(:project) }
   let!(:current_user) do
-    login_as :admin
+    gitlab_sign_in :admin
   end
 
   describe "GET /admin/projects" do

spec/features/admin/admin_requests_profiles_spec.rb

@@ -3,7 +3,7 @@ require 'spec_helper'
 describe 'Admin::RequestsProfilesController', feature: true do
   before do
     FileUtils.mkdir_p(Gitlab::RequestProfiler::PROFILES_DIR)
-    login_as(:admin)
+    gitlab_sign_in(:admin)
   end
 
   after do

spec/features/admin/admin_runners_spec.rb

@@ -5,7 +5,7 @@ describe "Admin Runners" do
 
   before do
     stub_env('IN_MEMORY_APPLICATION_SETTINGS', 'false')
-    login_as :admin
+    gitlab_sign_in :admin
   end
 
   describe "Runners page" do

spec/features/admin/admin_settings_spec.rb

@@ -5,7 +5,7 @@ feature 'Admin updates settings', feature: true do
 
   before do
     stub_env('IN_MEMORY_APPLICATION_SETTINGS', 'false')
-    login_as :admin
+    gitlab_sign_in :admin
     visit admin_application_settings_path
   end
 

spec/features/admin/admin_system_info_spec.rb

@@ -2,7 +2,7 @@ require 'spec_helper'
 
 describe 'Admin System Info' do
   before do
-    login_as :admin
+    gitlab_sign_in :admin
   end
 
   describe 'GET /admin/system_info' do

spec/features/admin/admin_users_impersonation_tokens_spec.rb

@@ -13,7 +13,7 @@ describe 'Admin > Users > Impersonation Tokens', feature: true, js: true do
   end
 
   before do
-    login_as(admin)
+    gitlab_sign_in(admin)
   end
 
   describe "token creation" do

spec/features/admin/admin_users_spec.rb

@@ -5,7 +5,7 @@ describe "Admin::Users", feature: true do
     create(:omniauth_user, provider: 'twitter', extern_uid: '123456')
   end
 
-  let!(:current_user) { login_as :admin }
+  let!(:current_user) { gitlab_sign_in :admin }
 
   describe "GET /admin/users" do
     before do

spec/features/admin/admin_uses_repository_checks_spec.rb

@@ -5,7 +5,7 @@ feature 'Admin uses repository checks', feature: true do
 
   before do
     stub_env('IN_MEMORY_APPLICATION_SETTINGS', 'false')
-    login_as :admin
+    gitlab_sign_in :admin
   end
 
   scenario 'to trigger a single check' do

spec/features/atom/issues_spec.rb

@@ -15,7 +15,7 @@ describe 'Issues Feed', feature: true  do
 
     context 'when authenticated' do
       it 'renders atom feed' do
-        login_with user
+        gitlab_sign_in user
         visit namespace_project_issues_path(project.namespace, project, :atom)
 
         expect(response_headers['Content-Type']).

spec/features/auto_deploy_spec.rb

@@ -7,7 +7,7 @@ describe 'Auto deploy' do
   before do
     create :kubernetes_service, project: project
     project.team << [user, :master]
-    login_as user
+    gitlab_sign_in user
   end
 
   context 'when no deployment service is active' do

spec/features/boards/add_issues_modal_spec.rb

@@ -14,7 +14,7 @@ describe 'Issue Boards add issue modal', :feature, :js do
   before do
     project.team << [user, :master]
 
-    login_as(user)
+    gitlab_sign_in(user)
 
     visit namespace_project_board_path(project.namespace, project, board)
     wait_for_requests

spec/features/boards/boards_spec.rb

@@ -12,7 +12,7 @@ describe 'Issue Boards', feature: true, js: true do
     project.team << [user, :master]
     project.team << [user2, :master]
 
-    login_as(user)
+    gitlab_sign_in(user)
   end
 
   context 'no lists' do
@@ -519,7 +519,7 @@ describe 'Issue Boards', feature: true, js: true do
 
   context 'signed out user' do
     before do
-      logout
+      gitlab_sign_out
       visit namespace_project_board_path(project.namespace, project, board)
       wait_for_requests
     end
@@ -542,8 +542,8 @@ describe 'Issue Boards', feature: true, js: true do
 
     before do
       project.team << [user_guest, :guest]
-      logout
-      login_as(user_guest)
+      gitlab_sign_out
+      gitlab_sign_in(user_guest)
       visit namespace_project_board_path(project.namespace, project, board)
       wait_for_requests
     end

spec/features/boards/issue_ordering_spec.rb

@@ -15,7 +15,7 @@ describe 'Issue Boards', :feature, :js do
   before do
     project.team << [user, :master]
 
-    login_as(user)
+    gitlab_sign_in(user)
   end
 
   context 'un-ordered issues' do

spec/features/boards/keyboard_shortcut_spec.rb

@@ -6,7 +6,7 @@ describe 'Issue Boards shortcut', feature: true, js: true do
   before do
     create(:board, project: project)
 
-    login_as :admin
+    gitlab_sign_in :admin
 
     visit namespace_project_path(project.namespace, project)
   end

spec/features/boards/modal_filter_spec.rb

@@ -12,7 +12,7 @@ describe 'Issue Boards add issue modal filtering', :feature, :js do
   before do
     project.team << [user, :master]
 
-    login_as(user)
+    gitlab_sign_in(user)
   end
 
   it 'shows empty state when no results found' do

spec/features/boards/new_issue_spec.rb

@@ -10,7 +10,7 @@ describe 'Issue Boards new issue', feature: true, js: true do
     before do
       project.team << [user, :master]
 
-      login_as(user)
+      gitlab_sign_in(user)
 
       visit namespace_project_board_path(project.namespace, project, board)
       wait_for_requests

spec/features/boards/sidebar_spec.rb

@@ -20,7 +20,7 @@ describe 'Issue Boards', feature: true, js: true do
 
     project.team << [user, :master]
 
-    login_as(user)
+    gitlab_sign_in(user)
 
     visit namespace_project_board_path(project.namespace, project, board)
     wait_for_requests

spec/features/boards/sub_group_project_spec.rb

@@ -13,7 +13,7 @@ describe 'Sub-group project issue boards', :feature, :js do
   before do
     project.add_master(user)
 
-    login_as(user)
+    gitlab_sign_in(user)
 
     visit namespace_project_board_path(project.namespace, project, board)
     wait_for_requests

spec/features/calendar_spec.rb

@@ -68,7 +68,7 @@ feature 'Contributions Calendar', :feature, :js do
   end
 
   before do
-    login_as user
+    gitlab_sign_in user
   end
 
   describe 'calendar day selection' do

spec/features/ci_lint_spec.rb

@@ -2,7 +2,7 @@ require 'spec_helper'
 
 describe 'CI Lint', js: true do
   before do
-    login_as :user
+    gitlab_sign_in :user
   end
 
   describe 'YAML parsing' do

spec/features/commits_spec.rb

@@ -7,7 +7,7 @@ describe 'Commits' do
 
   describe 'CI' do
     before do
-      login_as :user
+      gitlab_sign_in :user
       stub_ci_pipeline_to_return_yaml_file
     end
 
@@ -191,7 +191,7 @@ describe 'Commits' do
 
     before do
       project.team << [user, :master]
-      login_with(user)
+      gitlab_sign_in(user)
       visit namespace_project_commits_path(project.namespace, project, branch_name)
     end
 

spec/features/container_registry_spec.rb

@@ -9,7 +9,7 @@ describe "Container Registry" do
   end
 
   before do
-    login_as(user)
+    gitlab_sign_in(user)
     project.add_developer(user)
     stub_container_registry_config(enabled: true)
     stub_container_registry_tags(repository: :any, tags: [])

spec/features/copy_as_gfm_spec.rb

@@ -6,7 +6,7 @@ describe 'Copy as GFM', feature: true, js: true do
   include ActionView::Helpers::JavaScriptHelper
 
   before do
-    login_as :admin
+    gitlab_sign_in :admin
   end
 
   describe 'Copying rendered GFM' do

spec/features/cycle_analytics_spec.rb

@@ -14,7 +14,7 @@ feature 'Cycle Analytics', feature: true, js: true do
       before  do
         project.add_master(user)
 
-        login_as(user)
+        gitlab_sign_in(user)
 
         visit namespace_project_cycle_analytics_path(project.namespace, project)
         wait_for_requests
@@ -38,7 +38,7 @@ feature 'Cycle Analytics', feature: true, js: true do
         create_cycle
         deploy_master
 
-        login_as(user)
+        gitlab_sign_in(user)
         visit namespace_project_cycle_analytics_path(project.namespace, project)
       end
 
@@ -70,7 +70,7 @@ feature 'Cycle Analytics', feature: true, js: true do
         user.update_attribute(:preferred_language, 'es')
 
         project.team << [user, :master]
-        login_as(user)
+        gitlab_sign_in(user)
         visit namespace_project_cycle_analytics_path(project.namespace, project)
         wait_for_requests
       end
@@ -93,7 +93,7 @@ feature 'Cycle Analytics', feature: true, js: true do
       create_cycle
       deploy_master
 
-      login_as(guest)
+      gitlab_sign_in(guest)
       visit namespace_project_cycle_analytics_path(project.namespace, project)
       wait_for_requests
     end

spec/features/dashboard/active_tab_spec.rb

@@ -2,7 +2,7 @@ require 'spec_helper'
 
 RSpec.describe 'Dashboard Active Tab', js: true, feature: true do
   before do
-    login_as :user
+    gitlab_sign_in :user
   end
 
   shared_examples 'page has active tab' do |title|

spec/features/dashboard/activity_spec.rb

@@ -2,7 +2,7 @@ require 'spec_helper'
 
 RSpec.describe 'Dashboard Activity', feature: true do
   before do
-    login_as(create :user)
+    gitlab_sign_in(create :user)
     visit activity_dashboard_path
   end
 

spec/features/dashboard/archived_projects_spec.rb

@@ -9,7 +9,7 @@ RSpec.describe 'Dashboard Archived Project', feature: true do
     project.team << [user, :master]
     archived_project.team << [user, :master]
 
-    login_as(user)
+    gitlab_sign_in(user)
 
     visit dashboard_projects_path
   end

spec/features/dashboard/datetime_on_tooltips_spec.rb

@@ -13,7 +13,7 @@ feature 'Tooltips on .timeago dates', feature: true, js: true do
       Event.create( project: project, author_id: user.id, action: Event::JOINED,
                     updated_at: created_date, created_at: created_date)
 
-      login_as user
+      gitlab_sign_in user
       visit user_path(user)
       wait_for_requests()
 
@@ -30,7 +30,7 @@ feature 'Tooltips on .timeago dates', feature: true, js: true do
       project.team << [user, :master]
       create(:snippet, author: user, updated_at: created_date, created_at: created_date)
 
-      login_as user
+      gitlab_sign_in user
       visit user_snippets_path(user)
       wait_for_requests()
 

spec/features/dashboard/group_spec.rb

@@ -2,7 +2,7 @@ require 'spec_helper'
 
 RSpec.describe 'Dashboard Group', feature: true do
   before do
-    login_as(:user)
+    gitlab_sign_in(:user)
   end
 
   it 'creates new group', js: true do

spec/features/dashboard/groups_list_spec.rb

@@ -10,7 +10,7 @@ describe 'Dashboard Groups page', js: true, feature: true do
     group.add_owner(user)
     nested_group.add_owner(user)
 
-    login_as(user)
+    gitlab_sign_in(user)
     visit dashboard_groups_path
 
     expect(page).to have_content(group.full_name)
@@ -23,7 +23,7 @@ describe 'Dashboard Groups page', js: true, feature: true do
       group.add_owner(user)
       nested_group.add_owner(user)
 
-      login_as(user)
+      gitlab_sign_in(user)
 
       visit dashboard_groups_path
     end
@@ -58,7 +58,7 @@ describe 'Dashboard Groups page', js: true, feature: true do
       group.add_owner(user)
       subgroup.add_owner(user)
 
-      login_as(user)
+      gitlab_sign_in(user)
 
       visit dashboard_groups_path
     end
@@ -98,7 +98,7 @@ describe 'Dashboard Groups page', js: true, feature: true do
 
       allow(Kaminari.config).to receive(:default_per_page).and_return(1)
 
-      login_as(user)
+      gitlab_sign_in(user)
       visit dashboard_groups_path
     end
 

spec/features/dashboard/help_spec.rb

@@ -2,7 +2,7 @@ require 'spec_helper'
 
 RSpec.describe 'Dashboard Help', feature: true do
   before do
-    login_as(:user)
+    gitlab_sign_in(:user)
   end
 
   it 'renders correctly markdown' do

spec/features/dashboard/issuables_counter_spec.rb

@@ -9,7 +9,7 @@ describe 'Navigation bar counter', feature: true, caching: true do
   before do
     issue.assignees = [user]
     merge_request.update(assignee: user)
-    login_as(user)
+    gitlab_sign_in(user)
   end
 
   it 'reflects dashboard issues count' do

spec/features/dashboard/issues_spec.rb

@@ -12,7 +12,7 @@ RSpec.describe 'Dashboard Issues', feature: true do
 
   before do
     [project, project_with_issues_disabled].each { |project| project.team << [current_user, :master] }
-    login_as(current_user)
+    gitlab_sign_in(current_user)
     visit issues_dashboard_path(assignee_id: current_user.id)
   end
 

spec/features/dashboard/label_filter_spec.rb

@@ -11,7 +11,7 @@ describe 'Dashboard > label filter', feature: true, js: true do
     project.labels << label
     project2.labels << label2
 
-    login_as(user)
+    gitlab_sign_in(user)
     visit issues_dashboard_path
   end
 

spec/features/dashboard/merge_requests_spec.rb

@@ -8,7 +8,7 @@ describe 'Dashboard Merge Requests' do
   before do
     [project, project_with_merge_requests_disabled].each { |project| project.team << [current_user, :master] }
 
-    login_as(current_user)
+    gitlab_sign_in(current_user)
   end
 
   describe 'new merge request dropdown' do

spec/features/dashboard/milestone_filter_spec.rb

@@ -9,7 +9,7 @@ describe 'Dashboard > milestone filter', :feature, :js do
   let!(:issue2) { create :issue, author: user, project: project, milestone: milestone2 }
 
   before do
-    login_as(user)
+    gitlab_sign_in(user)
     visit issues_dashboard_path(author_id: user.id)
   end
 

spec/features/dashboard/milestone_tabs_spec.rb

@@ -15,7 +15,7 @@ describe 'Dashboard milestone tabs', :js, :feature do
 
   before do
     project.add_master(user)
-    login_as(user)
+    gitlab_sign_in(user)
 
     visit dashboard_milestone_path(milestone.safe_title, title: milestone.title)
   end

spec/features/dashboard/projects_spec.rb

@@ -7,7 +7,7 @@ RSpec.describe 'Dashboard Projects', feature: true do
 
   before do
     project.team << [user, :developer]
-    login_as(user)
+    gitlab_sign_in(user)
   end
 
   it 'shows the project the user in a member of in the list' do

spec/features/dashboard/shortcuts_spec.rb

@@ -3,7 +3,7 @@ require 'spec_helper'
 feature 'Dashboard shortcuts', :feature, :js do
   context 'logged in' do
     before do
-      login_as :user
+      gitlab_sign_in :user
       visit root_dashboard_path
     end
 

spec/features/dashboard/snippets_spec.rb

@@ -6,7 +6,7 @@ describe 'Dashboard snippets', feature: true do
     let!(:snippets) { create_list(:project_snippet, 2, :public, author: project.owner, project: project) }
     before do
       allow(Snippet).to receive(:default_per_page).and_return(1)
-      login_as(project.owner)
+      gitlab_sign_in(project.owner)
       visit dashboard_snippets_path
     end
 
@@ -25,7 +25,7 @@ describe 'Dashboard snippets', feature: true do
     end
 
     before do
-      login_as(user)
+      gitlab_sign_in(user)
 
       visit dashboard_snippets_path
     end

spec/features/dashboard/user_filters_projects_spec.rb

@@ -9,7 +9,7 @@ describe 'Dashboard > User filters projects', :feature do
   before do
     project.team << [user, :master]
 
-    login_as(user)
+    gitlab_sign_in(user)
   end
 
   describe 'filtering personal projects' do

spec/features/dashboard_issues_spec.rb

@@ -8,7 +8,7 @@ describe "Dashboard Issues filtering", feature: true, js: true do
   context 'filtering by milestone' do
     before do
       project.team << [user, :master]
-      login_as(user)
+      gitlab_sign_in(user)
 
       create(:issue, project: project, author: user, assignees: [user])
       create(:issue, project: project, author: user, assignees: [user], milestone: milestone)

spec/features/dashboard_milestones_spec.rb

@@ -17,7 +17,7 @@ feature 'Dashboard > Milestones', feature: true do
     let!(:milestone) { create(:milestone, project: project) }
     before do
       project.team << [user, :master]
-      login_with(user)
+      gitlab_sign_in(user)
       visit dashboard_milestones_path
     end
 

spec/features/discussion_comments/commit_spec.rb

@@ -9,7 +9,7 @@ describe 'Discussion Comments Merge Request', :feature, :js do
 
   before do
     project.add_master(user)
-    login_as(user)
+    gitlab_sign_in(user)
 
     visit namespace_project_commit_path(project.namespace, project, sample_commit.id)
   end

spec/features/discussion_comments/issue_spec.rb

@@ -7,7 +7,7 @@ describe 'Discussion Comments Issue', :feature, :js do
 
   before do
     project.add_master(user)
-    login_as(user)
+    gitlab_sign_in(user)
 
     visit namespace_project_issue_path(project.namespace, project, issue)
   end

spec/features/discussion_comments/merge_request_spec.rb

@@ -7,7 +7,7 @@ describe 'Discussion Comments Merge Request', :feature, :js do
 
   before do
     project.add_master(user)
-    login_as(user)
+    gitlab_sign_in(user)
 
     visit namespace_project_merge_request_path(project.namespace, project, merge_request)
   end

spec/features/discussion_comments/snippets_spec.rb

@@ -7,7 +7,7 @@ describe 'Discussion Comments Issue', :feature, :js do
 
   before do
     project.add_master(user)
-    login_as(user)
+    gitlab_sign_in(user)
 
     visit namespace_project_snippet_path(project.namespace, project, snippet)
   end

spec/features/expand_collapse_diffs_spec.rb

@@ -10,7 +10,7 @@ feature 'Expand and collapse diffs', js: true, feature: true do
     allow(Gitlab::Git::Diff).to receive(:size_limit).and_return(100.kilobytes)
     allow(Gitlab::Git::Diff).to receive(:collapse_limit).and_return(10.kilobytes)
 
-    login_as :admin
+    gitlab_sign_in :admin
 
     # Ensure that undiffable.md is in .gitattributes
     project.repository.copy_gitattributes(branch)

spec/features/explore/groups_list_spec.rb

@@ -10,7 +10,7 @@ describe 'Explore Groups page', :js, :feature do
   before do
     group.add_owner(user)
 
-    login_as(user)
+    gitlab_sign_in(user)
 
     visit explore_groups_path
   end

spec/features/explore/new_menu_spec.rb

@@ -16,7 +16,7 @@ feature 'Top Plus Menu', feature: true, js: true do
 
   context 'used by full user' do
     before do
-      login_as(user)
+      gitlab_sign_in(user)
     end
 
     scenario 'click on New project shows new project page' do
@@ -103,7 +103,7 @@ feature 'Top Plus Menu', feature: true, js: true do
 
   context 'used by guest user' do
     before do
-      login_as(guest_user)
+      gitlab_sign_in(guest_user)
     end
 
     scenario 'click on New issue shows new issue page' do

spec/features/gitlab_flavored_markdown_spec.rb

@@ -10,7 +10,7 @@ describe "GitLab Flavored Markdown", feature: true do
   end
 
   before do
-    login_as(:user)
+    gitlab_sign_in(:user)
     project.add_developer(@user)
   end
 

spec/features/global_search_spec.rb

@@ -6,7 +6,7 @@ feature 'Global search', feature: true do
 
   before do
     project.team << [user, :master]
-    login_with(user)
+    gitlab_sign_in(user)
   end
 
   describe 'I search through the issues and I see pagination' do

spec/features/groups/activity_spec.rb

@@ -7,7 +7,7 @@ feature 'Group activity page', feature: true do
   context 'when signed in' do
     before do
       user = create(:group_member, :developer, user: create(:user), group: group ).user
-      login_as(user)
+      gitlab_sign_in(user)
       visit path
     end
 

spec/features/groups/empty_states_spec.rb

@@ -5,7 +5,7 @@ feature 'Groups Merge Requests Empty States' do
   let(:user) { create(:group_member, :developer, user: create(:user), group: group ).user }
 
   before do
-    login_as(user)
+    gitlab_sign_in(user)
   end
 
   context 'group has a project' do

spec/features/groups/group_name_toggle_spec.rb

@@ -9,7 +9,7 @@ feature 'Group name toggle', feature: true, js: true do
   SMALL_SCREEN = 300
 
   before do
-    login_as :user
+    gitlab_sign_in :user
   end
 
   it 'is not present if enough horizontal space' do

spec/features/groups/group_settings_spec.rb

@@ -6,7 +6,7 @@ feature 'Edit group settings', feature: true do
 
   background do
     group.add_owner(user)
-    login_as(user)
+    gitlab_sign_in(user)
   end
 
   describe 'when the group path is changed' do

spec/features/groups/labels/edit_spec.rb

@@ -7,7 +7,7 @@ feature 'Edit group label', feature: true do
 
   background do
     group.add_owner(user)
-    login_as(user)
+    gitlab_sign_in(user)
     visit edit_group_label_path(group, label)
   end
 

spec/features/groups/members/last_owner_cannot_leave_group_spec.rb

@@ -6,7 +6,7 @@ feature 'Groups > Members > Last owner cannot leave group', feature: true do
 
   background do
     group.add_owner(owner)
-    login_as(owner)
+    gitlab_sign_in(owner)
     visit group_path(group)
   end
 

spec/features/groups/members/list_spec.rb

@@ -9,7 +9,7 @@ feature 'Groups members list', feature: true do
   let(:nested_group) { create(:group, parent: group) }
 
   background do
-    login_as(user1)
+    gitlab_sign_in(user1)
   end
 
   scenario 'show members from current group and parent', :nested_groups do

spec/features/groups/members/member_cannot_request_access_to_his_project_spec.rb

@@ -6,7 +6,7 @@ feature 'Groups > Members > Member cannot request access to his project', featur
 
   background do
     group.add_developer(member)
-    login_as(member)
+    gitlab_sign_in(member)
     visit group_path(group)
   end
 

spec/features/groups/members/member_leaves_group_spec.rb

@@ -8,7 +8,7 @@ feature 'Groups > Members > Member leaves group', feature: true do
   background do
     group.add_owner(owner)
     group.add_developer(user)
-    login_as(user)
+    gitlab_sign_in(user)
     visit group_path(group)
   end
 

spec/features/groups/members/owner_manages_access_requests_spec.rb

@@ -8,7 +8,7 @@ feature 'Groups > Members > Owner manages access requests', feature: true do
   background do
     group.request_access(user)
     group.add_owner(owner)
-    login_as(owner)
+    gitlab_sign_in(owner)
   end
 
   scenario 'owner can see access requests' do

spec/features/groups/members/sorting_spec.rb

@@ -9,7 +9,7 @@ feature 'Groups > Members > Sorting', feature: true do
     create(:group_member, :owner, user: owner, group: group, created_at: 5.days.ago)
     create(:group_member, :developer, user: developer, group: group, created_at: 3.days.ago)
 
-    login_as(owner)
+    gitlab_sign_in(owner)
   end
 
   scenario 'sorts alphabetically by default' do

spec/features/groups/members/user_requests_access_spec.rb

@@ -8,7 +8,7 @@ feature 'Groups > Members > User requests access', feature: true do
 
   background do
     group.add_owner(owner)
-    login_as(user)
+    gitlab_sign_in(user)
     visit group_path(group)
   end
 

spec/features/groups/milestone_spec.rb

@@ -8,7 +8,7 @@ feature 'Group milestones', :feature, :js do
   before do
     Timecop.freeze
 
-    login_as(user)
+    gitlab_sign_in(user)
   end
 
   after do

spec/features/groups/show_spec.rb

@@ -7,7 +7,7 @@ feature 'Group show page', feature: true do
   context 'when signed in' do
     before do
       user = create(:group_member, :developer, user: create(:user), group: group ).user
-      login_as(user)
+      gitlab_sign_in(user)
       visit path
     end
 

spec/features/groups_spec.rb

@@ -2,7 +2,7 @@ require 'spec_helper'
 
 feature 'Group', feature: true do
   before do
-    login_as(:admin)
+    gitlab_sign_in(:admin)
   end
 
   matcher :have_namespace_error_message do
@@ -108,8 +108,8 @@ feature 'Group', feature: true do
 
       before do
         group.add_owner(user)
-        logout
-        login_as(user)
+        gitlab_sign_out
+        gitlab_sign_in(user)
 
         visit subgroups_group_path(group)
         click_link 'New Subgroup'
@@ -128,8 +128,8 @@ feature 'Group', feature: true do
   it 'checks permissions to avoid exposing groups by parent_id' do
     group = create(:group, :private, path: 'secret-group')
 
-    logout
-    login_as(:user)
+    gitlab_sign_out
+    gitlab_sign_in(:user)
     visit new_group_path(parent_id: group.id)
 
     expect(page).not_to have_content('secret-group')

spec/features/help_pages_spec.rb

@@ -40,7 +40,7 @@ describe 'Help Pages', feature: true do
       allow_any_instance_of(ApplicationSetting).to receive(:version_check_enabled) { true }
       allow_any_instance_of(VersionCheck).to receive(:url) { '/version-check-url' }
 
-      login_as :user
+      gitlab_sign_in :user
       visit help_path
     end
 
@@ -60,7 +60,7 @@ describe 'Help Pages', feature: true do
       allow_any_instance_of(ApplicationSetting).to receive(:help_page_text) { "My Custom Text" }
       allow_any_instance_of(ApplicationSetting).to receive(:help_page_support_url) { "http://example.com/help" }
 
-      login_as :user
+      gitlab_sign_in(:user)
       visit help_path
     end
 

spec/features/issuables/issuable_list_spec.rb

@@ -8,7 +8,7 @@ describe 'issuable list', feature: true do
 
   before do
     project.add_user(user, :developer)
-    login_as(user)
+    gitlab_sign_in(user)
     issuable_types.each { |type| create_issuables(type) }
   end
 

spec/features/issues/award_emoji_spec.rb

@@ -12,7 +12,7 @@ describe 'Awards Emoji', feature: true do
   context 'authorized user' do
     before do
       project.team << [user, :master]
-      login_as(user)
+      gitlab_sign_in(user)
     end
 
     describe 'visiting an issue with a legacy award emoji that is not valid anymore' do

spec/features/issues/award_spec.rb

@@ -7,7 +7,7 @@ feature 'Issue awards', js: true, feature: true do
 
   describe 'logged in' do
     before do
-      login_as(user)
+      gitlab_sign_in(user)
       visit namespace_project_issue_path(project.namespace, project, issue)
       wait_for_requests
     end

spec/features/issues/bulk_assignment_labels_spec.rb

@@ -13,7 +13,7 @@ feature 'Issues > Labels bulk assignment', feature: true do
     before do
       project.team << [user, :master]
 
-      login_as user
+      gitlab_sign_in user
     end
 
     context 'can bulk assign' do
@@ -331,7 +331,7 @@ feature 'Issues > Labels bulk assignment', feature: true do
 
   context 'as a guest' do
     before do
-      login_as user
+      gitlab_sign_in user
 
       visit namespace_project_issues_path(project.namespace, project)
     end

spec/features/issues/create_branch_merge_request_spec.rb

@@ -8,7 +8,7 @@ feature 'Create Branch/Merge Request Dropdown on issue page', feature: true, js:
   context 'for team members' do
     before do
       project.team << [user, :developer]
-      login_as(user)
+      gitlab_sign_in(user)
     end
 
     it 'allows creating a merge request from the issue page' do

spec/features/issues/create_issue_for_discussions_in_merge_request_spec.rb

@@ -9,7 +9,7 @@ feature 'Resolving all open discussions in a merge request from an issue', featu
   describe 'as a user with access to the project' do
     before do
       project.team << [user, :master]
-      login_as user
+      gitlab_sign_in user
       visit namespace_project_merge_request_path(project.namespace, project, merge_request)
     end
 
@@ -82,7 +82,7 @@ feature 'Resolving all open discussions in a merge request from an issue', featu
   describe 'as a reporter' do
     before do
       project.team << [user, :reporter]
-      login_as user
+      gitlab_sign_in user
       visit new_namespace_project_issue_path(project.namespace, project, merge_request_to_resolve_discussions_of: merge_request.iid)
     end
 

spec/features/issues/create_issue_for_single_discussion_in_merge_request_spec.rb

@@ -9,7 +9,7 @@ feature 'Resolve an open discussion in a merge request by creating an issue', fe
   describe 'As a user with access to the project' do
     before do
       project.team << [user, :master]
-      login_as user
+      gitlab_sign_in user
       visit namespace_project_merge_request_path(project.namespace, project, merge_request)
     end
 
@@ -66,7 +66,7 @@ feature 'Resolve an open discussion in a merge request by creating an issue', fe
   describe 'as a reporter' do
     before do
       project.team << [user, :reporter]
-      login_as user
+      gitlab_sign_in user
       visit new_namespace_project_issue_path(project.namespace, project,
                                              merge_request_to_resolve_discussions_of: merge_request.iid,
                                              discussion_to_resolve: discussion.id)

spec/features/issues/filtered_search/dropdown_assignee_spec.rb

@@ -23,7 +23,7 @@ describe 'Dropdown assignee', :feature, :js do
     project.team << [user, :master]
     project.team << [user_john, :master]
     project.team << [user_jacob, :master]
-    login_as(user)
+    gitlab_sign_in(user)
     create(:issue, project: project)
 
     visit namespace_project_issues_path(project.namespace, project)

spec/features/issues/filtered_search/dropdown_author_spec.rb

@@ -31,7 +31,7 @@ describe 'Dropdown author', js: true, feature: true do
     project.team << [user, :master]
     project.team << [user_john, :master]
     project.team << [user_jacob, :master]
-    login_as(user)
+    gitlab_sign_in(user)
     create(:issue, project: project)
 
     visit namespace_project_issues_path(project.namespace, project)

spec/features/issues/filtered_search/dropdown_hint_spec.rb

@@ -14,7 +14,7 @@ describe 'Dropdown hint', :js, :feature do
 
   before do
     project.team << [user, :master]
-    login_as(user)
+    gitlab_sign_in(user)
     create(:issue, project: project)
 
     visit namespace_project_issues_path(project.namespace, project)

spec/features/issues/filtered_search/dropdown_label_spec.rb

@@ -34,7 +34,7 @@ describe 'Dropdown label', js: true, feature: true do
 
   before do
     project.add_master(user)
-    login_as(user)
+    gitlab_sign_in(user)
     create(:issue, project: project)
 
     visit namespace_project_issues_path(project.namespace, project)

spec/features/issues/filtered_search/dropdown_milestone_spec.rb

@@ -30,7 +30,7 @@ describe 'Dropdown milestone', :feature, :js do
 
   before do
     project.team << [user, :master]
-    login_as(user)
+    gitlab_sign_in(user)
     create(:issue, project: project)
 
     visit namespace_project_issues_path(project.namespace, project)

spec/features/issues/filtered_search/search_bar_spec.rb

@@ -9,7 +9,7 @@ describe 'Search bar', js: true, feature: true do
 
   before do
     project.team << [user, :master]
-    login_as(user)
+    gitlab_sign_in(user)
     create(:issue, project: project)
 
     visit namespace_project_issues_path(project.namespace, project)