Add latest changes from gitlab-org/gitlab@master

4 files changed, 10 insertions, 4 deletions

diff --git a/qa/qa/page/main/login.rb b/qa/qa/page/main/login.rb
index 6e266e26d78..cb3421f93c2 100644
--- a/qa/qa/page/main/login.rb
+++ b/qa/qa/page/main/login.rb
@@ -42,6 +42,10 @@ module QA
           element :login_page, required: true
         end
 
+        def can_sign_in?
+          has_element?(:sign_in_button)
+        end
+
         def sign_in_using_credentials(user: nil, skip_page_validation: false)
           # Don't try to log-in if we're already logged-in
           return if Page::Main::Menu.perform(&:signed_in?)
diff --git a/qa/qa/specs/features/browser_ui/1_manage/login/log_in_spec.rb b/qa/qa/specs/features/browser_ui/1_manage/login/log_in_spec.rb
index 6556c28ccab..d8233fc5586 100644
--- a/qa/qa/specs/features/browser_ui/1_manage/login/log_in_spec.rb
+++ b/qa/qa/specs/features/browser_ui/1_manage/login/log_in_spec.rb
@@ -14,11 +14,11 @@ module QA
         Support::Retrier.retry_until(sleep_interval: 0.5) do
           Page::Main::Menu.perform(&:sign_out)
 
-          Page::Main::Login.perform(&:has_sign_in_tab?)
+          Page::Main::Login.perform(&:can_sign_in?)
         end
 
         Page::Main::Login.perform do |form|
-          expect(form.sign_in_tab?).to be(true)
+          expect(form.can_sign_in?).to be(true)
         end
       end
     end
diff --git a/qa/qa/specs/features/browser_ui/1_manage/login/login_via_oauth_spec.rb b/qa/qa/specs/features/browser_ui/1_manage/login/login_via_oauth_spec.rb
index a118176eb8a..4fd80c353fb 100644
--- a/qa/qa/specs/features/browser_ui/1_manage/login/login_via_oauth_spec.rb
+++ b/qa/qa/specs/features/browser_ui/1_manage/login/login_via_oauth_spec.rb
@@ -1,7 +1,8 @@
 # frozen_string_literal: true
 
 module QA
-  context 'Manage', :orchestrated, :oauth do
+  # Failure issue: https://gitlab.com/gitlab-org/gitlab/issues/36305
+  context 'Manage', :orchestrated, :oauth, :skip do
     describe 'OAuth login' do
       it 'User logs in to GitLab with GitHub OAuth' do
         Runtime::Browser.visit(:gitlab, Page::Main::Login)
diff --git a/qa/qa/specs/features/browser_ui/3_create/merge_request/create_merge_request_spec.rb b/qa/qa/specs/features/browser_ui/3_create/merge_request/create_merge_request_spec.rb
index 6969f123f95..6bdec232bb0 100644
--- a/qa/qa/specs/features/browser_ui/3_create/merge_request/create_merge_request_spec.rb
+++ b/qa/qa/specs/features/browser_ui/3_create/merge_request/create_merge_request_spec.rb
@@ -28,7 +28,8 @@ module QA
         end
       end
 
-      it 'creates a merge request with a milestone and label' do
+      # Failure issue (in master): https://gitlab.com/gitlab-org/gitlab/issues/37304
+      it 'creates a merge request with a milestone and label', :quarantine do
         gitlab_account_username = "@#{Runtime::User.username}"
 
         milestone = Resource::ProjectMilestone.fabricate_via_api! do |milestone|