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
f15eb00b
Commit
f15eb00b
authored
Mar 19, 2020
by
Ezekiel Kigbo
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Pass active stages to the duration chart
parent
5f46d0b1
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
49 additions
and
4 deletions
+49
-4
ee/app/assets/javascripts/analytics/cycle_analytics/components/base.vue
...javascripts/analytics/cycle_analytics/components/base.vue
+2
-2
ee/changelogs/unreleased/211782-hidden-default-stages-appearing-in-duration-chart.yml
...782-hidden-default-stages-appearing-in-duration-chart.yml
+5
-0
ee/spec/features/analytics/cycle_analytics/cycle_analytics_spec.rb
...eatures/analytics/cycle_analytics/cycle_analytics_spec.rb
+42
-2
No files found.
ee/app/assets/javascripts/analytics/cycle_analytics/components/base.vue
View file @
f15eb00b
...
@@ -304,9 +304,9 @@ export default {
...
@@ -304,9 +304,9 @@ export default {
<div
class=
"mt-3 d-flex"
>
<div
class=
"mt-3 d-flex"
>
<h4
class=
"mt-0"
>
{{
s__
(
'
CycleAnalytics|Days to completion
'
)
}}
</h4>
<h4
class=
"mt-0"
>
{{
s__
(
'
CycleAnalytics|Days to completion
'
)
}}
</h4>
<stage-dropdown-filter
<stage-dropdown-filter
v-if=
"
s
tages.length"
v-if=
"
activeS
tages.length"
class=
"ml-auto"
class=
"ml-auto"
:stages=
"
s
tages"
:stages=
"
activeS
tages"
@
selected=
"onDurationStageSelect"
@
selected=
"onDurationStageSelect"
/>
/>
</div>
</div>
...
...
ee/changelogs/unreleased/211782-hidden-default-stages-appearing-in-duration-chart.yml
0 → 100644
View file @
f15eb00b
---
title
:
Hidden stages should not appear in duration chart
merge_request
:
27568
author
:
type
:
fixed
ee/spec/features/analytics/cycle_analytics/cycle_analytics_spec.rb
View file @
f15eb00b
...
@@ -402,6 +402,7 @@ describe 'Group Value Stream Analytics', :js do
...
@@ -402,6 +402,7 @@ describe 'Group Value Stream Analytics', :js do
let
(
:params
)
{
{
name:
custom_stage_name
,
start_event_identifier:
start_event_identifier
,
end_event_identifier:
end_event_identifier
}
}
let
(
:params
)
{
{
name:
custom_stage_name
,
start_event_identifier:
start_event_identifier
,
end_event_identifier:
end_event_identifier
}
}
let
(
:first_default_stage
)
{
page
.
find
(
'.stage-nav-item-cell'
,
text:
"Issue"
).
ancestor
(
".stage-nav-item"
)
}
let
(
:first_default_stage
)
{
page
.
find
(
'.stage-nav-item-cell'
,
text:
"Issue"
).
ancestor
(
".stage-nav-item"
)
}
let
(
:first_custom_stage
)
{
page
.
find
(
'.stage-nav-item-cell'
,
text:
custom_stage_name
).
ancestor
(
".stage-nav-item"
)
}
let
(
:first_custom_stage
)
{
page
.
find
(
'.stage-nav-item-cell'
,
text:
custom_stage_name
).
ancestor
(
".stage-nav-item"
)
}
let
(
:nav
)
{
page
.
find
(
stage_nav_selector
)
}
def
create_custom_stage
def
create_custom_stage
Analytics
::
CycleAnalytics
::
Stages
::
CreateService
.
new
(
parent:
group
,
params:
params
,
current_user:
user
).
execute
Analytics
::
CycleAnalytics
::
Stages
::
CreateService
.
new
(
parent:
group
,
params:
params
,
current_user:
user
).
execute
...
@@ -632,8 +633,6 @@ describe 'Group Value Stream Analytics', :js do
...
@@ -632,8 +633,6 @@ describe 'Group Value Stream Analytics', :js do
context
'Stage table'
do
context
'Stage table'
do
context
'default stages'
do
context
'default stages'
do
let
(
:nav
)
{
page
.
find
(
stage_nav_selector
)
}
def
open_recover_stage_dropdown
def
open_recover_stage_dropdown
find
(
add_stage_button
).
click
find
(
add_stage_button
).
click
...
@@ -742,6 +741,47 @@ describe 'Group Value Stream Analytics', :js do
...
@@ -742,6 +741,47 @@ describe 'Group Value Stream Analytics', :js do
end
end
end
end
end
end
context
'Duration chart'
do
let
(
:duration_chart_dropdown
)
{
page
.
find
(
'.dropdown-stages'
)
}
default_stages
=
%w[Issue Plan Code Test Review Staging Total]
.
freeze
def
duration_chart_stages
duration_chart_dropdown
.
all
(
'.dropdown-menu-link'
).
collect
(
&
:text
)
end
def
toggle_duration_chart_dropdown
duration_chart_dropdown
.
click
end
before
do
select_group
end
it
'has all the default stages'
do
toggle_duration_chart_dropdown
expect
(
duration_chart_stages
).
to
eq
(
default_stages
)
end
context
'hidden stage'
do
before
do
toggle_more_options
(
first_default_stage
)
click_button
"Hide stage"
# wait for the stage list to laod
expect
(
nav
).
to
have_content
(
"Plan"
)
end
it
'will not appear in the duration chart dropdown'
do
toggle_duration_chart_dropdown
expect
(
duration_chart_stages
).
not_to
include
(
"Issue"
)
end
end
end
end
end
context
'not enabled'
do
context
'not enabled'
do
...
...
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