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
9d425085
Commit
9d425085
authored
Nov 18, 2020
by
Rémy Coutable
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'fix-flaky-vsa-tests' into 'master'
Fix flaky VSA tests See merge request gitlab-org/gitlab!47915
parents
572bb643
efad10d1
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
6 additions
and
2 deletions
+6
-2
ee/app/assets/javascripts/analytics/cycle_analytics/utils.js
ee/app/assets/javascripts/analytics/cycle_analytics/utils.js
+4
-1
ee/spec/features/groups/analytics/cycle_analytics/filters_and_data_spec.rb
...groups/analytics/cycle_analytics/filters_and_data_spec.rb
+2
-1
No files found.
ee/app/assets/javascripts/analytics/cycle_analytics/utils.js
View file @
9d425085
...
@@ -193,9 +193,12 @@ export const getDurationChartData = (data, startDate, endDate) => {
...
@@ -193,9 +193,12 @@ export const getDurationChartData = (data, startDate, endDate) => {
const
flattenedData
=
flattenDurationChartData
(
data
);
const
flattenedData
=
flattenDurationChartData
(
data
);
const
eventData
=
[];
const
eventData
=
[];
const
endOfDay
=
newDate
(
endDate
);
endOfDay
.
setHours
(
23
,
59
,
59
);
// make sure we're at the end of the day
for
(
for
(
let
currentDate
=
newDate
(
startDate
);
let
currentDate
=
newDate
(
startDate
);
currentDate
<=
end
Date
;
currentDate
<=
end
OfDay
;
currentDate
=
dayAfter
(
currentDate
)
currentDate
=
dayAfter
(
currentDate
)
)
{
)
{
const
currentISODate
=
dateFormat
(
newDate
(
currentDate
),
dateFormats
.
isoDate
);
const
currentISODate
=
dateFormat
(
newDate
(
currentDate
),
dateFormats
.
isoDate
);
...
...
ee/spec/features/groups/analytics/cycle_analytics/filters_and_data_spec.rb
View file @
9d425085
...
@@ -281,13 +281,14 @@ RSpec.describe 'Group value stream analytics filters and data', :js do
...
@@ -281,13 +281,14 @@ RSpec.describe 'Group value stream analytics filters and data', :js do
end
end
context
'with lots of data'
,
:js
do
context
'with lots of data'
,
:js
do
let_it_be
(
:issue
)
{
create
(
:issue
,
project:
project
,
created_at:
5
.
days
.
ago
)
}
let_it_be
(
:issue
)
{
create
(
:issue
,
project:
project
)
}
around
do
|
example
|
around
do
|
example
|
freeze_time
{
example
.
run
}
freeze_time
{
example
.
run
}
end
end
before
do
before
do
issue
.
update!
(
created_at:
5
.
days
.
ago
)
create_cycle
(
user
,
project
,
issue
,
mr
,
milestone
,
pipeline
)
create_cycle
(
user
,
project
,
issue
,
mr
,
milestone
,
pipeline
)
create
(
:labeled_issue
,
created_at:
5
.
days
.
ago
,
project:
create
(
:project
,
group:
group
),
labels:
[
group_label1
])
create
(
:labeled_issue
,
created_at:
5
.
days
.
ago
,
project:
create
(
:project
,
group:
group
),
labels:
[
group_label1
])
create
(
:labeled_issue
,
created_at:
3
.
days
.
ago
,
project:
create
(
:project
,
group:
group
),
labels:
[
group_label2
])
create
(
:labeled_issue
,
created_at:
3
.
days
.
ago
,
project:
create
(
:project
,
group:
group
),
labels:
[
group_label2
])
...
...
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