From 7c47cc94c5d7425583db3610c85cb150df601a91 Mon Sep 17 00:00:00 2001
From: "Luke \"Jared\" Bennett" <lbennett@gitlab.com>
Date: Thu, 29 Dec 2016 15:42:48 -0600
Subject: Swapped out teaspoon for karma

---
 spec/javascripts/build_spec.js.es6 | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

(limited to 'spec/javascripts/build_spec.js.es6')

diff --git a/spec/javascripts/build_spec.js.es6 b/spec/javascripts/build_spec.js.es6
index 0c556382980..8b0c797647b 100644
--- a/spec/javascripts/build_spec.js.es6
+++ b/spec/javascripts/build_spec.js.es6
@@ -2,11 +2,12 @@
 /* global Build */
 /* global Turbolinks */
 
-//= require lib/utils/datetime_utility
-//= require build
-//= require breakpoints
-//= require jquery.nicescroll
-//= require turbolinks
+require('./spec_helper');
+require('lib/utils/datetime_utility');
+require('build');
+require('breakpoints');
+require('vendor/jquery.nicescroll');
+require('vendor/turbolinks');
 
 describe('Build', () => {
   const BUILD_URL = `${gl.TEST_HOST}/frontend-fixtures/builds-project/builds/1`;
-- 
cgit v1.2.1


From 663936878f398710ed0fdd0f33b3c1b9efb4e1d0 Mon Sep 17 00:00:00 2001
From: Mike Greiling <mike@pixelcog.com>
Date: Fri, 6 Jan 2017 15:44:03 -0600
Subject: include common libraries within spec_helper

---
 spec/javascripts/build_spec.js.es6 | 1 -
 1 file changed, 1 deletion(-)

(limited to 'spec/javascripts/build_spec.js.es6')

diff --git a/spec/javascripts/build_spec.js.es6 b/spec/javascripts/build_spec.js.es6
index 8b0c797647b..1821c44fdfb 100644
--- a/spec/javascripts/build_spec.js.es6
+++ b/spec/javascripts/build_spec.js.es6
@@ -7,7 +7,6 @@ require('lib/utils/datetime_utility');
 require('build');
 require('breakpoints');
 require('vendor/jquery.nicescroll');
-require('vendor/turbolinks');
 
 describe('Build', () => {
   const BUILD_URL = `${gl.TEST_HOST}/frontend-fixtures/builds-project/builds/1`;
-- 
cgit v1.2.1


From 52c6702ec708deedef189784cdcb39564b2dcf52 Mon Sep 17 00:00:00 2001
From: Mike Greiling <mike@pixelcog.com>
Date: Fri, 6 Jan 2017 17:21:54 -0600
Subject: include spec_helper within karma config rather than each individual
 test

---
 spec/javascripts/build_spec.js.es6 | 1 -
 1 file changed, 1 deletion(-)

(limited to 'spec/javascripts/build_spec.js.es6')

diff --git a/spec/javascripts/build_spec.js.es6 b/spec/javascripts/build_spec.js.es6
index 1821c44fdfb..41a3e614cd1 100644
--- a/spec/javascripts/build_spec.js.es6
+++ b/spec/javascripts/build_spec.js.es6
@@ -2,7 +2,6 @@
 /* global Build */
 /* global Turbolinks */
 
-require('./spec_helper');
 require('lib/utils/datetime_utility');
 require('build');
 require('breakpoints');
-- 
cgit v1.2.1


From 8d2099cb53e933e94ebc17e9c186c0f4ece107cb Mon Sep 17 00:00:00 2001
From: Mike Greiling <mike@pixelcog.com>
Date: Mon, 9 Jan 2017 17:23:54 -0600
Subject: use ~ to reference non-local scripts instead of resolve.root

---
 spec/javascripts/build_spec.js.es6 | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'spec/javascripts/build_spec.js.es6')

diff --git a/spec/javascripts/build_spec.js.es6 b/spec/javascripts/build_spec.js.es6
index 41a3e614cd1..d2a093df146 100644
--- a/spec/javascripts/build_spec.js.es6
+++ b/spec/javascripts/build_spec.js.es6
@@ -2,9 +2,9 @@
 /* global Build */
 /* global Turbolinks */
 
-require('lib/utils/datetime_utility');
-require('build');
-require('breakpoints');
+require('~/lib/utils/datetime_utility');
+require('~/build');
+require('~/breakpoints');
 require('vendor/jquery.nicescroll');
 
 describe('Build', () => {
-- 
cgit v1.2.1


From fbd09871ca7003242053fbca10d9c0e96e7a799d Mon Sep 17 00:00:00 2001
From: Bryce Johnson <bryce@gitlab.com>
Date: Fri, 13 Jan 2017 16:54:16 -0500
Subject: Remove turbolinks.

---
 spec/javascripts/build_spec.js.es6 | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

(limited to 'spec/javascripts/build_spec.js.es6')

diff --git a/spec/javascripts/build_spec.js.es6 b/spec/javascripts/build_spec.js.es6
index 0c556382980..d813d6b39d0 100644
--- a/spec/javascripts/build_spec.js.es6
+++ b/spec/javascripts/build_spec.js.es6
@@ -1,12 +1,11 @@
 /* eslint-disable no-new */
 /* global Build */
-/* global Turbolinks */
 
 //= require lib/utils/datetime_utility
+//= require lib/utils/url_utility
 //= require build
 //= require breakpoints
 //= require jquery.nicescroll
-//= require turbolinks
 
 describe('Build', () => {
   const BUILD_URL = `${gl.TEST_HOST}/frontend-fixtures/builds-project/builds/1`;
@@ -167,7 +166,7 @@ describe('Build', () => {
       });
 
       it('reloads the page when the build is done', () => {
-        spyOn(Turbolinks, 'visit');
+        spyOn(gl.utils, 'visitUrl');
 
         jasmine.clock().tick(4001);
         const [{ success, context }] = $.ajax.calls.argsFor(1);
@@ -177,7 +176,7 @@ describe('Build', () => {
           append: true,
         });
 
-        expect(Turbolinks.visit).toHaveBeenCalledWith(BUILD_URL);
+        expect(gl.utils.visitUrl).toHaveBeenCalledWith(BUILD_URL);
       });
     });
   });
-- 
cgit v1.2.1