From 7c47cc94c5d7425583db3610c85cb150df601a91 Mon Sep 17 00:00:00 2001 From: "Luke \"Jared\" Bennett" Date: Thu, 29 Dec 2016 15:42:48 -0600 Subject: Swapped out teaspoon for karma --- spec/javascripts/pipelines_spec.js.es6 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'spec/javascripts/pipelines_spec.js.es6') diff --git a/spec/javascripts/pipelines_spec.js.es6 b/spec/javascripts/pipelines_spec.js.es6 index f0f9ad7430d..1bee64b814f 100644 --- a/spec/javascripts/pipelines_spec.js.es6 +++ b/spec/javascripts/pipelines_spec.js.es6 @@ -1,4 +1,4 @@ -//= require pipelines +require('pipelines'); (() => { describe('Pipelines', () => { -- cgit v1.2.1 From eb1bbe73d06dbb9419607c0882f2d6da7fe4428c Mon Sep 17 00:00:00 2001 From: Mike Greiling Date: Fri, 6 Jan 2017 12:46:56 -0600 Subject: fix spec_helper missing/broken references --- spec/javascripts/pipelines_spec.js.es6 | 1 + 1 file changed, 1 insertion(+) (limited to 'spec/javascripts/pipelines_spec.js.es6') diff --git a/spec/javascripts/pipelines_spec.js.es6 b/spec/javascripts/pipelines_spec.js.es6 index 1bee64b814f..e51977ab720 100644 --- a/spec/javascripts/pipelines_spec.js.es6 +++ b/spec/javascripts/pipelines_spec.js.es6 @@ -1,3 +1,4 @@ +require('./spec_helper'); require('pipelines'); (() => { -- cgit v1.2.1 From 52c6702ec708deedef189784cdcb39564b2dcf52 Mon Sep 17 00:00:00 2001 From: Mike Greiling Date: Fri, 6 Jan 2017 17:21:54 -0600 Subject: include spec_helper within karma config rather than each individual test --- spec/javascripts/pipelines_spec.js.es6 | 1 - 1 file changed, 1 deletion(-) (limited to 'spec/javascripts/pipelines_spec.js.es6') diff --git a/spec/javascripts/pipelines_spec.js.es6 b/spec/javascripts/pipelines_spec.js.es6 index e51977ab720..1bee64b814f 100644 --- a/spec/javascripts/pipelines_spec.js.es6 +++ b/spec/javascripts/pipelines_spec.js.es6 @@ -1,4 +1,3 @@ -require('./spec_helper'); require('pipelines'); (() => { -- cgit v1.2.1 From 8d2099cb53e933e94ebc17e9c186c0f4ece107cb Mon Sep 17 00:00:00 2001 From: Mike Greiling Date: Mon, 9 Jan 2017 17:23:54 -0600 Subject: use ~ to reference non-local scripts instead of resolve.root --- spec/javascripts/pipelines_spec.js.es6 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'spec/javascripts/pipelines_spec.js.es6') diff --git a/spec/javascripts/pipelines_spec.js.es6 b/spec/javascripts/pipelines_spec.js.es6 index 1bee64b814f..6120ca5543d 100644 --- a/spec/javascripts/pipelines_spec.js.es6 +++ b/spec/javascripts/pipelines_spec.js.es6 @@ -1,4 +1,4 @@ -require('pipelines'); +require('~/pipelines'); (() => { describe('Pipelines', () => { -- cgit v1.2.1 From 5bb258cd8fbc051aa65fca133578eb30761b5ca1 Mon Sep 17 00:00:00 2001 From: Mike Greiling Date: Fri, 13 Jan 2017 11:04:41 -0500 Subject: phantomJS doesn't allow us to spyOn history.replaceState --- spec/javascripts/pipelines_spec.js.es6 | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'spec/javascripts/pipelines_spec.js.es6') diff --git a/spec/javascripts/pipelines_spec.js.es6 b/spec/javascripts/pipelines_spec.js.es6 index 6120ca5543d..72770a702d3 100644 --- a/spec/javascripts/pipelines_spec.js.es6 +++ b/spec/javascripts/pipelines_spec.js.es6 @@ -1,5 +1,10 @@ require('~/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'); -- cgit v1.2.1