Skip to content

Commit b013881

Browse files
committed
Remove the old test loader
1 parent 92cc3f8 commit b013881

2 files changed

Lines changed: 4 additions & 14 deletions

File tree

test-app/tests/test-helper.js

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
/* globals Testem */
22
import * as QUnit from 'qunit';
3-
import AbstractTestLoader from 'ember-cli-test-loader/test-support/index';
43
import Ember from 'ember';
54
import { isSettled, getSettledState } from '@ember/test-helpers';
65
import { _backburner } from '@ember/runloop';
@@ -39,19 +38,6 @@ QUnit.done(function () {
3938
}
4039
});
4140

42-
class TestLoader extends AbstractTestLoader {
43-
moduleLoadFailure(moduleName, error) {
44-
moduleLoadFailures.push(error);
45-
46-
QUnit.module('TestLoader Failures');
47-
QUnit.test(moduleName + ': could not be loaded', function () {
48-
throw error;
49-
});
50-
}
51-
}
52-
53-
new TestLoader().loadModules();
54-
5541
QUnit.testDone(function ({ module, name }) {
5642
// ensure no test accidentally change state of backburner.DEBUG
5743
if (_backburner.DEBUG !== true) {

test-app/tests/unit/setup-context-test.js

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
import { module, test } from 'qunit';
2+
import { setupEmberTesting } from 'ember-qunit';
23
import Service, { inject as injectService } from '@ember/service';
34
import {
45
setupContext,
@@ -29,7 +30,10 @@ import config from '../../config/environment';
2930
import Ember from 'ember';
3031
import { deprecate, warn } from '@ember/debug';
3132

33+
console.log(Ember.testing);
3234
module('setupContext', function (hooks) {
35+
setupEmberTesting(hooks);
36+
3337
if (!hasEmberVersion(2, 4)) {
3438
return;
3539
}

0 commit comments

Comments
 (0)