Merge pull request #1141 from embroider-build/test-suite-cleanup

Drive the test suite from scenario-tester
embroider-build · Feb 25, 2022 · 0f91d26 · 0f91d26
2 parents b8afe94 + 66bc2b4
commit 0f91d26
Show file tree

Hide file tree

Showing 22 changed files with 127 additions and 448 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -43,7 +43,8 @@ jobs:
       - name: lint
         run: yarn lint
       - id: set-matrix
-        run: echo "::set-output name=matrix::$(node ./test-packages/support/suite-setup-util.js --matrix)"
+        working-directory: test-packages/support
+        run: echo "::set-output name=matrix::$(node ./suite-setup-util.js --matrix)"
 
   test:
     needs: ['preflight']

diff --git a/package.json b/package.json
@@ -27,7 +27,7 @@
     "compile": "tsc",
     "lint": "eslint . --cache",
     "prepare": "tsc",
-    "test": "node ./test-packages/support/suite-setup-util.js --emit && jest"
+    "test": "cd tests/scenarios && yarn test"
   },
   "jest": {
     "projects": [

diff --git a/packages/router/config/ember-try.js b/packages/router/config/ember-try.js
diff --git a/packages/router/package.json b/packages/router/package.json
@@ -66,7 +66,6 @@
     "ember-source": "~3.28.0",
     "ember-source-channel-url": "^3.0.0",
     "ember-template-lint": "^3.6.0",
-    "ember-try": "^1.4.0",
     "eslint": "^7.32.0",
     "eslint-config-prettier": "^8.3.0",
     "eslint-plugin-ember": "^10.5.4",

diff --git a/packages/router/testem.js b/packages/router/testem.js
@@ -1,2 +1,2 @@
-const { testemConfig } = require('@embroider/test-support/suite-setup-util');
+const { testemConfig } = require('@embroider/test-support/testem-config');
 module.exports = testemConfig();
diff --git a/packages/util/config/ember-try.js b/packages/util/config/ember-try.js
diff --git a/packages/util/package.json b/packages/util/package.json
@@ -68,7 +68,6 @@
     "ember-source": "~3.26",
     "ember-source-channel-url": "^3.0.0",
     "ember-template-lint": "^2.18.1",
-    "ember-try": "^1.4.0",
     "eslint": "^7.20.0",
     "eslint-config-prettier": "^7.2.0",
     "eslint-plugin-ember": "^10.2.0",

diff --git a/packages/util/testem.js b/packages/util/testem.js
@@ -1,2 +1,2 @@
-const { testemConfig } = require('@embroider/test-support/suite-setup-util');
+const { testemConfig } = require('@embroider/test-support/testem-config');
 module.exports = testemConfig();
diff --git a/test-packages/jest.config.js b/test-packages/jest.config.js
diff --git a/test-packages/sample-transforms/config/ember-try.js b/test-packages/sample-transforms/config/ember-try.js
diff --git a/test-packages/sample-transforms/package.json b/test-packages/sample-transforms/package.json
@@ -44,7 +44,6 @@
     "ember-source": "~3.26",
     "ember-source-channel-url": "^1.1.0",
     "ember-template-lint": "^3.6.0",
-    "ember-try": "^1.0.0",
     "eslint-plugin-ember": "^7.0.0",
     "eslint-plugin-node": "^9.0.1",
     "loader.js": "^4.7.0",

diff --git a/test-packages/sample-transforms/testem.js b/test-packages/sample-transforms/testem.js
@@ -1,2 +1,2 @@
-const { testemConfig } = require('@embroider/test-support/suite-setup-util');
+const { testemConfig } = require('@embroider/test-support/testem-config');
 module.exports = testemConfig();