Commit cd6bd877 authored by Natalia Tepluhina's avatar Natalia Tepluhina

Merge branch 'psimyn-master-patch-27728' into 'master'

Fix summary stats on iteration report

See merge request gitlab-org/gitlab!67942
parents 8d07beae 75ee06e7
...@@ -5,6 +5,7 @@ query IterationIssuesSummary( ...@@ -5,6 +5,7 @@ query IterationIssuesSummary(
$weight: Boolean = false $weight: Boolean = false
) { ) {
group(fullPath: $fullPath) @include(if: $isGroup) { group(fullPath: $fullPath) @include(if: $isGroup) {
id
openIssues: issues( openIssues: issues(
iterationId: [$id] iterationId: [$id]
state: opened state: opened
...@@ -29,6 +30,7 @@ query IterationIssuesSummary( ...@@ -29,6 +30,7 @@ query IterationIssuesSummary(
} }
} }
project(fullPath: $fullPath) @skip(if: $isGroup) { project(fullPath: $fullPath) @skip(if: $isGroup) {
id
openIssues: issues(iterationId: [$id], state: opened, assigneeId: "none") { openIssues: issues(iterationId: [$id], state: opened, assigneeId: "none") {
count @skip(if: $weight) count @skip(if: $weight)
weight @include(if: $weight) weight @include(if: $weight)
......
...@@ -47,9 +47,9 @@ RSpec.describe 'User views iteration' do ...@@ -47,9 +47,9 @@ RSpec.describe 'User views iteration' do
end end
aggregate_failures 'expect summary information' do aggregate_failures 'expect summary information' do
expect(page).to have_content("Completed") expect(page).to have_content("Completed 25%")
expect(page).to have_content("Incomplete") expect(page).to have_content("Incomplete 25%")
expect(page).to have_content("Unstarted") expect(page).to have_content("Unstarted 50%")
end end
aggregate_failures 'expect burnup and burndown charts' do aggregate_failures 'expect burnup and burndown charts' do
......
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