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
ea85d05c
Commit
ea85d05c
authored
Jan 28, 2022
by
Florie Guibert
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Roadmap settings - Move epics state to sidebar
Review feedback
parent
317eab2c
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
11 additions
and
38 deletions
+11
-38
ee/app/assets/javascripts/roadmap/components/roadmap_epics_state.vue
...ts/javascripts/roadmap/components/roadmap_epics_state.vue
+10
-10
ee/spec/features/groups/group_roadmap_spec.rb
ee/spec/features/groups/group_roadmap_spec.rb
+0
-23
ee/spec/frontend/roadmap/components/roadmap_epics_state_spec.js
...c/frontend/roadmap/components/roadmap_epics_state_spec.js
+1
-5
No files found.
ee/app/assets/javascripts/roadmap/components/roadmap_epics_state.vue
View file @
ea85d05c
...
@@ -36,14 +36,14 @@ export default {
...
@@ -36,14 +36,14 @@ export default {
</
script
>
</
script
>
<
template
>
<
template
>
<
gl-form-group
class=
"gl-mb-0"
data-testid=
"roadmap-epics-state"
>
<
div
>
<
label
for=
"roadmap-epics-state"
class=
"gl-display-block"
>
{{
$options
.
i18n
.
header
}}
</label
>
<
gl-form-group
class=
"gl-mb-0"
:label=
"$options.i18n.header"
data-testid=
"roadmap-epics-state"
>
<gl-form-radio-group
<gl-form-radio-group
id=
"roadmap-epics-state"
:checked=
"epicsState"
:checked=
"epicsState"
stacked
stacked
:options=
"availableStates"
:options=
"availableStates"
@
change=
"handleEpicStateChange"
@
change=
"handleEpicStateChange"
/>
/>
</gl-form-group>
</gl-form-group>
</div>
</
template
>
</
template
>
ee/spec/features/groups/group_roadmap_spec.rb
View file @
ea85d05c
...
@@ -122,19 +122,6 @@ RSpec.describe 'group epic roadmap', :js do
...
@@ -122,19 +122,6 @@ RSpec.describe 'group epic roadmap', :js do
expect
(
page
).
to
have_selector
(
'.epics-list-item .epic-title'
,
count:
1
)
expect
(
page
).
to
have_selector
(
'.epics-list-item .epic-title'
,
count:
1
)
end
end
end
end
it
'saves last selected epic state'
,
quarantine:
'https://gitlab.com/gitlab-org/gitlab/-/issues/341827'
do
state_dropdown
.
find
(
'button'
,
text:
'Open epics'
).
click
wait_for_all_requests
visit
group_roadmap_path
(
group
)
wait_for_requests
expect
(
state_dropdown
.
find
(
'.dropdown-toggle'
)).
to
have_text
(
"Open epics"
)
page
.
within
(
'.roadmap-container .epics-list-section'
)
do
expect
(
page
).
to
have_selector
(
'.epics-list-item .epic-title'
,
count:
2
)
end
end
end
end
describe
'roadmap page with filter applied'
do
describe
'roadmap page with filter applied'
do
...
@@ -315,16 +302,6 @@ RSpec.describe 'group epic roadmap', :js do
...
@@ -315,16 +302,6 @@ RSpec.describe 'group epic roadmap', :js do
expect
(
page
).
to
have_content
(
epic_with_bug
.
title
)
expect
(
page
).
to
have_content
(
epic_with_bug
.
title
)
end
end
end
end
# it 'keeps label filter when filtering by state' do
# state_dropdown.find('.dropdown-toggle').click
# state_dropdown.find('button', text: 'Open epics').click
# page.within('.roadmap-container .epics-list-section') do
# expect(page).to have_selector('.epics-list-item .epic-title', count: 1)
# expect(page).to have_content(epic_with_bug.title)
# end
# end
end
end
describe
'roadmap page with sort order applied'
do
describe
'roadmap page with sort order applied'
do
...
...
ee/spec/frontend/roadmap/components/roadmap_epics_state_spec.js
View file @
ea85d05c
...
@@ -39,13 +39,9 @@ describe('RoadmapEpicsState', () => {
...
@@ -39,13 +39,9 @@ describe('RoadmapEpicsState', () => {
});
});
describe
(
'
template
'
,
()
=>
{
describe
(
'
template
'
,
()
=>
{
it
(
'
renders field label
'
,
()
=>
{
expect
(
wrapper
.
find
(
'
label
'
).
exists
()).
toBe
(
true
);
expect
(
wrapper
.
find
(
'
label
'
).
text
()).
toContain
(
'
Epics
'
);
});
it
(
'
renders form group
'
,
()
=>
{
it
(
'
renders form group
'
,
()
=>
{
expect
(
findFormGroup
().
exists
()).
toBe
(
true
);
expect
(
findFormGroup
().
exists
()).
toBe
(
true
);
expect
(
findFormGroup
().
attributes
(
'
label
'
)).
toBe
(
'
Epics
'
);
});
});
it
(
'
renders radio form group
'
,
()
=>
{
it
(
'
renders radio form group
'
,
()
=>
{
...
...
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