Skip to content

Commit e5f4294

Browse files
committed
fix paths in legacy mocha tests
1 parent 15c0764 commit e5f4294

File tree

9 files changed

+68
-17
lines changed

9 files changed

+68
-17
lines changed
Binary file not shown.
Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
const path = require('path');
2+
3+
module.exports = function() {
4+
return path.resolve(__dirname, '../../../../packages/ember-cli-fastboot');
5+
};
Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
const scope = '@gaurav9576';
2+
const packageDir = `${__dirname}/../../../../packages`;
3+
4+
module.exports = function setFastbootPkgPath(pkg) {
5+
pkg.dependencies = pkg.dependencies ?? {};
6+
[pkg.dependencies, pkg.devDependencies].forEach(depList => {
7+
['fastboot', 'ember-cli-fastboot', 'fastboot-express-middleware'].forEach(
8+
depName => {
9+
const dep = `${scope}/${depName}`;
10+
if (dep in depList) {
11+
depList[dep] = `file:${packageDir}/${depName}`;
12+
}
13+
}
14+
);
15+
});
16+
};

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

Lines changed: 14 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -3,49 +3,51 @@
33
const expect = require('chai').use(require('chai-string')).expect;
44
const RSVP = require('rsvp');
55
const request = RSVP.denodeify(require('request'));
6+
const setFastbootPkgPath = require('../lib/path/set-fastboot-pkg-path');
67

78
const AddonTestApp = require('ember-cli-addon-tests').AddonTestApp;
89

9-
describe('FastBoot config', function () {
10+
describe('FastBoot config', function() {
1011
this.timeout(400000);
1112

1213
let app;
1314

14-
before(function () {
15+
before(function() {
1516
app = new AddonTestApp();
1617

1718
return app
1819
.create('fastboot-config', {
1920
emberVersion: '~3.28.12',
20-
emberDataVersion: '~3.28.12',
21+
emberDataVersion: '~3.28.12'
2122
})
22-
.then(function () {
23-
app.editPackageJSON((pkg) => {
23+
.then(function() {
24+
app.editPackageJSON(pkg => {
25+
setFastbootPkgPath(pkg);
2426
delete pkg.devDependencies['ember-fetch'];
2527
delete pkg.devDependencies['ember-welcome-page'];
2628
// needed because @ember-data/store does `FastBoot.require('crypto')`
2729
pkg.fastbootDependencies = ['node-fetch', 'crypto'];
2830
});
2931
return app.run('npm', 'install');
3032
})
31-
.then(function () {
33+
.then(function() {
3234
return app.startServer({
33-
command: 'serve',
35+
command: 'serve'
3436
});
3537
});
3638
});
3739

38-
after(function () {
40+
after(function() {
3941
return app.stopServer();
4042
});
4143

42-
it('provides sandbox globals', function () {
44+
it('provides sandbox globals', function() {
4345
return request({
4446
url: 'http://localhost:49741/',
4547
headers: {
46-
Accept: 'text/html',
47-
},
48-
}).then(function (response) {
48+
Accept: 'text/html'
49+
}
50+
}).then(function(response) {
4951
expect(response.statusCode).to.equal(200);
5052
expect(response.headers['content-type']).to.equalIgnoreCase(
5153
'text/html; charset=utf-8'

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
const expect = require('chai').expect;
44
const RSVP = require('rsvp');
55
const request = RSVP.denodeify(require('request'));
6+
const setFastbootPkgPath = require('../lib/path/set-fastboot-pkg-path');
67

78
const AddonTestApp = require('ember-cli-addon-tests').AddonTestApp;
89

@@ -21,6 +22,7 @@ describe('FastBootLocation Configuration', function () {
2122
})
2223
.then(function () {
2324
app.editPackageJSON((pkg) => {
25+
setFastbootPkgPath(pkg);
2426
delete pkg.devDependencies['ember-fetch'];
2527
delete pkg.devDependencies['ember-welcome-page'];
2628
// needed because @ember-data/store does `FastBoot.require('crypto')`

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
const expect = require('chai').expect;
44
const RSVP = require('rsvp');
55
const request = RSVP.denodeify(require('request'));
6+
const setFastbootPkgPath = require('../lib/path/set-fastboot-pkg-path');
67

78
const AddonTestApp = require('ember-cli-addon-tests').AddonTestApp;
89

@@ -20,6 +21,7 @@ describe('FastBootLocation', function () {
2021
})
2122
.then(function () {
2223
app.editPackageJSON((pkg) => {
24+
setFastbootPkgPath(pkg);
2325
delete pkg.devDependencies['ember-fetch'];
2426
delete pkg.devDependencies['ember-welcome-page'];
2527
// needed because @ember-data/store does `FastBoot.require('crypto')`

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ const expect = chai.expect;
55
const fs = require('fs-extra');
66
const path = require('path');
77
const AddonTestApp = require('ember-cli-addon-tests').AddonTestApp;
8+
const setFastbootPkgPath = require('../lib/path/set-fastboot-pkg-path');
89

910
chai.use(require('chai-fs'));
1011

@@ -23,6 +24,7 @@ describe('generating package.json', function () {
2324
})
2425
.then(function () {
2526
customApp.editPackageJSON((pkg) => {
27+
setFastbootPkgPath(pkg);
2628
delete pkg.devDependencies['ember-fetch'];
2729
delete pkg.devDependencies['ember-welcome-page'];
2830
// needed because @ember-data/store does `FastBoot.require('crypto')`

packages/ember-cli-fastboot/test/request-details-test.js

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,15 +6,21 @@ const expect = chai.expect;
66
const RSVP = require('rsvp');
77
const AddonTestApp = require('ember-cli-addon-tests').AddonTestApp;
88
const request = RSVP.denodeify(require('request'));
9+
const setFastbootPkgPath = require('../lib/path/set-fastboot-pkg-path');
910

1011
async function injectMiddlewareAddon(app) {
1112
app.editPackageJSON(function (pkg) {
13+
const scope = '@gaurav9576';
14+
pkg.dependencies = pkg.dependencies ?? {};
15+
['fastboot', 'fastboot-express-middleware'].forEach(depName => {
16+
pkg.dependencies[`${scope}/${depName}`] = '*';
17+
});
1218
pkg.devDependencies['body-parser'] =
1319
process.env.npm_package_devDependencies_body_parser;
14-
pkg.dependencies = pkg.dependencies || {};
1520
pkg['ember-addon'] = {
1621
paths: ['lib/post-middleware'],
1722
};
23+
setFastbootPkgPath(pkg);
1824
delete pkg.devDependencies['ember-fetch'];
1925
delete pkg.devDependencies['ember-welcome-page'];
2026
// needed because @ember-data/store does `FastBoot.require('crypto')`
@@ -33,10 +39,6 @@ async function injectMiddlewareAddon(app) {
3339
path.resolve(__dirname, '../../@gaurav9576/fastboot-express-middleware'),
3440
path.resolve(app.path, 'node_modules/fastboot-express-middleware')
3541
);
36-
app.editPackageJSON(function (pkg) {
37-
pkg.dependencies['@gaurav9576/fastboot'] = '*';
38-
pkg.dependencies['@gaurav9576/fastboot-express-middleware'] = '*';
39-
});
4042
}
4143

4244
describe('request details', function () {

packages/ember-cli-fastboot/test/root-url-test.js

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,11 @@
22

33
const expect = require('chai').use(require('chai-string')).expect;
44
const RSVP = require('rsvp');
5+
const path = require('path');
56
const request = RSVP.denodeify(require('request'));
7+
const setFastbootPkgPath = require('../lib/path/set-fastboot-pkg-path');
8+
const getPath = require('../lib/path/get-path');
9+
const exec = RSVP.denodeify(require('child_process').exec);
610

711
const AddonTestApp = require('ember-cli-addon-tests').AddonTestApp;
812

@@ -19,15 +23,31 @@ describe('rootUrl acceptance', function () {
1923
emberVersion: '~3.28.12',
2024
emberDataVersion: '~3.28.12',
2125
})
26+
.then(function () {
27+
return exec(`cd ${getPath()} && npm pack`);
28+
})
2229
.then(function () {
2330
app.editPackageJSON((pkg) => {
31+
const scope = '@gaurav9576';
32+
pkg.dependencies = pkg.dependencies ?? {};
33+
['fastboot', 'fastboot-express-middleware'].forEach(depName => {
34+
pkg.dependencies[`${scope}/${depName}`] = '*';
35+
});
36+
setFastbootPkgPath(pkg);
2437
delete pkg.devDependencies['ember-fetch'];
2538
delete pkg.devDependencies['ember-welcome-page'];
2639
// needed because @ember-data/store does `FastBoot.require('crypto')`
2740
pkg.fastbootDependencies = ['node-fetch', 'crypto'];
2841
});
2942
return app.run('npm', 'install');
3043
})
44+
.then(function () {
45+
const file = path.resolve(
46+
getPath(),
47+
'gaurav9576-ember-cli-fastboot-4.1.1.tgz'
48+
);
49+
return app.run('npm', 'install', file);
50+
})
3151
.then(function () {
3252
return app.startServer({
3353
command: 'serve',

0 commit comments

Comments
 (0)