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/activities_spec.js.es6 | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'spec/javascripts/activities_spec.js.es6') diff --git a/spec/javascripts/activities_spec.js.es6 b/spec/javascripts/activities_spec.js.es6 index b3617a45bd4..61fabd37170 100644 --- a/spec/javascripts/activities_spec.js.es6 +++ b/spec/javascripts/activities_spec.js.es6 @@ -1,9 +1,10 @@ /* eslint-disable no-unused-expressions, comma-spacing, prefer-const, no-prototype-builtins, semi, no-new, keyword-spacing, no-plusplus, no-shadow, max-len */ -/*= require js.cookie.js */ -/*= require jquery.endless-scroll.js */ -/*= require pager */ -/*= require activities */ +require('./spec_helper'); +require('vendor/js.cookie.js'); +require('vendor/jquery.endless-scroll.js'); +require('pager'); +require('activities'); (() => { window.gon || (window.gon = {}); -- cgit v1.2.1 From 7837fe46f0e73119aaaacebd14f794f3e0fbc865 Mon Sep 17 00:00:00 2001 From: Mike Greiling Date: Fri, 6 Jan 2017 12:50:01 -0600 Subject: fix broken js.cookie imports --- spec/javascripts/activities_spec.js.es6 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'spec/javascripts/activities_spec.js.es6') diff --git a/spec/javascripts/activities_spec.js.es6 b/spec/javascripts/activities_spec.js.es6 index 61fabd37170..6d625eeb973 100644 --- a/spec/javascripts/activities_spec.js.es6 +++ b/spec/javascripts/activities_spec.js.es6 @@ -1,7 +1,7 @@ /* eslint-disable no-unused-expressions, comma-spacing, prefer-const, no-prototype-builtins, semi, no-new, keyword-spacing, no-plusplus, no-shadow, max-len */ require('./spec_helper'); -require('vendor/js.cookie.js'); +window.Cookies = require('vendor/js.cookie'); require('vendor/jquery.endless-scroll.js'); require('pager'); require('activities'); -- 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/activities_spec.js.es6 | 1 - 1 file changed, 1 deletion(-) (limited to 'spec/javascripts/activities_spec.js.es6') diff --git a/spec/javascripts/activities_spec.js.es6 b/spec/javascripts/activities_spec.js.es6 index 6d625eeb973..feba184dbb0 100644 --- a/spec/javascripts/activities_spec.js.es6 +++ b/spec/javascripts/activities_spec.js.es6 @@ -1,6 +1,5 @@ /* eslint-disable no-unused-expressions, comma-spacing, prefer-const, no-prototype-builtins, semi, no-new, keyword-spacing, no-plusplus, no-shadow, max-len */ -require('./spec_helper'); window.Cookies = require('vendor/js.cookie'); require('vendor/jquery.endless-scroll.js'); require('pager'); -- cgit v1.2.1 From b0341c14d0657b41203b7e5d6d6cbeb64d67b387 Mon Sep 17 00:00:00 2001 From: Mike Greiling Date: Fri, 6 Jan 2017 17:30:54 -0600 Subject: move additional libraries into spec_helper --- spec/javascripts/activities_spec.js.es6 | 1 - 1 file changed, 1 deletion(-) (limited to 'spec/javascripts/activities_spec.js.es6') diff --git a/spec/javascripts/activities_spec.js.es6 b/spec/javascripts/activities_spec.js.es6 index feba184dbb0..cf57ca34a79 100644 --- a/spec/javascripts/activities_spec.js.es6 +++ b/spec/javascripts/activities_spec.js.es6 @@ -1,6 +1,5 @@ /* eslint-disable no-unused-expressions, comma-spacing, prefer-const, no-prototype-builtins, semi, no-new, keyword-spacing, no-plusplus, no-shadow, max-len */ -window.Cookies = require('vendor/js.cookie'); require('vendor/jquery.endless-scroll.js'); require('pager'); require('activities'); -- 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/activities_spec.js.es6 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'spec/javascripts/activities_spec.js.es6') diff --git a/spec/javascripts/activities_spec.js.es6 b/spec/javascripts/activities_spec.js.es6 index cf57ca34a79..aba16a03ce2 100644 --- a/spec/javascripts/activities_spec.js.es6 +++ b/spec/javascripts/activities_spec.js.es6 @@ -1,8 +1,8 @@ /* eslint-disable no-unused-expressions, comma-spacing, prefer-const, no-prototype-builtins, semi, no-new, keyword-spacing, no-plusplus, no-shadow, max-len */ require('vendor/jquery.endless-scroll.js'); -require('pager'); -require('activities'); +require('~/pager'); +require('~/activities'); (() => { window.gon || (window.gon = {}); -- cgit v1.2.1