diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2019-09-25 18:06:16 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2019-09-25 18:06:16 +0300 |
commit | b1d7b01241da7f7f5d42c5ef46c7788fac0ab6d3 (patch) | |
tree | b53def1340801c2b7706e9f68f6b17a36efad4dd /spec/javascripts | |
parent | aabf412bc1f30cb12d97a077458d002c57cad8e9 (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'spec/javascripts')
-rw-r--r-- | spec/javascripts/issue_show/components/app_spec.js | 8 | ||||
-rw-r--r-- | spec/javascripts/monitoring/charts/time_series_spec.js | 10 |
2 files changed, 18 insertions, 0 deletions
diff --git a/spec/javascripts/issue_show/components/app_spec.js b/spec/javascripts/issue_show/components/app_spec.js index c3d1440c34e..9fce040fd8c 100644 --- a/spec/javascripts/issue_show/components/app_spec.js +++ b/spec/javascripts/issue_show/components/app_spec.js @@ -23,6 +23,14 @@ describe('Issuable output', () => { beforeEach(done => { setFixtures(` <div> + <div class="detail-page-description content-block"> + <details open> + <summary>One</summary> + </details> + <details> + <summary>Two</summary> + </details> + </div> <div class="flash-container"></div> <span id="task_status"></span> </div> diff --git a/spec/javascripts/monitoring/charts/time_series_spec.js b/spec/javascripts/monitoring/charts/time_series_spec.js index f6a5ed03c0d..091ab06523e 100644 --- a/spec/javascripts/monitoring/charts/time_series_spec.js +++ b/spec/javascripts/monitoring/charts/time_series_spec.js @@ -140,6 +140,16 @@ describe('Time series component', () => { expect(timeSeriesChart.vm.svgs[mockSvgName]).toBe(`path://${mockSvgPathContent}`); }); }); + + it('contains an svg object within an array to properly render icon', () => { + timeSeriesChart.vm.$nextTick(() => { + expect(timeSeriesChart.vm.chartOptions.dataZoom).toEqual([ + { + handleIcon: `path://${mockSvgPathContent}`, + }, + ]); + }); + }); }); describe('onResize', () => { |