Skip to content

Commit

Permalink
Merge pull request #1468 from emberjs/extract-test-app
Browse files Browse the repository at this point in the history
Move tests to new test-app
  • Loading branch information
NullVoxPopuli authored Jul 29, 2024
2 parents e77fc12 + d85aa36 commit ff604ae
Show file tree
Hide file tree
Showing 95 changed files with 1,812 additions and 1,308 deletions.
7 changes: 6 additions & 1 deletion .github/workflows/ci-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,9 @@ jobs:
- name: Build addon
working-directory: addon
run: pnpm build
- run: pnpm i -f # sync injected dependencies
- run: pnpm test
working-directory: test-app
- name: own types
working-directory: addon
run: pnpm tsc --noEmit
Expand All @@ -61,7 +63,9 @@ jobs:
- name: Build addon
working-directory: addon
run: pnpm build
- run: pnpm i -f # sync injected dependencies
- name: Run Tests
working-directory: test-app
run: pnpm test
- name: own types
working-directory: addon
Expand Down Expand Up @@ -103,8 +107,9 @@ jobs:
- name: Build addon
working-directory: addon
run: pnpm build
- run: pnpm i -f # sync injected dependencies
- name: test
working-directory: addon
working-directory: test-app
run: node_modules/.bin/ember try:one ${{ matrix.ember-try-scenario }} --skip-cleanup
- name: types compatibility
working-directory: addon
Expand Down
9 changes: 6 additions & 3 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,12 @@ When updating the API, you will need to update the type tests (in `tests/api.ts`

## Running tests

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

## Running the dummy application

Expand Down
9 changes: 6 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -63,9 +63,12 @@ Contributing

### Running tests

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

### Running the dummy application

Expand Down
39 changes: 1 addition & 38 deletions addon/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -35,11 +35,7 @@
"lint:js": "eslint --cache .",
"lint:js:fix": "eslint . --fix",
"lint:ts": "tsc --noEmit",
"postpublish": "pnpm clean",
"release": "release-it",
"start": "ember serve",
"test": "ember test",
"test:all": "ember try:each"
"postpublish": "pnpm clean"
},
"peerDependencies": {
"ember-source": "^4.0.0 || ^5.0.0"
Expand Down Expand Up @@ -92,14 +88,9 @@
"eslint-plugin-node": "^11.1.0",
"eslint-plugin-prettier": "^4.2.1",
"expect-type": "^0.15.0",
"fs-extra": "^11.1.0",
"latest-version": "^5.0.0",
"loader.js": "^4.7.0",
"pretender": "^3.4.7",
"prettier": "^2.8.8",
"qunit": "^2.19.4",
"release-it": "~15.6.0",
"release-it-lerna-changelog": "^5.0.0",
"rimraf": "^5.0.1",
"typescript": "^5.1.3",
"webpack": "^5.86.0"
Expand All @@ -111,40 +102,12 @@
"access": "public",
"registry": "https://registry.npmjs.org/"
},
"changelog": {
"repo": "emberjs/ember-test-helpers",
"labels": {
"breaking": ":boom: Breaking Change",
"enhancement": ":rocket: Enhancement",
"bug": ":bug: Bug Fix",
"documentation": ":memo: Documentation",
"internal": ":house: Internal"
}
},
"ember": {
"edition": "octane"
},
"ember-addon": {
"configPath": "tests/dummy/config"
},
"release-it": {
"scripts": {
"after:bump": "pnpm docs"
},
"plugins": {
"release-it-lerna-changelog": {
"infile": "CHANGELOG.md",
"launchEditor": true
}
},
"git": {
"tagName": "v${version}"
},
"github": {
"release": true,
"tokenRef": "GITHUB_AUTH"
}
},
"volta": {
"extends": "../package.json"
},
Expand Down
1 change: 0 additions & 1 deletion addon/server/index.js

This file was deleted.

16 changes: 0 additions & 16 deletions addon/tests/dummy/app/config/environment.d.ts

This file was deleted.

Empty file.
18 changes: 0 additions & 18 deletions addon/tests/dummy/config/ember-cli-update.json

This file was deleted.

15 changes: 0 additions & 15 deletions addon/tests/dummy/public/crossdomain.xml

This file was deleted.

17 changes: 0 additions & 17 deletions addon/tests/dummy/vendor/ember-cli/test-support-suffix.js

This file was deleted.

Loading

0 comments on commit ff604ae

Please sign in to comment.