Skip to content

Commit 607bd69

Browse files
committed
Fix tests for tests
1 parent 05b0c9f commit 607bd69

File tree

4 files changed

+3
-7
lines changed

4 files changed

+3
-7
lines changed

app/index.html

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,6 @@
3737
testSupport: "{{rootURL}}assets/test-support.js",
3838
testSupportCss: "{{rootURL}}assets/test-support.css",
3939
testLoader: "{{rootURL}}assets/test-loader.js",
40-
emberTestHelpers: "{{rootURL}}assets/ember-test-helpers.js",
4140
emberQUnit: "{{rootURL}}assets/ember-qunit.js"
4241
};
4342
</script>

app/services/ember-cli.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -333,7 +333,7 @@ export default Ember.Service.extend({
333333
<script type="text/javascript">
334334
// Hack around dealing with multiple global QUnits!
335335
jQuery.ajax({
336-
url: 'https://cdnjs.cloudflare.com/ajax/libs/qunit/2.3.2/qunit.js',
336+
url: 'https://code.jquery.com/qunit/qunit-2.6.1.js',
337337
dataType: 'text'
338338
}).then(function(script) {
339339
Ember.run(function() {
@@ -389,7 +389,7 @@ export default Ember.Service.extend({
389389
}
390390

391391
if (testing || isTestingEnabled) {
392-
const testJSFiles = ['emberTestHelpers', 'emberQUnit'];
392+
const testJSFiles = ['emberQUnit'];
393393

394394
testJSFiles.forEach(jsFile => {
395395
depScriptTags += `<script type="text/javascript" src="${window.assetMap[jsFile]}"></script>`;

ember-cli-build.js

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -149,8 +149,6 @@ module.exports = function(defaults) {
149149
});
150150

151151
let transpiledInitializersTree = babelTranspiler(baseInitializersTree, babelOpts());
152-
153-
let finalTestHelpersTree = buildAddonTree('ember-test-helpers');
154152

155153
let preprocessJs = app.registry.registry.js[0].toTree;
156154
let buildPreprocessedAddon = function(addonName) {
@@ -196,7 +194,7 @@ module.exports = function(defaults) {
196194
outputFile: '/assets/twiddle-deps.js'
197195
});
198196

199-
return app.toTree(mergeTrees([twiddleVendorTree, loaderTree, testLoaderTree, finalTestHelpersTree, finalQUnitTree]));
197+
return app.toTree(mergeTrees([twiddleVendorTree, loaderTree, testLoaderTree, finalQUnitTree]));
200198
};
201199

202200
function buildAddonTree(addonName) {

tests/index.html

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,6 @@
3838
testSupport: "{{rootURL}}assets/test-support.js",
3939
testSupportCss: "{{rootURL}}assets/test-support.css",
4040
testLoader: "{{rootURL}}assets/test-loader.js",
41-
emberTestHelpers: "{{rootURL}}assets/ember-test-helpers.js",
4241
emberQUnit: "{{rootURL}}assets/ember-qunit.js"
4342
};
4443
</script>

0 commit comments

Comments
 (0)