Add latest changes from gitlab-org/gitlab@master

4 files changed, 18 insertions, 1 deletions

diff --git a/qa/qa.rb b/qa/qa.rb
index d848aca9a66..3cbc590f1cd 100644
--- a/qa/qa.rb
+++ b/qa/qa.rb
@@ -183,6 +183,7 @@ module QA
       autoload :OAuth, 'qa/page/main/oauth'
       autoload :SignUp, 'qa/page/main/sign_up'
       autoload :Terms, 'qa/page/main/terms'
+      autoload :Onboarding, 'qa/page/main/onboarding'
     end
 
     module Settings
diff --git a/qa/qa/page/main/login.rb b/qa/qa/page/main/login.rb
index 8eb28eb53e7..c70c2bbd5d3 100644
--- a/qa/qa/page/main/login.rb
+++ b/qa/qa/page/main/login.rb
@@ -165,6 +165,10 @@ module QA
             terms.accept_terms if terms.visible?
           end
 
+          QA::Page::Main::Onboarding.perform do |onboarding|
+            onboarding.skip_for_now if onboarding.respond_to?(:skip_for_now) && onboarding.visible?
+          end
+
           Page::Main::Menu.validate_elements_present! unless skip_page_validation
         end
 
diff --git a/qa/qa/page/main/onboarding.rb b/qa/qa/page/main/onboarding.rb
new file mode 100644
index 00000000000..27c2b745e8e
--- /dev/null
+++ b/qa/qa/page/main/onboarding.rb
@@ -0,0 +1,12 @@
+# frozen_string_literal: true
+
+module QA
+  module Page
+    module Main
+      class Onboarding < Page::Base
+      end
+    end
+  end
+end
+
+QA::Page::Main::Onboarding.prepend_if_ee('QA::EE::Page::Main::Onboarding')
diff --git a/qa/qa/page/main/terms.rb b/qa/qa/page/main/terms.rb
index a0de267fb31..bf3219a739f 100644
--- a/qa/qa/page/main/terms.rb
+++ b/qa/qa/page/main/terms.rb
@@ -15,7 +15,7 @@ module QA
         end
 
         def accept_terms
-          click_element :accept_terms_button, Page::Main::Menu
+          click_element :accept_terms_button
         end
       end
     end