Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
1
Merge Requests
1
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
nexedi
gitlab-ce
Commits
632a7ad6
Commit
632a7ad6
authored
Jun 29, 2020
by
Sanad Liaquat
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Add ability to skip Guided Tour if shown - Take 2
parent
67a0b331
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
47 additions
and
1 deletion
+47
-1
ee/app/assets/javascripts/onboarding/onboarding_welcome/components/welcome_page.vue
...onboarding/onboarding_welcome/components/welcome_page.vue
+1
-1
qa/qa/ee.rb
qa/qa/ee.rb
+2
-0
qa/qa/ee/page/main/login.rb
qa/qa/ee/page/main/login.rb
+17
-0
qa/qa/ee/page/main/onboarding.rb
qa/qa/ee/page/main/onboarding.rb
+23
-0
qa/qa/page/main/login.rb
qa/qa/page/main/login.rb
+4
-0
No files found.
ee/app/assets/javascripts/onboarding/onboarding_welcome/components/welcome_page.vue
View file @
632a7ad6
...
@@ -129,7 +129,7 @@ export default {
...
@@ -129,7 +129,7 @@ export default {
{{
__
(
"
Ok let's go
"
)
}}
{{
__
(
"
Ok let's go
"
)
}}
</gl-link>
</gl-link>
<p
class=
"small mt-8"
>
<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
}}
{{
skipText
}}
</gl-link>
</gl-link>
</p>
</p>
...
...
qa/qa/ee.rb
View file @
632a7ad6
...
@@ -49,6 +49,8 @@ module QA
...
@@ -49,6 +49,8 @@ module QA
module
Main
module
Main
autoload
:Banner
,
'qa/ee/page/main/banner'
autoload
:Banner
,
'qa/ee/page/main/banner'
autoload
:Login
,
'qa/ee/page/main/login'
autoload
:Onboarding
,
'qa/ee/page/main/onboarding'
end
end
module
Admin
module
Admin
...
...
qa/qa/ee/page/main/login.rb
0 → 100644
View file @
632a7ad6
# 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
0 → 100644
View file @
632a7ad6
# 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
View file @
632a7ad6
...
@@ -165,6 +165,8 @@ module QA
...
@@ -165,6 +165,8 @@ module QA
terms
.
accept_terms
if
terms
.
visible?
terms
.
accept_terms
if
terms
.
visible?
end
end
skip_onboarding
if
respond_to?
(
:skip_onboarding
)
Page
::
Main
::
Menu
.
validate_elements_present!
unless
skip_page_validation
Page
::
Main
::
Menu
.
validate_elements_present!
unless
skip_page_validation
end
end
...
@@ -179,3 +181,5 @@ module QA
...
@@ -179,3 +181,5 @@ module QA
end
end
end
end
end
end
QA
::
Page
::
Main
::
Login
.
prepend_if_ee
(
'QA::EE::Page::Main::Login'
)
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment