summaryrefslogtreecommitdiff
path: root/spec
diff options
context:
space:
mode:
authorPhil Hughes <me@iamphill.com>2017-04-19 12:06:14 +0100
committerPhil Hughes <me@iamphill.com>2017-04-19 12:06:14 +0100
commit8d3b2581b8e1f3aff82fb8bf76203430fde064b3 (patch)
treec503ff30915bac9081d2e5729928ac369ca1550f /spec
parent5d8891fb85a4646557e2f478c6c08c997868c8fb (diff)
downloadgitlab-ce-8d3b2581b8e1f3aff82fb8bf76203430fde064b3.tar.gz
Style improvements
Fixed an issue where the line wouldnt move when hovering over deployment
Diffstat (limited to 'spec')
-rw-r--r--spec/javascripts/monitoring/deployments_spec.js44
1 files changed, 20 insertions, 24 deletions
diff --git a/spec/javascripts/monitoring/deployments_spec.js b/spec/javascripts/monitoring/deployments_spec.js
index c0e7fc9fb0e..b091b0550aa 100644
--- a/spec/javascripts/monitoring/deployments_spec.js
+++ b/spec/javascripts/monitoring/deployments_spec.js
@@ -3,33 +3,11 @@ import PrometheusGraph from '~/monitoring/prometheus_graph';
import Deployments from '~/monitoring/deployments';
import { prometheusMockData } from './prometheus_mock_data';
-fdescribe('Metrics deployments', () => {
+describe('Metrics deployments', () => {
const fixtureName = 'static/environments/metrics.html.raw';
let deployment;
let prometheusGraph;
- const createDeploymentMockData = (done) => {
- return {
- deployments: [{
- id: 1,
- created_at: deployment.chartData[10].time,
- sha: 'testing',
- tag: false,
- ref: {
- name: 'testing',
- },
- }, {
- id: 2,
- created_at: deployment.chartData[15].time,
- sha: '',
- tag: true,
- ref: {
- name: 'tag',
- },
- }],
- };
- };
-
const graphElement = () => document.querySelector('.prometheus-graph');
preloadFixtures(fixtureName);
@@ -48,7 +26,25 @@ fdescribe('Metrics deployments', () => {
spyOn(prometheusGraph, 'init');
spyOn($, 'ajax').and.callFake(() => {
const d = $.Deferred();
- d.resolve(createDeploymentMockData());
+ d.resolve({
+ deployments: [{
+ id: 1,
+ created_at: deployment.chartData[10].time,
+ sha: 'testing',
+ tag: false,
+ ref: {
+ name: 'testing',
+ },
+ }, {
+ id: 2,
+ created_at: deployment.chartData[15].time,
+ sha: '',
+ tag: true,
+ ref: {
+ name: 'tag',
+ },
+ }],
+ });
setTimeout(done);