Skip to content

Commit c6b687c

Browse files
Merge pull request #42 from ember-cli/NullVoxPopuli-patch-4
Don't allow CI to run linting twice
2 parents b204f62 + 4ebb764 commit c6b687c

File tree

3 files changed

+4
-5
lines changed

3 files changed

+4
-5
lines changed

files/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ Make use of the many generators for code, try `ember help generate` for more det
3333
### Running Tests
3434

3535
- `<%= invokeScriptPrefix %> test`
36-
- `<%= invokeScriptPrefix %> test:ember <% if (npm) { %>-- <% } %>--server`
36+
- `<%= invokeScriptPrefix %> test <% if (npm) { %>-- <% } %>--server`
3737

3838
### Linting
3939

files/package.json

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,7 @@
2424
"lint:js:fix": "eslint . --fix<% if (typescript) { %>",
2525
"lint:types": "glint<% } %>",
2626
"start": "vite",
27-
"test": "concurrently \"<%= packageManager %>:lint\" \"<%= packageManager %>:test:*\" --names \"lint,test:\" --prefixColors auto",
28-
"test:ember": "vite build --mode development && testem ci"
27+
"test": "vite build --mode development && testem ci"
2928
},
3029
"exports": {
3130
"./tests/*": "./tests/*",

tests/default.test.mjs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -68,10 +68,10 @@ describe('basic functionality', function () {
6868
let result;
6969

7070
try {
71-
result = await project.execa('pnpm', ['test:ember']);
71+
result = await project.execa('pnpm', ['test']);
7272
} catch (err) {
7373
console.log(err.stdout, err.stderr);
74-
throw 'Failed to successfully run test:ember';
74+
throw 'Failed to successfully run test';
7575
}
7676

7777
// make sure that each of the tests that we expect actually show up

0 commit comments

Comments
 (0)