Skip to content

Commit ff604ae

Browse files
Merge pull request #1468 from emberjs/extract-test-app
Move tests to new test-app
2 parents e77fc12 + d85aa36 commit ff604ae

95 files changed

Lines changed: 1812 additions & 1308 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

.github/workflows/ci-build.yml

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,9 @@ jobs:
4040
- name: Build addon
4141
working-directory: addon
4242
run: pnpm build
43+
- run: pnpm i -f # sync injected dependencies
4344
- run: pnpm test
45+
working-directory: test-app
4446
- name: own types
4547
working-directory: addon
4648
run: pnpm tsc --noEmit
@@ -61,7 +63,9 @@ jobs:
6163
- name: Build addon
6264
working-directory: addon
6365
run: pnpm build
66+
- run: pnpm i -f # sync injected dependencies
6467
- name: Run Tests
68+
working-directory: test-app
6569
run: pnpm test
6670
- name: own types
6771
working-directory: addon
@@ -103,8 +107,9 @@ jobs:
103107
- name: Build addon
104108
working-directory: addon
105109
run: pnpm build
110+
- run: pnpm i -f # sync injected dependencies
106111
- name: test
107-
working-directory: addon
112+
working-directory: test-app
108113
run: node_modules/.bin/ember try:one ${{ matrix.ember-try-scenario }} --skip-cleanup
109114
- name: types compatibility
110115
working-directory: addon

CONTRIBUTING.md

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,12 @@ When updating the API, you will need to update the type tests (in `tests/api.ts`
1717

1818
## Running tests
1919

20-
* `ember test` – Runs the test suite on the current Ember version
21-
* `ember test --server` – Runs the test suite in "watch mode"
22-
* `ember try:each` – Runs the test suite against multiple Ember versions
20+
* `cd test-app`
21+
* Multiple ways of running the tests
22+
* `pnpm test`
23+
* `ember serve` + visit `/tests` in the browser
24+
* `ember test`
25+
* `ember test --server`
2326

2427
## Running the dummy application
2528

README.md

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -63,9 +63,12 @@ Contributing
6363

6464
### Running tests
6565

66-
* `pnpm test` (Runs `ember try:each` to test your addon against multiple Ember versions)
67-
* `ember test`
68-
* `ember test --server`
66+
* `cd test-app`
67+
* Multiple ways of running the tests
68+
* `pnpm test`
69+
* `ember serve` + visit `/tests` in the browser
70+
* `ember test`
71+
* `ember test --server`
6972

7073
### Running the dummy application
7174

addon/package.json

Lines changed: 1 addition & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -35,11 +35,7 @@
3535
"lint:js": "eslint --cache .",
3636
"lint:js:fix": "eslint . --fix",
3737
"lint:ts": "tsc --noEmit",
38-
"postpublish": "pnpm clean",
39-
"release": "release-it",
40-
"start": "ember serve",
41-
"test": "ember test",
42-
"test:all": "ember try:each"
38+
"postpublish": "pnpm clean"
4339
},
4440
"peerDependencies": {
4541
"ember-source": "^4.0.0 || ^5.0.0"
@@ -92,14 +88,9 @@
9288
"eslint-plugin-node": "^11.1.0",
9389
"eslint-plugin-prettier": "^4.2.1",
9490
"expect-type": "^0.15.0",
95-
"fs-extra": "^11.1.0",
96-
"latest-version": "^5.0.0",
9791
"loader.js": "^4.7.0",
98-
"pretender": "^3.4.7",
9992
"prettier": "^2.8.8",
10093
"qunit": "^2.19.4",
101-
"release-it": "~15.6.0",
102-
"release-it-lerna-changelog": "^5.0.0",
10394
"rimraf": "^5.0.1",
10495
"typescript": "^5.1.3",
10596
"webpack": "^5.86.0"
@@ -111,40 +102,12 @@
111102
"access": "public",
112103
"registry": "https://registry.npmjs.org/"
113104
},
114-
"changelog": {
115-
"repo": "emberjs/ember-test-helpers",
116-
"labels": {
117-
"breaking": ":boom: Breaking Change",
118-
"enhancement": ":rocket: Enhancement",
119-
"bug": ":bug: Bug Fix",
120-
"documentation": ":memo: Documentation",
121-
"internal": ":house: Internal"
122-
}
123-
},
124105
"ember": {
125106
"edition": "octane"
126107
},
127108
"ember-addon": {
128109
"configPath": "tests/dummy/config"
129110
},
130-
"release-it": {
131-
"scripts": {
132-
"after:bump": "pnpm docs"
133-
},
134-
"plugins": {
135-
"release-it-lerna-changelog": {
136-
"infile": "CHANGELOG.md",
137-
"launchEditor": true
138-
}
139-
},
140-
"git": {
141-
"tagName": "v${version}"
142-
},
143-
"github": {
144-
"release": true,
145-
"tokenRef": "GITHUB_AUTH"
146-
}
147-
},
148111
"volta": {
149112
"extends": "../package.json"
150113
},

addon/server/index.js

Lines changed: 0 additions & 1 deletion
This file was deleted.

addon/tests/dummy/app/config/environment.d.ts

Lines changed: 0 additions & 16 deletions
This file was deleted.

addon/tests/dummy/app/styles/app.css

Whitespace-only changes.

addon/tests/dummy/config/ember-cli-update.json

Lines changed: 0 additions & 18 deletions
This file was deleted.

addon/tests/dummy/public/crossdomain.xml

Lines changed: 0 additions & 15 deletions
This file was deleted.

addon/tests/dummy/vendor/ember-cli/test-support-suffix.js

Lines changed: 0 additions & 17 deletions
This file was deleted.

0 commit comments

Comments
 (0)