Skip to content

Commit a2d581a

Browse files
authored
Merge pull request #123 from typed-ember/fix-node-tests
Fix node-tests
2 parents bd527af + fa23fe8 commit a2d581a

13 files changed

+46
-23
lines changed

node-tests/blueprints/acceptance-test-test.js

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ describe('Blueprint: acceptance-test', function() {
1717

1818
describe('in app', function() {
1919
beforeEach(function() {
20-
return emberNew();
20+
return emberNew().then(() => generateFakePackageManifest('ember-cli-qunit', '4.1.0'));
2121
});
2222

2323
it('acceptance-test foo', function() {
@@ -62,7 +62,9 @@ describe('Blueprint: acceptance-test', function() {
6262

6363
describe('in addon', function() {
6464
beforeEach(function() {
65-
return emberNew({ target: 'addon' });
65+
return emberNew({ target: 'addon' }).then(() =>
66+
generateFakePackageManifest('ember-cli-qunit', '4.1.0')
67+
);
6668
});
6769

6870
it('acceptance-test foo', function() {

node-tests/blueprints/adapter-test.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ describe('Acceptance: generate and destroy adapter blueprints', function() {
1919
setupTestHooks(this);
2020

2121
beforeEach(function() {
22-
return emberNew();
22+
return emberNew().then(() => generateFakePackageManifest('ember-cli-qunit', '4.1.0'));
2323
});
2424

2525
it('adapter', function() {

node-tests/blueprints/component-test-test.js

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ describe('Blueprint: component-test', function() {
1919

2020
describe('in app', function() {
2121
beforeEach(function() {
22-
return emberNew();
22+
return emberNew().then(() => generateFakePackageManifest('ember-cli-qunit', '4.1.0'));
2323
});
2424

2525
it('component-test x-foo', function() {
@@ -135,7 +135,9 @@ describe('Blueprint: component-test', function() {
135135

136136
describe('in addon', function() {
137137
beforeEach(function() {
138-
return emberNew({ target: 'addon' });
138+
return emberNew({ target: 'addon' }).then(() =>
139+
generateFakePackageManifest('ember-cli-qunit', '4.1.0')
140+
);
139141
});
140142

141143
it('component-test x-foo', function() {
@@ -171,7 +173,9 @@ describe('Blueprint: component-test', function() {
171173

172174
describe('in in-repo-addon', function() {
173175
beforeEach(function() {
174-
return emberNew({ target: 'in-repo-addon' });
176+
return emberNew({ target: 'in-repo-addon' }).then(() =>
177+
generateFakePackageManifest('ember-cli-qunit', '4.1.0')
178+
);
175179
});
176180

177181
it('component-test x-foo --in-repo-addon=my-addon', function() {

node-tests/blueprints/controller-test-test.js

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ describe('Blueprint: controller-test', function() {
1717

1818
describe('in app', function() {
1919
beforeEach(function() {
20-
return emberNew();
20+
return emberNew().then(() => generateFakePackageManifest('ember-cli-qunit', '4.1.0'));
2121
});
2222

2323
it('controller-test foo', function() {
@@ -81,7 +81,9 @@ describe('Blueprint: controller-test', function() {
8181

8282
describe('in addon', function() {
8383
beforeEach(function() {
84-
return emberNew({ target: 'addon' });
84+
return emberNew({ target: 'addon' }).then(() =>
85+
generateFakePackageManifest('ember-cli-qunit', '4.1.0')
86+
);
8587
});
8688

8789
it('controller-test foo', function() {

node-tests/blueprints/initializer-test-test.js

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ describe('Blueprint: initializer-test', function() {
1717

1818
describe('in app', function() {
1919
beforeEach(function() {
20-
return emberNew();
20+
return emberNew().then(() => generateFakePackageManifest('ember-cli-qunit', '4.1.0'));
2121
});
2222

2323
it('initializer-test foo', function() {
@@ -62,7 +62,9 @@ describe('Blueprint: initializer-test', function() {
6262

6363
describe('in addon', function() {
6464
beforeEach(function() {
65-
return emberNew({ target: 'addon' });
65+
return emberNew({ target: 'addon' }).then(() =>
66+
generateFakePackageManifest('ember-cli-qunit', '4.1.0')
67+
);
6668
});
6769

6870
it('initializer-test foo', function() {

node-tests/blueprints/initializer-test.js

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,8 @@ const emberNew = blueprintHelpers.emberNew;
66
const emberGenerateDestroy = blueprintHelpers.emberGenerateDestroy;
77
const setupPodConfig = blueprintHelpers.setupPodConfig;
88

9+
const generateFakePackageManifest = require('../helpers/generate-fake-package-manifest');
10+
911
const chai = require('ember-cli-blueprint-test-helpers/chai');
1012
const expect = chai.expect;
1113

@@ -202,12 +204,14 @@ describe('Blueprint: initializer', function() {
202204
});
203205

204206
it('initializer-test foo', function() {
207+
generateFakePackageManifest('ember-cli-qunit', '4.2.0');
208+
205209
return emberGenerateDestroy(['initializer-test', 'foo'], _file => {
206210
expect(_file('tests/unit/initializers/foo-test.ts'))
207211
.to.contain("import { initialize } from 'dummy/initializers/foo';")
208212
.to.contain("module('Unit | Initializer | foo'")
209-
.to.contain('application = Application.create();')
210-
.to.contain('initialize(this.application);');
213+
.to.contain('application = this.TestApplication.create(')
214+
.to.contain('this.application.boot()');
211215
});
212216
});
213217
});

node-tests/blueprints/instance-initializer-test-test.js

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ describe('Blueprint: instance-initializer-test', function() {
1717

1818
describe('in app', function() {
1919
beforeEach(function() {
20-
return emberNew();
20+
return emberNew().then(() => generateFakePackageManifest('ember-cli-qunit', '4.1.0'));
2121
});
2222

2323
it('instance-initializer-test foo', function() {
@@ -62,7 +62,9 @@ describe('Blueprint: instance-initializer-test', function() {
6262

6363
describe('in addon', function() {
6464
beforeEach(function() {
65-
return emberNew({ target: 'addon' });
65+
return emberNew({ target: 'addon' }).then(() =>
66+
generateFakePackageManifest('ember-cli-qunit', '4.1.0')
67+
);
6668
});
6769

6870
it('instance-initializer-test foo', function() {

node-tests/blueprints/mixin-test-test.js

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ describe('Blueprint: mixin-test', function() {
1717

1818
describe('in app', function() {
1919
beforeEach(function() {
20-
return emberNew();
20+
return emberNew().then(() => generateFakePackageManifest('ember-cli-qunit', '4.1.0'));
2121
});
2222

2323
it('mixin-test foo', function() {
@@ -56,7 +56,9 @@ describe('Blueprint: mixin-test', function() {
5656

5757
describe('in addon', function() {
5858
beforeEach(function() {
59-
return emberNew({ target: 'addon' });
59+
return emberNew({ target: 'addon' }).then(() =>
60+
generateFakePackageManifest('ember-cli-qunit', '4.1.0')
61+
);
6062
});
6163

6264
it('mixin-test foo', function() {

node-tests/blueprints/model-test.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ describe('Acceptance: generate and destroy model blueprints', function() {
1616
setupTestHooks(this);
1717

1818
beforeEach(function() {
19-
return emberNew();
19+
return emberNew().then(() => generateFakePackageManifest('ember-cli-qunit', '4.1.0'));
2020
});
2121

2222
it('model', function() {

node-tests/blueprints/route-test-test.js

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ describe('Blueprint: route-test', function() {
1717

1818
describe('in app', function() {
1919
beforeEach(function() {
20-
return emberNew();
20+
return emberNew().then(() => generateFakePackageManifest('ember-cli-qunit', '4.1.0'));
2121
});
2222

2323
it('route-test foo', function() {
@@ -75,7 +75,9 @@ describe('Blueprint: route-test', function() {
7575

7676
describe('in addon', function() {
7777
beforeEach(function() {
78-
return emberNew({ target: 'addon' });
78+
return emberNew({ target: 'addon' }).then(() =>
79+
generateFakePackageManifest('ember-cli-qunit', '4.1.0')
80+
);
7981
});
8082

8183
it('route-test foo', function() {

node-tests/blueprints/route-test.js

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,8 @@ const emberDestroy = blueprintHelpers.emberDestroy;
88
const emberGenerateDestroy = blueprintHelpers.emberGenerateDestroy;
99
const setupPodConfig = blueprintHelpers.setupPodConfig;
1010

11+
const generateFakePackageManifest = require('../helpers/generate-fake-package-manifest');
12+
1113
const chai = require('ember-cli-blueprint-test-helpers/chai');
1214
const expect = chai.expect;
1315
const file = chai.file;
@@ -18,7 +20,7 @@ describe('Blueprint: route', function() {
1820

1921
describe('in app', function() {
2022
beforeEach(function() {
21-
return emberNew();
23+
return emberNew().then(() => generateFakePackageManifest('ember-cli-qunit', '4.1.0'));
2224
});
2325

2426
it('route foo', function() {
@@ -249,7 +251,7 @@ describe('Blueprint: route', function() {
249251

250252
describe('in addon', function() {
251253
beforeEach(function() {
252-
return emberNew({ target: 'addon' });
254+
return emberNew({ target: 'addon' }).then(() => generateFakePackageManifest('ember-cli-qunit', '4.1.0'));
253255
});
254256

255257
// Skipping these because the reason they're failing is *not* apparent, and

node-tests/blueprints/serializer-test.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ describe('Acceptance: generate and destroy serializer blueprints', function() {
1919
setupTestHooks(this);
2020

2121
beforeEach(function() {
22-
return emberNew();
22+
return emberNew().then(() => generateFakePackageManifest('ember-cli-qunit', '4.1.0'));
2323
});
2424

2525
it('serializer', function() {

node-tests/blueprints/transform-test.js

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,8 @@ describe('Acceptance: generate and destroy transform blueprints', function() {
1717

1818
describe('in app', function() {
1919
beforeEach(function() {
20-
return emberNew();
20+
return emberNew()
21+
.then(() => generateFakePackageManifest('ember-cli-qunit', '4.1.0'));
2122
});
2223

2324
it('transform', function() {

0 commit comments

Comments
 (0)