Add latest changes from gitlab-org/gitlab@master

2 files changed, 3 insertions, 9 deletions

diff --git a/qa/qa/specs/features/browser_ui/7_configure/auto_devops/create_project_with_auto_devops_spec.rb b/qa/qa/specs/features/browser_ui/7_configure/auto_devops/create_project_with_auto_devops_spec.rb
index 3f99ae644c7..a96bfde49f3 100644
--- a/qa/qa/specs/features/browser_ui/7_configure/auto_devops/create_project_with_auto_devops_spec.rb
+++ b/qa/qa/specs/features/browser_ui/7_configure/auto_devops/create_project_with_auto_devops_spec.rb
@@ -4,11 +4,6 @@ require 'pathname'
 
 module QA
   context 'Configure' do
-    def login
-      Runtime::Browser.visit(:gitlab, Page::Main::Login)
-      Page::Main::Login.perform(&:sign_in_using_credentials)
-    end
-
     def disable_optional_jobs(project)
       # Disable code_quality check in Auto DevOps pipeline as it takes
       # too long and times out the test
@@ -66,7 +61,7 @@ module QA
         end
 
         it 'runs auto devops' do
-          login
+          Flow::Login.sign_in
 
           @project = Resource::Project.fabricate! do |p|
             p.name = Runtime::Env.auto_devops_project_name || 'project-with-autodevops'
@@ -148,7 +143,7 @@ module QA
 
     describe 'Auto DevOps', :smoke do
       before do
-        login
+        Flow::Login.sign_in
 
         @project = Resource::Project.fabricate_via_browser_ui! do |p|
           p.name = "project-with-autodevops-#{SecureRandom.hex(8)}"
diff --git a/qa/qa/specs/features/browser_ui/non_devops/performance_bar_spec.rb b/qa/qa/specs/features/browser_ui/non_devops/performance_bar_spec.rb
index 757d047b728..f96206f1747 100644
--- a/qa/qa/specs/features/browser_ui/non_devops/performance_bar_spec.rb
+++ b/qa/qa/specs/features/browser_ui/non_devops/performance_bar_spec.rb
@@ -4,8 +4,7 @@ module QA
   context 'Performance bar' do
     context 'when logged in as an admin user', :requires_admin do
       before do
-        Runtime::Browser.visit(:gitlab, Page::Main::Login)
-        Page::Main::Login.perform(&:sign_in_using_admin_credentials)
+        Flow::Login.sign_in_as_admin
         Page::Main::Menu.perform(&:go_to_admin_area)
         Page::Admin::Menu.perform(&:go_to_metrics_and_profiling_settings)