diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-11-19 08:27:35 +0000 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-11-19 08:27:35 +0000 |
commit | 7e9c479f7de77702622631cff2628a9c8dcbc627 (patch) | |
tree | c8f718a08e110ad7e1894510980d2155a6549197 /spec/frontend/projects/pipelines | |
parent | e852b0ae16db4052c1c567d9efa4facc81146e88 (diff) | |
download | gitlab-ce-7e9c479f7de77702622631cff2628a9c8dcbc627.tar.gz |
Add latest changes from gitlab-org/gitlab@13-6-stable-eev13.6.0-rc42
Diffstat (limited to 'spec/frontend/projects/pipelines')
3 files changed, 11 insertions, 4 deletions
diff --git a/spec/frontend/projects/pipelines/charts/components/__snapshots__/statistics_list_spec.js.snap b/spec/frontend/projects/pipelines/charts/components/__snapshots__/statistics_list_spec.js.snap index ff0351bd099..ac87fe893b9 100644 --- a/spec/frontend/projects/pipelines/charts/components/__snapshots__/statistics_list_spec.js.snap +++ b/spec/frontend/projects/pipelines/charts/components/__snapshots__/statistics_list_spec.js.snap @@ -11,7 +11,6 @@ exports[`StatisticsList matches the snapshot 1`] = ` 4 pipelines </strong> </li> - <li> <span> Successful: @@ -21,7 +20,6 @@ exports[`StatisticsList matches the snapshot 1`] = ` 2 pipelines </strong> </li> - <li> <span> Failed: @@ -31,7 +29,6 @@ exports[`StatisticsList matches the snapshot 1`] = ` 2 pipelines </strong> </li> - <li> <span> Success ratio: @@ -41,5 +38,14 @@ exports[`StatisticsList matches the snapshot 1`] = ` 50% </strong> </li> + <li> + <span> + Total duration: + </span> + + <strong> + 00:01:56 + </strong> + </li> </ul> `; diff --git a/spec/frontend/projects/pipelines/charts/components/app_spec.js b/spec/frontend/projects/pipelines/charts/components/app_spec.js index 883f2bec5f7..0dd3407dbbc 100644 --- a/spec/frontend/projects/pipelines/charts/components/app_spec.js +++ b/spec/frontend/projects/pipelines/charts/components/app_spec.js @@ -45,7 +45,7 @@ describe('ProjectsPipelinesChartsApp', () => { expect(chart.exists()).toBeTruthy(); expect(chart.props('yAxisTitle')).toBe('Minutes'); expect(chart.props('xAxisTitle')).toBe('Commit'); - expect(chart.props('data')).toBe(wrapper.vm.timesChartTransformedData); + expect(chart.props('bars')).toBe(wrapper.vm.timesChartTransformedData); expect(chart.props('option')).toBe(wrapper.vm.$options.timesChartOptions); }); }); diff --git a/spec/frontend/projects/pipelines/charts/mock_data.js b/spec/frontend/projects/pipelines/charts/mock_data.js index db5164c8f99..84e0ccb828a 100644 --- a/spec/frontend/projects/pipelines/charts/mock_data.js +++ b/spec/frontend/projects/pipelines/charts/mock_data.js @@ -3,6 +3,7 @@ export const counts = { success: 2, total: 4, successRatio: 50, + totalDuration: 116158, }; export const timesChartData = { |