Merge pull request #919 from ember-fastboot/scenario-tester

Move some failing tests from pre-built fixtures to scenario-tester

.github/workflows/ci.yml

@@ -65,31 +65,6 @@ jobs:
       - run: pnpm test:fastboot-express-middleware
       - run: pnpm test:fastboot-app-server
 
-  integration-tests:
-    name: Integration Tests
-    runs-on: ${{ matrix.os }}
-    timeout-minutes: 15
-
-    strategy:
-      fail-fast: false
-      matrix:
-        node-version: [16.x, 14.x]
-        os: [ubuntu-latest, windows-latest]
-
-    steps:
-      - name: Checkout Code
-        uses: actions/checkout@v4
-      - uses: pnpm/action-setup@v3
-        with:
-            version: 7
-      - name: Use Node.js ${{ matrix.node-version }}
-        uses: actions/setup-node@v4
-        with:
-          node-version: ${{ matrix.node-version }}
-          cache: pnpm
-      - run: pnpm install --frozen-lockfile
-      - run: pnpm test:integration
-
   test-packages:
     name: Test Packages
     runs-on: ${{ matrix.os }}
@@ -177,3 +152,47 @@ jobs:
       - run: pnpm install --frozen-lockfile
       - name: test
         run: pnpm --filter ember-cli-fastboot exec ember try:one ${{ matrix.ember-try-scenario }} --skip-cleanup
+
+  discover_matrix:
+    runs-on: ubuntu-latest
+
+    outputs:
+      matrix: ${{ steps.set-matrix.outputs.matrix }}
+
+    steps:
+      - uses: actions/checkout@v4
+      - uses: pnpm/action-setup@v3
+        with:
+            version: 7
+      - uses: actions/setup-node@v4
+        with:
+          node-version: 16
+          cache: pnpm
+      - run: pnpm install --frozen-lockfile
+      - id: set-matrix
+        working-directory: test-packages/test-scenarios
+        run: echo "matrix=$(npm run --silent test:list -- --matrix 'npm run test -- --filter %s:')" >> $GITHUB_OUTPUT
+
+  scenario-tester:
+    needs: discover_matrix
+    name: ${{ matrix.name }}
+    runs-on: ubuntu-latest
+    timeout-minutes: 7
+
+    strategy:
+      fail-fast: false
+      matrix: ${{fromJson(needs.discover_matrix.outputs.matrix)}}
+
+    steps:
+      - uses: actions/checkout@v4
+      - uses: pnpm/action-setup@v3
+        with:
+            version: 7
+      - uses: actions/setup-node@v4
+        with:
+          node-version: 16
+          cache: pnpm
+      - run: pnpm install --frozen-lockfile
+      - name: test
+        run: ${{ matrix.command }}
+        working-directory: test-packages/test-scenarios

.npmrc

@@ -0,0 +1 @@
+auto-install-peers=false

README.md

@@ -742,13 +742,6 @@ Make sure you have `.vscode/launch.json` with minimal configuration that looks l
 
 Run the automated tests by running `npm test`.
 
-Note that the integration tests create new Ember applications via `ember
-new` and thus have to run an `npm install`, which can take several
-minutes, particularly on slow connections.
-
-To speed up test runs you can run `npm run test:precook` to "precook" a
-`node_modules` directory that will be reused across test runs.
-
 ### Debugging Integration Tests
 
 Run the tests with the `DEBUG` environment variable set to

packages/ember-cli-fastboot/.eslintignore

@@ -13,6 +13,7 @@
 # misc
 /coverage/
 !.*
+.*/
 .eslintcache
 
 # ember-try

packages/ember-cli-fastboot/.eslintrc.js

@@ -1,4 +1,3 @@
-/* eslint-disable no-dupe-keys, prettier/prettier */
 'use strict';
 
 module.exports = {
@@ -18,34 +17,23 @@ module.exports = {
     'plugin:prettier/recommended',
   ],
   env: {
-    browser: true
-  },
-  rules: {
-    'ember/no-get': 'warn',
-    'ember/require-computed-property-dependencies': 'warn'
+    browser: true,
   },
   rules: {},
   overrides: [
     // node files
     {
       files: [
-        '.eslintrc.js',
-        '.prettierrc.js',
-        '.template-lintrc.js',
-        'ember-cli-build.js',
-        'index.js',
-        'testem.js',
-        'blueprints/*/index.js',
-        'config/**/*.js',
-        'tests/dummy/config/**/*.js',
-        'lib/**/*.js'
-      ],
-      excludedFiles: [
-        'app/**',
-        'addon/**',
-        'addon-test-support/**',
-        'app/**',
-        'tests/dummy/app/**',
+        './.eslintrc.js',
+        './.prettierrc.js',
+        './.template-lintrc.js',
+        './ember-cli-build.js',
+        './index.js',
+        './testem.js',
+        './blueprints/*/index.js',
+        './config/**/*.js',
+        './tests/dummy/config/**/*.js',
+        './lib/**/*.js',
       ],
       parserOptions: {
         sourceType: 'script',
@@ -57,5 +45,10 @@ module.exports = {
       plugins: ['node'],
       extends: ['plugin:node/recommended'],
     },
+    {
+      // Test files:
+      files: ['tests/**/*-test.{js,ts}'],
+      extends: ['plugin:qunit/recommended'],
+    },
   ],
 };

packages/ember-cli-fastboot/.npmignore

@@ -27,6 +27,7 @@
 /testem.js
 /test/
 /tests/
+/yarn-error.log
 /yarn.lock
 .gitkeep
 

packages/ember-cli-fastboot/.template-lintrc.js

@@ -1,5 +1,5 @@
 'use strict';
 
 module.exports = {
-  extends: 'octane',
+  extends: 'recommended',
 };

packages/ember-cli-fastboot/LICENSE.md

@@ -0,0 +1,9 @@
+The MIT License (MIT)
+
+Copyright (c) 2024
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

packages/ember-cli-fastboot/addon/services/fastboot.js

@@ -14,15 +14,15 @@ const RequestObject = EObject.extend({
     let request = this.request;
     delete this.request;
 
-    this.method = request.method;
-    this.body = request.body;
-    this.cookies = request.cookies;
-    this.headers = request.headers;
-    this.queryParams = request.queryParams;
-    this.path = request.path;
-    this.protocol = request.protocol;
+    this.method = request?.method;
+    this.body = request?.body;
+    this.cookies = request?.cookies;
+    this.headers = request?.headers;
+    this.queryParams = request?.queryParams;
+    this.path = request?.path;
+    this.protocol = request?.protocol;
     this._host = function() {
-      return request.host();
+      return request?.host();
     };
   },
 

packages/ember-cli-fastboot/config/ember-try.js

@@ -27,7 +27,7 @@ module.exports = async function () {
         name: 'ember-lts-3.24',
         npm: {
           devDependencies: {
-            'ember-source': '~3.24.0',
+            'ember-source': '~3.24.3',
           },
         },
       },
@@ -39,14 +39,6 @@ module.exports = async function () {
           },
         },
       },
-      {
-        name: 'ember-lts-4.4',
-        npm: {
-          devDependencies: {
-            'ember-source': '~4.4.0',
-          },
-        },
-      },
       {
         name: 'ember-release',
         npm: {

packages/ember-cli-fastboot/ember-cli-build.js

@@ -15,5 +15,11 @@ module.exports = function (defaults) {
   */
 
   const { maybeEmbroider } = require('@embroider/test-setup');
-  return maybeEmbroider(app);
+  return maybeEmbroider(app, {
+    skipBabel: [
+      {
+        package: 'qunit',
+      },
+    ],
+  });
 };