From aa440eb1c0947d2dc551c61abbd9d271b9002050 Mon Sep 17 00:00:00 2001
From: Kamil Trzcinski <ayufan@ayufan.eu>
Date: Sat, 6 May 2017 19:02:06 +0200
Subject: Single commit squash of all changes for
 https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/10878

It's needed due to https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/10777 being merged with squash.
---
 spec/javascripts/pipelines_spec.js | 32 ++++++++++++--------------------
 1 file changed, 12 insertions(+), 20 deletions(-)

(limited to 'spec/javascripts/pipelines_spec.js')

diff --git a/spec/javascripts/pipelines_spec.js b/spec/javascripts/pipelines_spec.js
index 72770a702d3..81ac589f4e6 100644
--- a/spec/javascripts/pipelines_spec.js
+++ b/spec/javascripts/pipelines_spec.js
@@ -1,30 +1,22 @@
-require('~/pipelines');
+import Pipelines from '~/pipelines';
 
 // Fix for phantomJS
 if (!Element.prototype.matches && Element.prototype.webkitMatchesSelector) {
   Element.prototype.matches = Element.prototype.webkitMatchesSelector;
 }
 
-(() => {
-  describe('Pipelines', () => {
-    preloadFixtures('static/pipeline_graph.html.raw');
+describe('Pipelines', () => {
+  preloadFixtures('static/pipeline_graph.html.raw');
 
-    beforeEach(() => {
-      loadFixtures('static/pipeline_graph.html.raw');
-    });
-
-    it('should be defined', () => {
-      expect(window.gl.Pipelines).toBeDefined();
-    });
-
-    it('should create a `Pipelines` instance without options', () => {
-      expect(() => { new window.gl.Pipelines(); }).not.toThrow(); //eslint-disable-line
-    });
+  beforeEach(() => {
+    loadFixtures('static/pipeline_graph.html.raw');
+  });
 
-    it('should create a `Pipelines` instance with options', () => {
-      const pipelines = new window.gl.Pipelines({ foo: 'bar' });
+  it('should be defined', () => {
+    expect(Pipelines).toBeDefined();
+  });
 
-      expect(pipelines.pipelineGraph).toBeDefined();
-    });
+  it('should create a `Pipelines` instance without options', () => {
+    expect(() => { new Pipelines(); }).not.toThrow(); //eslint-disable-line
   });
-})();
+});
-- 
cgit v1.2.1