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
2d894a4e
Commit
2d894a4e
authored
Aug 25, 2020
by
Alex Buijs
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Replace div’s with ordered list
- semantic html - translatable - automatic numbering
parent
ae81cd5d
Changes
8
Hide whitespace changes
Inline
Side-by-side
Showing
8 changed files
with
26 additions
and
18 deletions
+26
-18
ee/app/assets/javascripts/registrations/components/progress_bar.vue
...ets/javascripts/registrations/components/progress_bar.vue
+5
-5
ee/app/assets/stylesheets/pages/subscriptions.scss
ee/app/assets/stylesheets/pages/subscriptions.scss
+3
-0
ee/changelogs/unreleased/217345-follow-up-from-move-registrations-progress-bar-and-make-it-conf.yml
...from-move-registrations-progress-bar-and-make-it-conf.yml
+5
-0
ee/spec/features/registrations/new_group_spec.rb
ee/spec/features/registrations/new_group_spec.rb
+1
-1
ee/spec/features/registrations/new_project_spec.rb
ee/spec/features/registrations/new_project_spec.rb
+2
-2
ee/spec/features/registrations/welcome_spec.rb
ee/spec/features/registrations/welcome_spec.rb
+5
-5
ee/spec/features/subscriptions/groups/edit_spec.rb
ee/spec/features/subscriptions/groups/edit_spec.rb
+3
-3
ee/spec/frontend/subscriptions/new/components/checkout/progress_bar_spec.js
...ubscriptions/new/components/checkout/progress_bar_spec.js
+2
-2
No files found.
ee/app/assets/javascripts/registrations/components/progress_bar.vue
View file @
2d894a4e
...
@@ -29,9 +29,9 @@ export default {
...
@@ -29,9 +29,9 @@ export default {
};
};
</
script
>
</
script
>
<
template
>
<
template
>
<
div
class=
"bar d-flex
"
>
<
ol
class=
"bar gl-display-flex gl-p-0 gl-m-0
"
>
<
div
v-for=
"(step, index) in steps"
:key=
"index"
:class=
"classObject(index)"
>
<
li
v-for=
"(step, index) in steps"
:key=
"index"
:class=
"classObject(index)"
>
{{
index
+
1
}}
.
{{
step
}}
{{
step
}}
</
div
>
</
li
>
</
div
>
</
ol
>
</
template
>
</
template
>
ee/app/assets/stylesheets/pages/subscriptions.scss
View file @
2d894a4e
...
@@ -43,6 +43,9 @@ $subscriptions-full-width-lg: 541px;
...
@@ -43,6 +43,9 @@ $subscriptions-full-width-lg: 541px;
width
:
400px
;
width
:
400px
;
}
}
list-style-position
:
inside
;
list-style-type
:
decimal
;
.phase
{
.phase
{
border-bottom
:
5px
solid
$gray-100
;
border-bottom
:
5px
solid
$gray-100
;
color
:
$gray-500
;
color
:
$gray-500
;
...
...
ee/changelogs/unreleased/217345-follow-up-from-move-registrations-progress-bar-and-make-it-conf.yml
0 → 100644
View file @
2d894a4e
---
title
:
Use semantic HTML in Progress Bar component
merge_request
:
40380
author
:
type
:
changed
ee/spec/features/registrations/new_group_spec.rb
View file @
2d894a4e
...
@@ -13,7 +13,7 @@ RSpec.describe 'New group screen', :js do
...
@@ -13,7 +13,7 @@ RSpec.describe 'New group screen', :js do
it
'shows the progress bar with the correct steps'
do
it
'shows the progress bar with the correct steps'
do
expect
(
page
).
to
have_content
(
'Create your group'
)
expect
(
page
).
to
have_content
(
'Create your group'
)
expect
(
page
).
to
have_content
(
'
1. Your profile 2. Your GitLab group 3.
Your first project'
)
expect
(
page
).
to
have_content
(
'
Your profile Your GitLab group
Your first project'
)
end
end
it
'autofills the group path'
do
it
'autofills the group path'
do
...
...
ee/spec/features/registrations/new_project_spec.rb
View file @
2d894a4e
...
@@ -19,12 +19,12 @@ RSpec.describe 'New project screen', :js do
...
@@ -19,12 +19,12 @@ RSpec.describe 'New project screen', :js do
it
'shows the progress bar with the correct steps'
do
it
'shows the progress bar with the correct steps'
do
expect
(
subject
).
to
have_content
(
'Create/import your first project'
)
expect
(
subject
).
to
have_content
(
'Create/import your first project'
)
expect
(
subject
).
to
have_content
(
'
1. Your profile 2. Your GitLab group 3.
Your first project'
)
expect
(
subject
).
to
have_content
(
'
Your profile Your GitLab group
Your first project'
)
end
end
context
'when in the subscription flow'
do
context
'when in the subscription flow'
do
let
(
:in_subscription_flow
)
{
true
}
let
(
:in_subscription_flow
)
{
true
}
it
{
is_expected
.
to
have_content
(
'
1. Your profile 2. Checkout 3. Your GitLab group 4.
Your first project'
)
}
it
{
is_expected
.
to
have_content
(
'
Your profile Checkout Your GitLab group
Your first project'
)
}
end
end
end
end
ee/spec/features/registrations/welcome_spec.rb
View file @
2d894a4e
...
@@ -22,14 +22,14 @@ RSpec.describe 'Welcome screen', :js do
...
@@ -22,14 +22,14 @@ RSpec.describe 'Welcome screen', :js do
it
'shows the welcome page without a progress bar'
do
it
'shows the welcome page without a progress bar'
do
expect
(
page
).
to
have_content
(
'Welcome to GitLab.com'
)
expect
(
page
).
to
have_content
(
'Welcome to GitLab.com'
)
expect
(
page
).
not_to
have_content
(
'
1.
Your profile'
)
expect
(
page
).
not_to
have_content
(
'Your profile'
)
end
end
context
'when in the subscription flow'
do
context
'when in the subscription flow'
do
let
(
:in_subscription_flow
)
{
true
}
let
(
:in_subscription_flow
)
{
true
}
it
'shows the progress bar with the correct steps'
do
it
'shows the progress bar with the correct steps'
do
expect
(
page
).
to
have_content
(
'
1. Your profile 2. Checkout 3.
Your GitLab group'
)
expect
(
page
).
to
have_content
(
'
Your profile Checkout
Your GitLab group'
)
end
end
end
end
...
@@ -37,14 +37,14 @@ RSpec.describe 'Welcome screen', :js do
...
@@ -37,14 +37,14 @@ RSpec.describe 'Welcome screen', :js do
let
(
:part_of_onboarding_issues_experiment
)
{
true
}
let
(
:part_of_onboarding_issues_experiment
)
{
true
}
it
'shows the progress bar with the correct steps'
do
it
'shows the progress bar with the correct steps'
do
expect
(
page
).
to
have_content
(
'
1. Your profile 2. Your GitLab group 3.
Your first project'
)
expect
(
page
).
to
have_content
(
'
Your profile Your GitLab group
Your first project'
)
end
end
context
'when in the invitation flow'
do
context
'when in the invitation flow'
do
let
(
:in_invitation_flow
)
{
true
}
let
(
:in_invitation_flow
)
{
true
}
it
'does not show the progress bar'
do
it
'does not show the progress bar'
do
expect
(
page
).
not_to
have_content
(
'
1.
Your profile'
)
expect
(
page
).
not_to
have_content
(
'Your profile'
)
end
end
end
end
end
end
...
@@ -54,7 +54,7 @@ RSpec.describe 'Welcome screen', :js do
...
@@ -54,7 +54,7 @@ RSpec.describe 'Welcome screen', :js do
let
(
:part_of_onboarding_issues_experiment
)
{
true
}
let
(
:part_of_onboarding_issues_experiment
)
{
true
}
it
'shows the progress bar with the correct steps'
do
it
'shows the progress bar with the correct steps'
do
expect
(
page
).
to
have_content
(
'
1. Your profile 2. Checkout 3. Your GitLab group 4.
Your first project'
)
expect
(
page
).
to
have_content
(
'
Your profile Checkout Your GitLab group
Your first project'
)
end
end
end
end
end
end
...
...
ee/spec/features/subscriptions/groups/edit_spec.rb
View file @
2d894a4e
...
@@ -22,21 +22,21 @@ RSpec.describe 'Welcome screen', :js do
...
@@ -22,21 +22,21 @@ RSpec.describe 'Welcome screen', :js do
it
'shows the group edit page without a progress bar'
do
it
'shows the group edit page without a progress bar'
do
expect
(
page
).
to
have_content
(
'Create your group'
)
expect
(
page
).
to
have_content
(
'Create your group'
)
expect
(
page
).
not_to
have_content
(
'
1.
Your profile'
)
expect
(
page
).
not_to
have_content
(
'Your profile'
)
end
end
context
'when showing for a new user'
do
context
'when showing for a new user'
do
let
(
:params
)
{
{
new_user:
true
}
}
let
(
:params
)
{
{
new_user:
true
}
}
it
'shows the progress bar with the correct steps'
do
it
'shows the progress bar with the correct steps'
do
expect
(
page
).
to
have_content
(
'
1. Your profile 2. Checkout 3.
Your GitLab group'
)
expect
(
page
).
to
have_content
(
'
Your profile Checkout
Your GitLab group'
)
end
end
context
'when part of the onboarding issues experiment'
do
context
'when part of the onboarding issues experiment'
do
let
(
:part_of_onboarding_issues_experiment
)
{
true
}
let
(
:part_of_onboarding_issues_experiment
)
{
true
}
it
'shows the progress bar with the correct steps'
do
it
'shows the progress bar with the correct steps'
do
expect
(
page
).
to
have_content
(
'
1. Your profile 2. Checkout 3. Your GitLab group 4.
Your first project'
)
expect
(
page
).
to
have_content
(
'
Your profile Checkout Your GitLab group
Your first project'
)
end
end
end
end
end
end
...
...
ee/spec/frontend/subscriptions/new/components/checkout/progress_bar_spec.js
View file @
2d894a4e
...
@@ -10,8 +10,8 @@ describe('Progress Bar', () => {
...
@@ -10,8 +10,8 @@ describe('Progress Bar', () => {
});
});
};
};
const
firstStep
=
()
=>
wrapper
.
find
(
'
.bar
div
:nth-child(1)
'
);
const
firstStep
=
()
=>
wrapper
.
find
(
'
.bar
li
:nth-child(1)
'
);
const
secondStep
=
()
=>
wrapper
.
find
(
'
.bar
div
:nth-child(2)
'
);
const
secondStep
=
()
=>
wrapper
.
find
(
'
.bar
li
:nth-child(2)
'
);
beforeEach
(()
=>
{
beforeEach
(()
=>
{
createComponent
({
currentStep
:
'
b
'
,
steps
:
[
'
a
'
,
'
b
'
]
});
createComponent
({
currentStep
:
'
b
'
,
steps
:
[
'
a
'
,
'
b
'
]
});
...
...
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