Commit 29b33778 authored by Sanad Liaquat's avatar Sanad Liaquat

Merge branch 'revert-cc8bc460' into 'master'

Revert "Merge branch 'qa-shl-consider-onboarding-on-login' into 'master'"

See merge request gitlab-org/gitlab!35317
parents c8bebc72 98e9e33c
......@@ -129,7 +129,7 @@ export default {
{{ __("Ok let's go") }}
</gl-link>
<p class="small mt-8">
<gl-link class="qa-skip-tour-btn" data-qa-selector="skip_for_now_link" @click="skipTour">
<gl-link class="qa-skip-tour-btn" @click="skipTour">
{{ skipText }}
</gl-link>
</p>
......
......@@ -183,7 +183,6 @@ 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
......
......@@ -49,7 +49,6 @@ module QA
module Main
autoload :Banner, 'qa/ee/page/main/banner'
autoload :Onboarding, 'qa/ee/page/main/onboarding'
end
module Admin
......
# 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
......@@ -165,10 +165,6 @@ 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
......
# 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')
......@@ -15,7 +15,7 @@ module QA
end
def accept_terms
click_element :accept_terms_button
click_element :accept_terms_button, Page::Main::Menu
end
end
end
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment