Add ability to skip Guided Tour if shown

33f3288b · Sanad Liaquat · e968773f · 33f3288b · 33f3288b · 33f3288b
Commit 33f3288b authored 4 years ago by Sanad Liaquat
--- a/ee/app/assets/javascripts/onboarding/onboarding_welcome/components/welcome_page.vue
+++ b/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>

--- a/qa/qa.rb
+++ b/qa/qa.rb
@@ -183,6 +183,7 @@ module Main
      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

--- a/qa/qa/ee.rb
+++ b/qa/qa/ee.rb
@@ -49,6 +49,7 @@ module File

      module Main
        autoload :Banner, 'qa/ee/page/main/banner'
+        autoload :Onboarding, 'qa/ee/page/main/onboarding'
      end

      module Admin

--- a/qa/qa/ee/page/main/onboarding.rb
+++ b/qa/qa/ee/page/main/onboarding.rb
+# frozen_string_literal: true
+
+module QA
+  module EE
+    module Page
+      module Main
+        module Onboarding
+          extend QA::Page::PageConcern
+
+          def self.prepended(base)
+            super
+
+            base.class_eval do
+              view 'ee/app/assets/javascripts/onboarding/onboarding_welcome/components/welcome_page.vue' do
+                element :skip_for_now_link, required: true
+              end
+            end
+          end
+
+          def skip_for_now
+            click_element :skip_for_now_link, ::QA::Page::Main::Menu
+          end
+        end
+      end
+    end
+  end
+end
--- a/qa/qa/page/main/login.rb
+++ b/qa/qa/page/main/login.rb
@@ -165,6 +165,10 @@ def sign_in_using_gitlab_credentials(user:, skip_page_validation: false)
            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


--- a/qa/qa/page/main/onboarding.rb
+++ b/qa/qa/page/main/onboarding.rb
+# 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')
--- a/qa/qa/page/main/terms.rb
+++ b/qa/qa/page/main/terms.rb
@@ -15,7 +15,7 @@ class Terms < Page::Base
        end

        def accept_terms
-          click_element :accept_terms_button, Page::Main::Menu
+          click_element :accept_terms_button
        end
      end
    end