Skip to content

Commit 3d04916

Browse files
author
Robert Jackson
authored
Merge pull request #780 from kiwiupover/update-fastboot-3.1.0
2 parents b723a43 + 7051676 commit 3d04916

17 files changed

Lines changed: 202 additions & 38 deletions

packages/ember-cli-fastboot/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@
3333
"ember-cli-lodash-subset": "2.0.1",
3434
"ember-cli-preprocess-registry": "^3.1.2",
3535
"ember-cli-version-checker": "^3.0.0",
36-
"fastboot": "^3.0.0",
36+
"fastboot": "^3.1.0",
3737
"fastboot-express-middleware": "^2.0.0",
3838
"fastboot-transform": "^0.1.3",
3939
"fs-extra": "^7.0.0",
@@ -52,7 +52,7 @@
5252
"ember-ajax": "^3.1.0",
5353
"ember-cli": "~3.3.0",
5454
"ember-cli-addon-tests": "^0.11.1",
55-
"ember-cli-dependency-checker": "^3.0.0",
55+
"ember-cli-dependency-checker": "^3.2.0",
5656
"ember-cli-eslint": "^4.2.3",
5757
"ember-cli-htmlbars": "^3.0.0",
5858
"ember-cli-htmlbars-inline-precompile": "^1.0.3",

packages/ember-cli-fastboot/test/async-content-test.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ describe('async content via deferred content', function() {
1515
before(function() {
1616
app = new AddonTestApp();
1717

18-
return app.create('async-content')
18+
return app.create('async-content', { emberVersion: 'latest'})
1919
.then(function() {
2020
return app.startServer({
2121
command: 'serve'

packages/ember-cli-fastboot/test/custom-html-file-test.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ describe('custom htmlFile', function() {
1414
before(function() {
1515
app = new AddonTestApp();
1616

17-
return app.create('custom-html-file')
17+
return app.create('custom-html-file', { emberVersion: 'latest'})
1818
.then(function() {
1919
return app.startServer({
2020
command: 'serve'

packages/ember-cli-fastboot/test/dynamic-initializers-test.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ describe('dynamic initializers', function() {
1414
before(function() {
1515
app = new AddonTestApp();
1616

17-
return app.create('dynamic-initializers')
17+
return app.create('dynamic-initializers', { emberVersion: 'latest'})
1818
.then(function() {
1919
return app.runEmberCommand('build');
2020
});

packages/ember-cli-fastboot/test/error-handler-test.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ describe('error handler acceptance', function() {
1414
before(function() {
1515
app = new AddonTestApp();
1616

17-
return app.create('error-handler')
17+
return app.create('error-handler', { emberVersion: 'latest'})
1818
.then(function() {
1919
return app.startServer({
2020
command: 'serve'

packages/ember-cli-fastboot/test/fastboot-config-test.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ describe('FastBoot config', function() {
1414
before(function() {
1515
app = new AddonTestApp();
1616

17-
return app.create('fastboot-config')
17+
return app.create('fastboot-config', { emberVersion: 'latest'})
1818
.then(function() {
1919
return app.startServer({
2020
command: 'serve'

packages/ember-cli-fastboot/test/fastboot-location-config-test.js

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,11 +14,12 @@ describe('FastBootLocation Configuration', function() {
1414
before(function() {
1515
app = new AddonTestApp();
1616

17-
return app.create('fastboot-location-config').then(function() {
18-
return app.startServer({
19-
command: 'serve'
17+
return app.create('fastboot-location-config', { emberVersion: 'latest'})
18+
.then(function() {
19+
return app.startServer({
20+
command: 'serve'
21+
});
2022
});
21-
});
2223
});
2324

2425
after(function() {

packages/ember-cli-fastboot/test/fastboot-location-test.js

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,11 +13,12 @@ describe('FastBootLocation', function() {
1313
before(function() {
1414
app = new AddonTestApp();
1515

16-
return app.create('fastboot-location').then(function() {
17-
return app.startServer({
18-
command: 'serve'
16+
return app.create('fastboot-location', { emberVersion: 'latest'})
17+
.then(function() {
18+
return app.startServer({
19+
command: 'serve'
20+
});
1921
});
20-
});
2122
});
2223

2324
after(function() {

packages/ember-cli-fastboot/test/head-content-test.js

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,8 @@ describe('head content acceptance', function() {
1515
app = new AddonTestApp();
1616

1717
return app.create('head-content', {
18-
skipNpm: true
18+
skipNpm: true,
19+
emberVersion: 'latest'
1920
})
2021
.then(addDependencies)
2122
.then(function() {

packages/ember-cli-fastboot/test/package-json-test.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ describe('generating package.json', function() {
1616
let customApp = new AddonTestApp();
1717

1818
before(function() {
19-
return customApp.create('customized-fingerprinting')
19+
return customApp.create('customized-fingerprinting', { emberVersion: 'latest'})
2020
.then(function() {
2121
return customApp.runEmberCommand('build', '--environment=production');
2222
});

0 commit comments

Comments
 (0)