Skip to content

Commit d4e152e

Browse files
authored
Merge pull request #1062 from NullVoxPopuli/switch-to-pnpm
Extract test app
2 parents 5dfd2cf + 76e8b3e commit d4e152e

Some content is hidden

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

62 files changed

+1927
-231
lines changed

.github/workflows/ci.yml

+3-3
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ jobs:
2323
- uses: wyvox/action@v1
2424
- run: pnpm lint
2525
- run: pnpm test:ember
26-
working-directory: addon
26+
working-directory: test-app
2727

2828
floating-dependencies:
2929
name: 'Floating Dependencies'
@@ -35,7 +35,7 @@ jobs:
3535
with:
3636
pnpm-args: '--no-lockfile'
3737
- run: pnpm test:ember
38-
working-directory: addon
38+
working-directory: test-app
3939

4040
try-scenarios:
4141
name: 'Try: ${{ matrix.ember-try-scenario }}'
@@ -60,7 +60,7 @@ jobs:
6060
- uses: wyvox/action@v1
6161
- name: test
6262
run: node_modules/.bin/ember try:one ${{ matrix.ember-try-scenario }} --skip-cleanup
63-
working-directory: addon
63+
working-directory: test-app
6464

6565
types:
6666
runs-on: ubuntu-latest

addon/CONTRIBUTING.md

+3-3
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,12 @@
44

55
* `git clone <repository-url>`
66
* `cd ember-qunit`
7-
* `yarn install`
7+
* `pnpm install`
88

99
## Linting
1010

11-
* `yarn lint`
12-
* `yarn lint:fix`
11+
* `pnpm lint`
12+
* `pnpm lint:fix`
1313

1414
## Running tests
1515

addon/RELEASE.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ Once the prep work is completed, the actual release is straight forward:
3131
* First, ensure that you have installed your projects dependencies:
3232

3333
```sh
34-
yarn install
34+
pnpm install
3535
```
3636

3737
* Second, ensure that you have obtained a

addon/package.json

+3-4
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@
5151
"@ember/optional-features": "^2.0.0",
5252
"@ember/string": "^3.1.1",
5353
"@ember/test-helpers": "^3.0.3",
54-
"@embroider/test-setup": "^2.1.1",
54+
"@embroider/test-setup": "^3.0.1",
5555
"@glimmer/component": "^1.1.2",
5656
"@tsconfig/ember": "^2.0.0",
5757
"@types/qunit": "^2.19.4",
@@ -76,7 +76,7 @@
7676
"expect-type": "^0.15.0",
7777
"loader.js": "^4.7.0",
7878
"npm-run-all": "^4.1.5",
79-
"prettier": "2.8.4",
79+
"prettier": "2.8.8",
8080
"qunit": "^2.19.4",
8181
"release-it": "^15.7.0",
8282
"release-it-lerna-changelog": "^5.0.0",
@@ -126,7 +126,6 @@
126126
}
127127
},
128128
"volta": {
129-
"node": "18.16.0",
130-
"yarn": "1.22.19"
129+
"extends": "../package.json"
131130
}
132131
}

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

-21
This file was deleted.

addon/tests/dummy/public/crossdomain.xml

-15
This file was deleted.

addon/tests/helpers/destroy-app.js

-5
This file was deleted.

addon/tests/helpers/module-for-acceptance.js

-26
This file was deleted.

addon/tests/helpers/resolver.js

-18
This file was deleted.

addon/tests/helpers/start-app.js

-15
This file was deleted.

addon/tests/integration/setup-test-test.js

-5
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,8 @@ import { module, test } from 'qunit';
22
import Service, { inject as injectService } from '@ember/service';
33
import Component from '@ember/component';
44
import { setupTest } from 'ember-qunit';
5-
import { setResolverRegistry } from '../helpers/resolver';
65

76
module('setupTest tests', function (hooks) {
8-
hooks.beforeEach(function () {
9-
setResolverRegistry({});
10-
});
11-
127
setupTest(hooks);
138

149
test('can be used for unit style testing', function (assert) {

addon/tests/test-helper.js

-6
This file was deleted.

0 commit comments

Comments
 (0)