Merge branch 'qa-shl-consider-onboarding-on-login-take-2' into 'master'

Add ability to skip Guided Tour if shown - Take 2

Closes #220891

See merge request gitlab-org/gitlab!35318

ee/app/assets/javascripts/onboarding/onboarding_welcome/components/welcome_page.vue

@@ -129,7 +129,7 @@ export default {
         {{ __("Ok let's go") }}
       </gl-link>
       <p class="small mt-8">
-        <gl-link class="qa-skip-tour-btn" @click="skipTour">
+        <gl-link class="qa-skip-tour-btn" data-qa-selector="skip_for_now_link" @click="skipTour">
           {{ skipText }}
         </gl-link>
       </p>

qa/qa/ee.rb

@@ -49,6 +49,8 @@ module QA
 
       module Main
         autoload :Banner, 'qa/ee/page/main/banner'
+        autoload :Login, 'qa/ee/page/main/login'
+        autoload :Onboarding, 'qa/ee/page/main/onboarding'
       end
 
       module Admin

qa/qa/ee/page/main/login.rb

+# frozen_string_literal: true
+
+module QA
+  module EE
+    module Page
+      module Main
+        module Login
+          extend QA::Page::PageConcern
+
+          def skip_onboarding
+            Page::Main::Onboarding.perform(&:skip_if_visible)
+          end
+        end
+      end
+    end
+  end
+end

qa/qa/ee/page/main/onboarding.rb

+# frozen_string_literal: true
+
+module QA
+  module EE
+    module Page
+      module Main
+        class Onboarding < QA::Page::Base
+          view 'ee/app/assets/javascripts/onboarding/onboarding_welcome/components/welcome_page.vue' do
+            element :skip_for_now_link, required: true
+          end
+
+          def skip_if_visible
+            click_skip_for_now_link if visible?
+          end
+
+          def click_skip_for_now_link
+            click_element :skip_for_now_link, ::QA::Page::Main::Menu
+          end
+        end
+      end
+    end
+  end
+end

qa/qa/page/main/login.rb

@@ -165,6 +165,8 @@ module QA
             terms.accept_terms if terms.visible?
           end
 
+          skip_onboarding if respond_to?(:skip_onboarding)
+
           Page::Main::Menu.validate_elements_present! unless skip_page_validation
         end
 
@@ -179,3 +181,5 @@ module QA
     end
   end
 end
+
+QA::Page::Main::Login.prepend_if_ee('QA::EE::Page::Main::Login')