diff options
| author | Mike Greiling <mike@pixelcog.com> | 2018-09-07 06:05:10 +0000 |
|---|---|---|
| committer | Mike Greiling <mike@pixelcog.com> | 2018-09-07 06:05:10 +0000 |
| commit | 53fae9ad84361bbf3f9fb3db446c9bb22772fb64 (patch) | |
| tree | 36f584dfe9f15f423177d10a7a1814a45386f6d2 /spec | |
| parent | c9116b6de56c5b21fea15de2be8b56fa811694aa (diff) | |
| parent | 4d2e9a1f32097682fd189c529f9418a684f0e94a (diff) | |
| download | gitlab-ce-53fae9ad84361bbf3f9fb3db446c9bb22772fb64.tar.gz | |
Merge branch 'ee-6381-multiseries' into 'master'
multiseries
Closes #50947
See merge request gitlab-org/gitlab-ce!21427
Diffstat (limited to 'spec')
| -rw-r--r-- | spec/javascripts/monitoring/graph/flag_spec.js | 2 | ||||
| -rw-r--r-- | spec/javascripts/monitoring/graph_spec.js | 3 |
2 files changed, 4 insertions, 1 deletions
diff --git a/spec/javascripts/monitoring/graph/flag_spec.js b/spec/javascripts/monitoring/graph/flag_spec.js index 19278312b6d..a837b71db0b 100644 --- a/spec/javascripts/monitoring/graph/flag_spec.js +++ b/spec/javascripts/monitoring/graph/flag_spec.js @@ -35,7 +35,7 @@ const defaultValuesComponent = { unitOfDisplay: 'ms', currentDataIndex: 0, legendTitle: 'Average', - currentCoordinates: [], + currentCoordinates: {}, }; const deploymentFlagData = { diff --git a/spec/javascripts/monitoring/graph_spec.js b/spec/javascripts/monitoring/graph_spec.js index a46a387a534..990619b4109 100644 --- a/spec/javascripts/monitoring/graph_spec.js +++ b/spec/javascripts/monitoring/graph_spec.js @@ -113,6 +113,9 @@ describe('Graph', () => { projectPath, }); + // simulate moving mouse over data series + component.seriesUnderMouse = component.timeSeries; + component.positionFlag(); expect(component.currentData).toBe(component.timeSeries[0].values[10]); }); |