Merge pull request #1062 from NullVoxPopuli/switch-to-pnpm

Extract test app
emberjs · Jun 12, 2023 · d4e152e · d4e152e
2 parents 5dfd2cf + 76e8b3e
commit d4e152e
Show file tree

Hide file tree

Showing 62 changed files with 1,927 additions and 231 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -23,7 +23,7 @@ jobs:
       - uses: wyvox/action@v1
       - run: pnpm lint
       - run: pnpm test:ember
-        working-directory: addon
+        working-directory: test-app
 
   floating-dependencies:
     name: 'Floating Dependencies'
@@ -35,7 +35,7 @@ jobs:
         with: 
           pnpm-args: '--no-lockfile'
       - run: pnpm test:ember
-        working-directory: addon
+        working-directory: test-app
 
   try-scenarios:
     name: 'Try: ${{ matrix.ember-try-scenario }}'
@@ -60,7 +60,7 @@ jobs:
       - uses: wyvox/action@v1
       - name: test
         run: node_modules/.bin/ember try:one ${{ matrix.ember-try-scenario }} --skip-cleanup
-        working-directory: addon
+        working-directory: test-app
 
   types:
     runs-on: ubuntu-latest

diff --git a/addon/CONTRIBUTING.md b/addon/CONTRIBUTING.md
@@ -4,12 +4,12 @@
 
 * `git clone <repository-url>`
 * `cd ember-qunit`
-* `yarn install`
+* `pnpm install`
 
 ## Linting
 
-* `yarn lint`
-* `yarn lint:fix`
+* `pnpm lint`
+* `pnpm lint:fix`
 
 ## Running tests
 

diff --git a/addon/RELEASE.md b/addon/RELEASE.md
@@ -31,7 +31,7 @@ Once the prep work is completed, the actual release is straight forward:
 * First, ensure that you have installed your projects dependencies:
 
 ```sh
-yarn install
+pnpm install
 ```
 
 * Second, ensure that you have obtained a

diff --git a/addon/package.json b/addon/package.json
@@ -51,7 +51,7 @@
     "@ember/optional-features": "^2.0.0",
     "@ember/string": "^3.1.1",
     "@ember/test-helpers": "^3.0.3",
-    "@embroider/test-setup": "^2.1.1",
+    "@embroider/test-setup": "^3.0.1",
     "@glimmer/component": "^1.1.2",
     "@tsconfig/ember": "^2.0.0",
     "@types/qunit": "^2.19.4",
@@ -76,7 +76,7 @@
     "expect-type": "^0.15.0",
     "loader.js": "^4.7.0",
     "npm-run-all": "^4.1.5",
-    "prettier": "2.8.4",
+    "prettier": "2.8.8",
     "qunit": "^2.19.4",
     "release-it": "^15.7.0",
     "release-it-lerna-changelog": "^5.0.0",
@@ -126,7 +126,6 @@
     }
   },
   "volta": {
-    "node": "18.16.0",
-    "yarn": "1.22.19"
+    "extends": "../package.json"
   }
 }
diff --git a/addon/tests/dummy/config/ember-cli-update.json b/addon/tests/dummy/config/ember-cli-update.json
diff --git a/addon/tests/dummy/public/crossdomain.xml b/addon/tests/dummy/public/crossdomain.xml
diff --git a/addon/tests/helpers/destroy-app.js b/addon/tests/helpers/destroy-app.js
diff --git a/addon/tests/helpers/module-for-acceptance.js b/addon/tests/helpers/module-for-acceptance.js
diff --git a/addon/tests/helpers/resolver.js b/addon/tests/helpers/resolver.js
diff --git a/addon/tests/helpers/start-app.js b/addon/tests/helpers/start-app.js
diff --git a/addon/tests/integration/setup-test-test.js b/addon/tests/integration/setup-test-test.js
@@ -2,13 +2,8 @@ import { module, test } from 'qunit';
 import Service, { inject as injectService } from '@ember/service';
 import Component from '@ember/component';
 import { setupTest } from 'ember-qunit';
-import { setResolverRegistry } from '../helpers/resolver';
 
 module('setupTest tests', function (hooks) {
-  hooks.beforeEach(function () {
-    setResolverRegistry({});
-  });
-
   setupTest(hooks);
 
   test('can be used for unit style testing', function (assert) {

diff --git a/addon/tests/test-helper.js b/addon/tests/test-helper.js