Skip to content

Commit b370778

Browse files
committed
Found it -- disable setupEmberTesting in ember-qunit's start
1 parent b013881 commit b370778

2 files changed

Lines changed: 11 additions & 5 deletions

File tree

test-app/tests/test-helper.js

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,11 @@ QUnit.assert.deprecationsInclude = function (expected) {
9999
});
100100
};
101101

102-
start();
102+
start({
103+
// We manage Ember.testing manually in this test-app
104+
// (we probably don't need to anymore since ember-qunit handles it)
105+
setupEmberTesting: false,
106+
});
103107

104108
if (typeof Testem !== 'undefined') {
105109
Testem.hookIntoTestFramework();

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

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
import { module, test } from 'qunit';
2-
import { setupEmberTesting } from 'ember-qunit';
32
import Service, { inject as injectService } from '@ember/service';
43
import {
54
setupContext,
@@ -30,15 +29,14 @@ import config from '../../config/environment';
3029
import Ember from 'ember';
3130
import { deprecate, warn } from '@ember/debug';
3231

33-
console.log(Ember.testing);
32+
console.log('1', Ember.testing);
3433
module('setupContext', function (hooks) {
35-
setupEmberTesting(hooks);
36-
3734
if (!hasEmberVersion(2, 4)) {
3835
return;
3936
}
4037

4138
hooks.beforeEach(function () {
39+
console.log('2', Ember.testing);
4240
setResolverRegistry({
4341
'service:foo': Service.extend({ isFoo: true }),
4442
});
@@ -66,6 +64,7 @@ module('setupContext', function (hooks) {
6664
function setupContextTests() {
6765
module('without options', function (hooks) {
6866
hooks.beforeEach(function () {
67+
console.log('3', Ember.testing);
6968
context = {};
7069
return setupContext(context);
7170
});
@@ -845,6 +844,7 @@ module('setupContext', function (hooks) {
845844

846845
module('with only application set', function (hooks) {
847846
hooks.beforeEach(function () {
847+
console.log('4', Ember.testing);
848848
setResolver(null);
849849
setApplication(application);
850850
});
@@ -854,6 +854,7 @@ module('setupContext', function (hooks) {
854854

855855
module('with application and resolver set', function (hooks) {
856856
hooks.beforeEach(function () {
857+
console.log('5', Ember.testing);
857858
setResolver(resolver);
858859
setApplication(application);
859860
});
@@ -863,6 +864,7 @@ module('setupContext', function (hooks) {
863864

864865
module('with only resolver set', function (hooks) {
865866
hooks.beforeEach(function () {
867+
console.log('6', Ember.testing);
866868
setResolver(resolver);
867869
setApplication(null);
868870
});

0 commit comments

Comments
 (0)