Skip to content

Commit

Permalink
Fix tests
Browse files Browse the repository at this point in the history
  • Loading branch information
simonihmig committed Sep 25, 2022
1 parent 538acd0 commit fb4583c
Show file tree
Hide file tree
Showing 6 changed files with 13 additions and 10 deletions.
5 changes: 4 additions & 1 deletion blueprints/addon/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -121,7 +121,10 @@ module.exports = {
});

if (options.typescript) {
await this.addAddonToProject({ name: 'ember-cli-typescript', blueprintOptions: { ...options, save: true } });
await this.addAddonToProject({
name: 'ember-cli-typescript',
blueprintOptions: { ...options, save: true },
});
}
},

Expand Down
2 changes: 1 addition & 1 deletion tests/acceptance/new-test.js
Original file line number Diff line number Diff line change
Expand Up @@ -703,7 +703,7 @@ describe('Acceptance: ember new', function () {
// smoke test for the existence of essential TypeScript features... (see app test)
let pkgJson = fs.readJsonSync('package.json');
expect(pkgJson.scripts['lint:ts']).to.equal('tsc --noEmit');
expect(pkgJson.devDependencies['ember-cli-typescript']).to.exist;
expect(pkgJson.dependencies['ember-cli-typescript']).to.exist;
expect(pkgJson.devDependencies['typescript']).to.exist;
expect(Object.keys(pkgJson.devDependencies).some((pkgName) => pkgName.match(/^@types/))).to.be.true;

Expand Down
4 changes: 2 additions & 2 deletions tests/fixtures/addon/defaults/.ember-cli
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@
"disableAnalytics": false,

/**
Setting `isTypeScriptProject` to true will force the blueprint generators to generate TypeScript
rather than JavaScript by default, when a TypeScript version of a given blueprint is available.
Setting `isTypeScriptProject` to true will force the blueprint generators to generate TypeScript
rather than JavaScript by default, when a TypeScript version of a given blueprint is available.
*/
"isTypeScriptProject": false
}
4 changes: 2 additions & 2 deletions tests/fixtures/addon/typescript/.ember-cli
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@
"disableAnalytics": false,

/**
Setting `isTypeScriptProject` to true will force the blueprint generators to generate TypeScript
rather than JavaScript by default, when a TypeScript version of a given blueprint is available.
Setting `isTypeScriptProject` to true will force the blueprint generators to generate TypeScript
rather than JavaScript by default, when a TypeScript version of a given blueprint is available.
*/
"isTypeScriptProject": true
}
4 changes: 2 additions & 2 deletions tests/fixtures/app/defaults/.ember-cli
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@
"disableAnalytics": false,

/**
Setting `isTypeScriptProject` to true will force the blueprint generators to generate TypeScript
rather than JavaScript by default, when a TypeScript version of a given blueprint is available.
Setting `isTypeScriptProject` to true will force the blueprint generators to generate TypeScript
rather than JavaScript by default, when a TypeScript version of a given blueprint is available.
*/
"isTypeScriptProject": false
}
4 changes: 2 additions & 2 deletions tests/fixtures/app/typescript/.ember-cli
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@
"disableAnalytics": false,

/**
Setting `isTypeScriptProject` to true will force the blueprint generators to generate TypeScript
rather than JavaScript by default, when a TypeScript version of a given blueprint is available.
Setting `isTypeScriptProject` to true will force the blueprint generators to generate TypeScript
rather than JavaScript by default, when a TypeScript version of a given blueprint is available.
*/
"isTypeScriptProject": true
}

0 comments on commit fb4583c

Please sign in to comment.