Merge pull request #635 from simonihmig/fix-main

Fix CI for new Ember v6 canary and volta v2 releases

packages/addon-template/tests/dummy/config/environment.js

@@ -11,10 +11,7 @@ module.exports = function (environment) {
         // Here you can enable experimental features on an ember canary build
         // e.g. EMBER_NATIVE_DECORATOR_SUPPORT: true
       },
-      EXTEND_PROTOTYPES: {
-        // Prevent Ember Data from overriding Date.parse.
-        Date: false,
-      },
+      EXTEND_PROTOTYPES: false,
     },
 
     APP: {

packages/app-template/config/environment.js

@@ -11,10 +11,7 @@ module.exports = function (environment) {
         // Here you can enable experimental features on an ember canary build
         // e.g. EMBER_NATIVE_DECORATOR_SUPPORT: true
       },
-      EXTEND_PROTOTYPES: {
-        // Prevent Ember Data from overriding Date.parse.
-        Date: false,
-      },
+      EXTEND_PROTOTYPES: false,
     },
 
     APP: {

test-scenarios/addon-dev-dep-test.ts

@@ -25,7 +25,7 @@ addonScenarios
         app = await scenario.prepare();
       });
       test('ensure build error', async function (assert) {
-        let result = await app.execute('volta run npm -- run build');
+        let result = await app.execute('volta run npm run build');
         assert.notEqual(result.exitCode, 0, result.output);
         assert.ok(
           /@ef4\/addon-template tried to import \"some-lib\" in \"@ef4\/addon-template\/index.js\" from addon code, but \"some-lib\" is a devDependency/.test(

test-scenarios/babel-test.ts

@@ -100,7 +100,7 @@ appScenarios
         app = await scenario.prepare();
       });
       test('yarn test', async function (assert) {
-        let result = await app.execute('volta run npm -- run test');
+        let result = await app.execute('volta run npm run test');
         assert.equal(result.exitCode, 0, result.output);
       });
     });

test-scenarios/common-chunk-test.ts

@@ -95,7 +95,7 @@ appScenarios
       });
 
       test('npm run test', async function (assert) {
-        let result = await app.execute('volta run npm -- run test');
+        let result = await app.execute('volta run npm run test');
         assert.equal(result.exitCode, 0, result.output);
       });
     });

test-scenarios/conflict-test.ts

@@ -44,7 +44,7 @@ appScenarios
         app = await scenario.prepare();
       });
       test('ensure build error', async function (assert) {
-        let result = await app.execute('volta run npm -- run build');
+        let result = await app.execute('volta run npm run build');
         assert.notEqual(result.exitCode, 0, result.output);
         assert.ok(
           /@ef4\/app-template needs inner-lib satisfying \^1.0.0, but we have version 2.3.4 because of @ef4\/addon-template/.test(

test-scenarios/csp-test.ts

@@ -128,7 +128,7 @@ appScenarios
         app = await scenario.prepare();
       });
       test('npm run test', async function (assert) {
-        let result = await app.execute('volta run npm -- run test');
+        let result = await app.execute('volta run npm run test');
         assert.equal(result.exitCode, 0, result.output);
       });
     });

test-scenarios/custom-html-test.ts

@@ -163,7 +163,7 @@ appScenarios
       });
 
       test('npm run test', async function (assert) {
-        let result = await app.execute('volta run npm -- run test');
+        let result = await app.execute('volta run npm run test');
         assert.equal(result.exitCode, 0, result.output);
       });
     });

test-scenarios/customized-vendor-test.ts

@@ -139,7 +139,7 @@ appScenarios
         app = await scenario.prepare();
       });
       test('npm run test', async function (assert) {
-        let result = await app.execute('volta run npm -- run test');
+        let result = await app.execute('volta run npm run test');
         assert.equal(result.exitCode, 0, result.output);
       });
     });

test-scenarios/doubly-indirect-test.ts

@@ -165,7 +165,7 @@ appScenarios
       });
 
       test('npm run test', async function (assert) {
-        let result = await app.execute('volta run npm -- run test');
+        let result = await app.execute('volta run npm run test');
         assert.equal(result.exitCode, 0, result.output);
       });
     });

test-scenarios/dynamic-import-test.ts

@@ -263,7 +263,7 @@ appScenarios
       });
 
       test('npm run test', async function (assert) {
-        let result = await app.execute('volta run npm -- run test');
+        let result = await app.execute('volta run npm run test');
         assert.equal(result.exitCode, 0, result.output);
       });
 

test-scenarios/ember-cli-typescript-2-test.ts

@@ -56,7 +56,7 @@ appScenarios
         app = await scenario.prepare();
       });
       test('npm run test', async function (assert) {
-        let result = await app.execute('volta run npm -- run test');
+        let result = await app.execute('volta run npm run test');
         assert.equal(result.exitCode, 0, result.output);
       });
     });

test-scenarios/ember-cli-typescript-3-test.ts

@@ -70,7 +70,7 @@ appScenarios
         app = await scenario.prepare();
       });
       test('npm run test', async function (assert) {
-        let result = await app.execute('volta run npm -- run test');
+        let result = await app.execute('volta run npm run test');
         assert.equal(result.exitCode, 0, result.output);
       });
     });

test-scenarios/ember-cli-typescript-4-test.ts

@@ -49,7 +49,7 @@ appScenarios
         app = await scenario.prepare();
       });
       test('npm run test', async function (assert) {
-        let result = await app.execute('volta run npm -- run test');
+        let result = await app.execute('volta run npm run test');
         assert.equal(result.exitCode, 0, result.output);
       });
     });

test-scenarios/fastboot-helper.ts

@@ -4,7 +4,7 @@ import resolve from 'resolve';
 import { realpathSync } from 'fs';
 
 export async function setupFastboot(app: PreparedApp, environment = 'development') {
-  let result = await app.execute(`volta run ember -- build --environment=${environment}`);
+  let result = await app.execute(`volta run ember build --environment=${environment}`);
   if (result.exitCode !== 0) {
     throw new Error(`failed to build app for fastboot: ${result.output}`);
   }

test-scenarios/import-sync-test.ts

@@ -83,12 +83,13 @@ appScenarios
                   return { message: err.message }
                 }
               },
-            });`
+            });`,
         },
       },
       tests: {
         acceptance: {
-          'import-sync-test.js': `
+          'import-sync-test.js':
+            `
             import { module, test } from 'qunit';
             import { visit, currentURL } from '@ember/test-helpers';
             import { setupApplicationTest } from 'ember-qunit';
@@ -146,7 +147,7 @@ appScenarios
       });
 
       test('npm run test', async function (assert) {
-        let result = await app.execute('volta run npm -- run test');
+        let result = await app.execute('volta run npm run test');
         assert.equal(result.exitCode, 0, result.output);
       });
 

test-scenarios/indirect-test.ts

@@ -203,7 +203,7 @@ appScenarios
       });
 
       test('npm run test', async function (assert) {
-        let result = await app.execute('volta run npm -- run test');
+        let result = await app.execute('volta run npm run test');
         assert.equal(result.exitCode, 0, result.output);
       });
 
@@ -248,7 +248,7 @@ Scenarios.fromProject(baseApp)
       });
 
       test('npm run test', async function (assert) {
-        let result = await app.execute('volta run npm -- run test');
+        let result = await app.execute('volta run npm run test');
         assert.equal(result.exitCode, 0, result.output);
       });
     });

test-scenarios/layering-test.ts

@@ -72,7 +72,7 @@ appScenarios
       });
 
       test('npm run test', async function (assert) {
-        let result = await app.execute('volta run npm -- run test');
+        let result = await app.execute('volta run npm run test');
         assert.equal(result.exitCode, 0, result.output);
       });
     });

test-scenarios/leader-test.ts

@@ -72,7 +72,7 @@ Scenarios.fromProject(baseApp)
         app = await scenario.prepare();
       });
       test('run tests', async function (assert) {
-        let result = await app.execute('volta run npm -- run test');
+        let result = await app.execute('volta run npm run test');
         assert.equal(result.exitCode, 0, result.output);
       });
     });
@@ -98,7 +98,7 @@ Scenarios.fromProject(baseApp)
         app = await scenario.prepare();
       });
       test('ensure error', async function (assert) {
-        let result = await app.execute('volta run npm -- run build');
+        let result = await app.execute('volta run npm run build');
         assert.notEqual(result.exitCode, 0, result.output);
         assert.ok(
           /To use these addons, your app needs ember-auto-import >= 2: .*other-problematic-addon.*problematic-addon/.test(
@@ -128,7 +128,7 @@ Scenarios.fromProject(baseApp)
         app = await scenario.prepare();
       });
       test('ensure error', async function (assert) {
-        let result = await app.execute('volta run npm -- run build');
+        let result = await app.execute('volta run npm run build');
         assert.notEqual(result.exitCode, 0, result.output);
         assert.ok(
           /To use these addons, your app needs ember-auto-import >= 2: .*other-problematic-addon.*problematic-addon/.test(

test-scenarios/merged-test.ts

@@ -226,7 +226,7 @@ appScenarios
         app = await scenario.prepare();
       });
       test('ensure build succeeds', async function (assert) {
-        let result = await app.execute('volta run npm -- run test');
+        let result = await app.execute('volta run npm run test');
         assert.equal(result.exitCode, 0, result.output);
       });
     });

test-scenarios/no-conflict-test.ts

@@ -43,7 +43,7 @@ appScenarios
         app = await scenario.prepare();
       });
       test('ensure build succeeds', async function (assert) {
-        let result = await app.execute('volta run npm -- run build');
+        let result = await app.execute('volta run npm run build');
         assert.equal(result.exitCode, 0, result.output);
       });
     });

test-scenarios/node-es-modules.ts

@@ -37,7 +37,7 @@ template
       });
       test('npm run test', async function (assert) {
         console.log(app.dir);
-        let result = await app.execute('volta run npm -- run test');
+        let result = await app.execute('volta run npm run test');
         assert.equal(result.exitCode, 0, result.output);
       });
     });

test-scenarios/sample-addon-test.ts

@@ -220,7 +220,7 @@ addonScenarios
         app = await scenario.prepare();
       });
       test('yarn test', async function (assert) {
-        let result = await app.execute('volta run npm -- run test');
+        let result = await app.execute('volta run npm run test');
         assert.equal(result.exitCode, 0, result.output);
       });
     });

test-scenarios/static-import-test.ts

@@ -116,6 +116,12 @@ function staticImportTest(project: Project) {
               }),
             });
           `,
+        'hello-world.hbs': `
+          <div class="hello-world">{{this.formattedDate}}</div>
+          <div class="lodash">{{#if this.lodashPresent}}yes{{else}}no{{/if}}</div>
+          <div class="aliased">{{this.aliasedResult}}</div>
+          <div class="scoped">{{this.fromScoped}}</div>
+        `,
       },
       lib: {
         'example1.js': 'export default function() { return "example1 worked" }',
@@ -151,6 +157,7 @@ function staticImportTest(project: Project) {
       templates: {
         'application.hbs': `{{hello-world}}`,
         components: {
+          // Our "lts" scenario runs a very old version of Ember that does not support colocated components, that's why we intentionally keep this here
           'hello-world.hbs': `
               <div class="hello-world">{{this.formattedDate}}</div>
               <div class="lodash">{{#if this.lodashPresent}}yes{{else}}no{{/if}}</div>
@@ -216,7 +223,7 @@ function staticImportTest(project: Project) {
               let txt = await loadTxt();
               assert.equal(txt, 'here is some text');
             });
-          });        
+          });
         `,
         'import-into-tests-test.js': `
             import { module, test } from 'qunit';
@@ -397,7 +404,7 @@ scenarios.forEachScenario(scenario => {
     });
 
     test('npm run test', async function (assert) {
-      let result = await app.execute('volta run npm -- run test');
+      let result = await app.execute('volta run npm run test');
       assert.equal(result.exitCode, 0, result.output);
     });
   });

test-scenarios/targets-test.ts

@@ -124,7 +124,7 @@ appScenarios
         app = await scenario.prepare();
       });
       test('yarn test', async function (assert) {
-        let result = await app.execute('volta run npm -- run test');
+        let result = await app.execute('volta run npm run test');
         assert.equal(result.exitCode, 0, result.output);
       });
     });

test-scenarios/v2-addon-test.ts

@@ -387,7 +387,7 @@ scenarios.forEachScenario(scenario => {
       app = await scenario.prepare();
     });
     test('yarn test', async function (assert) {
-      let result = await app.execute('volta run npm -- run test');
+      let result = await app.execute('volta run npm run test');
       assert.equal(result.exitCode, 0, result.output);
     });
   });
@@ -454,7 +454,7 @@ Scenarios.fromProject(baseApp)
         app = await scenario.prepare();
       });
       test('ensure error', async function (assert) {
-        let result = await app.execute('volta run npm -- run build');
+        let result = await app.execute('volta run npm run build');
         assert.notEqual(result.exitCode, 0, result.output);
         assert.ok(
           /my-v1-addon needs to depend on ember-auto-import in order to use my-v2-addon/.test(result.stderr),
@@ -528,7 +528,7 @@ Scenarios.fromProject(baseApp)
         app = await scenario.prepare();
       });
       test('ensure success', async function (assert) {
-        let result = await app.execute('volta run npm -- run test');
+        let result = await app.execute('volta run npm run test');
         assert.strictEqual(result.exitCode, 0, result.output);
       });
     });

test-scenarios/webpack-config-test.ts

@@ -112,7 +112,7 @@ Scenarios.fromProject(baseApp)
         app = await scenario.prepare();
       });
       test('ensure build succeeds', async function (assert) {
-        let result = await app.execute('volta run npm -- run test');
+        let result = await app.execute('volta run npm run test');
         assert.equal(result.exitCode, 0, result.output);
       });
     });