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
0c465f4c
Commit
0c465f4c
authored
Jul 01, 2021
by
Simon Knox
Committed by
Vitaly Slobodin
Jul 01, 2021
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Include cadences from parent groups
parent
63a9b054
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
15 additions
and
2 deletions
+15
-2
ee/app/assets/javascripts/iterations/queries/iteration_cadences_list.query.graphql
.../iterations/queries/iteration_cadences_list.query.graphql
+1
-0
ee/spec/features/groups/iterations/user_views_iteration_cadence_spec.rb
...es/groups/iterations/user_views_iteration_cadence_spec.rb
+14
-2
No files found.
ee/app/assets/javascripts/iterations/queries/iteration_cadences_list.query.graphql
View file @
0c465f4c
...
...
@@ -9,6 +9,7 @@ query IterationCadences(
)
{
group
(
fullPath
:
$fullPath
)
{
iterationCadences
(
includeAncestorGroups
:
true
before
:
$beforeCursor
after
:
$afterCursor
first
:
$firstPageSize
...
...
ee/spec/features/groups/iterations/user_views_iteration_cadence_spec.rb
View file @
0c465f4c
...
...
@@ -5,19 +5,21 @@ require 'spec_helper'
RSpec
.
describe
'User views iteration cadences'
,
:js
do
let_it_be
(
:user
)
{
create
(
:user
)
}
let_it_be
(
:group
)
{
create
(
:group
)
}
let_it_be
(
:subgroup
)
{
create
(
:group
,
parent:
group
)
}
let_it_be
(
:cadence
)
{
create
(
:iterations_cadence
,
group:
group
)
}
let_it_be
(
:other_cadence
)
{
create
(
:iterations_cadence
,
group:
group
)
}
let_it_be
(
:subgroup_cadence
)
{
create
(
:iterations_cadence
,
group:
subgroup
)
}
let_it_be
(
:iteration_in_cadence
)
{
create
(
:iteration
,
group:
group
,
iterations_cadence:
cadence
)
}
let_it_be
(
:closed_iteration_in_cadence
)
{
create
(
:iteration
,
group:
group
,
iterations_cadence:
cadence
,
start_date:
2
.
weeks
.
ago
,
due_date:
1
.
week
.
ago
)
}
let_it_be
(
:iteration_in_other_cadence
)
{
create
(
:iteration
,
group:
group
,
iterations_cadence:
other_cadence
)
}
before
do
stub_licensed_features
(
iterations:
true
)
visit
group_iteration_cadences_path
(
group
)
end
it
'shows iteration cadences with iterations when expanded'
,
:aggregate_failures
do
visit
group_iteration_cadences_path
(
group
)
expect
(
page
).
to
have_title
(
'Iteration cadences'
)
expect
(
page
).
to
have_content
(
cadence
.
title
)
expect
(
page
).
to
have_content
(
other_cadence
.
title
)
...
...
@@ -27,15 +29,25 @@ RSpec.describe 'User views iteration cadences', :js do
click_button
cadence
.
title
expect
(
page
).
to
have_content
(
iteration_in_cadence
.
title
)
expect
(
page
).
not_to
have_content
(
subgroup_cadence
.
title
)
expect
(
page
).
not_to
have_content
(
iteration_in_other_cadence
.
title
)
expect
(
page
).
not_to
have_content
(
closed_iteration_in_cadence
.
title
)
end
it
'only shows completed iterations on Done tab'
,
:aggregate_failures
do
visit
group_iteration_cadences_path
(
group
)
click_link
'Done'
click_button
cadence
.
title
expect
(
page
).
not_to
have_content
(
iteration_in_cadence
.
title
)
expect
(
page
).
to
have_content
(
closed_iteration_in_cadence
.
title
)
end
it
'shows inherited cadences in subgroup'
,
:aggregate_failures
do
visit
group_iteration_cadences_path
(
subgroup
)
expect
(
page
).
to
have_content
(
cadence
.
title
)
expect
(
page
).
to
have_content
(
other_cadence
.
title
)
expect
(
page
).
to
have_content
(
subgroup_cadence
.
title
)
end
end
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