re-enable release scenario

test-packages/classic-app-template/config/environment.js

@@ -5,7 +5,7 @@ module.exports = function (environment) {
     modulePrefix: 'classic-app-template',
     environment,
     rootURL: '/',
-    locationType: 'auto',
+    locationType: 'history',
     EmberENV: {
       FEATURES: {
         // Here you can enable experimental features on an ember canary build

test-packages/classic-app-template/package.json

@@ -43,6 +43,7 @@
     "ember-page-title": "^6.2.2",
     "ember-qunit": "^5.1.5",
     "ember-resolver": "^8.0.3",
+    "ember-service-import-polyfill": "^1.0.0",
     "ember-source": "~3.28.8",
     "ember-template-lint": "^3.15.0",
     "eslint": "^7.32.0",

test-packages/test-scenarios/custom-output-paths-test.mjs

@@ -10,7 +10,8 @@ import './helpers/qunit-assertions.mjs';
 
 appScenarios
   // output paths were deprecated and removed in 6.0
-  .skip('lts_6.12')
+  .skip('lts_6_12')
+  .skip('release')
   .map('custom-output-paths', (project) => {
     project.mergeFiles({
       'ember-cli-build.js': `var EmberApp = require('ember-cli/lib/broccoli/ember-app');

test-packages/test-scenarios/ember-cli-fastboot-test.mjs

@@ -51,7 +51,7 @@ appScenarios
           return process.stop();
         });
 
-        test(`provides sandbox globals with ender mode ${renderMode}`, async function (assert) {
+        test(`provides sandbox globals with render mode ${renderMode}`, async function (assert) {
           process = await emberServe(
             app,
             renderMode === 'rehydrate'

test-packages/test-scenarios/fastboot-config-location-test.mjs

@@ -9,8 +9,6 @@ const { module: Qmodule, test } = qunit;
 
 appScenarios
   .map('fastboot-config-location', (project) => {
-    // this test app has the service import itself so we need the polyfill to do its work
-    project.linkDevDependency('ember-service-import-polyfill', { baseDir: '.' });
     merge(project.files, {
       app: {
         routes: {
@@ -27,28 +25,25 @@ appScenarios
             }
           }
           `,
-          'test-passed.js': `
-          import Ember from 'ember';
-
-          export default Ember.Route.extend({});
-          `,
         },
         templates: {
           'test-passed.hbs': `<h1>The Test Passed!</h1>
 
           <p>All redirection tests should be set up to redirect here.</p>`,
         },
         'router.js': `
-        import Ember from 'ember';
+        import EmberRouter from '@ember/routing/router';
+        import config from './config/environment';
 
-        let Router = Ember.Router;
+        export default class Router extends EmberRouter {
+          location = config.locationType;
+          rootURL = config.rootURL;
+        }
 
         Router.map(function() {
           this.route('redirect-on-transition-to');
           this.route('test-passed');
         });
-
-        export default Router;
         `,
       },
       config: {

test-packages/test-scenarios/fastboot-express-middleware-test.mjs

@@ -23,8 +23,6 @@ Object.assign(qunit.assert, {
 
 appScenarios
   .map('fastboot-express-middleware', (project) => {
-    // this test app has the service import itself so we need the polyfill to do its work
-    project.linkDevDependency('ember-service-import-polyfill', { baseDir: '.' });
     merge(project.files, {
       app: {
         routes: {

test-packages/test-scenarios/fastboot-shoebox-test.mjs

@@ -9,8 +9,6 @@ const { module: Qmodule, test } = qunit;
 
 appScenarios
   .map('fastboot-shoebox-test', (project) => {
-    // this test app has the service import itself so we need the polyfill to do its work
-    project.linkDevDependency('ember-service-import-polyfill', { baseDir: '.' });
     merge(project.files, {
       app: {
         routes: {

test-packages/test-scenarios/fixtures/fastboot-location/app/routes/noop-replace-with.js

@@ -1,5 +1,5 @@
 import Route from '@ember/routing/route';
-import { inject as service } from '@ember/service';
+import { service } from '@ember/service';
 
 export default class extends Route {
   @service router;

test-packages/test-scenarios/fixtures/fastboot-location/app/routes/noop-transition-to.js

@@ -1,5 +1,5 @@
 import Route from '@ember/routing/route';
-import { inject as service } from '@ember/service';
+import { service } from '@ember/service';
 
 export default class extends Route {
   @service router;

test-packages/test-scenarios/fixtures/fastboot-location/app/routes/redirect-on-replace-with.js

@@ -1,5 +1,5 @@
 import Route from '@ember/routing/route';
-import { inject as service } from '@ember/service';
+import { service } from '@ember/service';
 
 export default class extends Route {
   @service router;

test-packages/test-scenarios/fixtures/fastboot-location/app/routes/redirect-on-transition-to.js

@@ -1,5 +1,5 @@
 import Route from '@ember/routing/route';
-import { inject as service } from '@ember/service';
+import { service } from '@ember/service';
 
 export default class extends Route {
   @service router;

test-packages/test-scenarios/fixtures/request-details/app/controllers/list-cookies.js

@@ -1,5 +1,3 @@
-/* eslint-disable ember/new-module-imports, prettier/prettier */
-import Ember from "ember";
+import Controller from '@ember/controller';
 
-export default Ember.Controller.extend({
-});
+export default class extends Controller {}

test-packages/test-scenarios/fixtures/request-details/app/controllers/list-headers.js

@@ -1,5 +1,3 @@
-/* eslint-disable ember/new-module-imports, prettier/prettier */
-import Ember from "ember";
+import Controller from '@ember/controller';
 
-export default Ember.Controller.extend({
-});
+export default class extends Controller {}

test-packages/test-scenarios/fixtures/request-details/app/controllers/list-query-params.js

@@ -1,5 +1,3 @@
-/* eslint-disable ember/new-module-imports, prettier/prettier */
-import Ember from "ember";
+import Controller from '@ember/controller';
 
-export default Ember.Controller.extend({
-});
+export default class extends Controller {}

test-packages/test-scenarios/fixtures/request-details/app/controllers/show-body.js

@@ -1,5 +1,3 @@
-/* eslint-disable ember/new-module-imports, prettier/prettier */
-import Ember from "ember";
+import Controller from '@ember/controller';
 
-export default Ember.Controller.extend({
-});
+export default class extends Controller {}

test-packages/test-scenarios/fixtures/request-details/app/controllers/show-host.js

@@ -1,5 +1,3 @@
-/* eslint-disable ember/new-module-imports, prettier/prettier */
-import Ember from "ember";
+import Controller from '@ember/controller';
 
-export default Ember.Controller.extend({
-});
+export default class extends Controller {}

test-packages/test-scenarios/fixtures/request-details/app/controllers/show-method.js

@@ -1,5 +1,3 @@
-/* eslint-disable ember/new-module-imports, prettier/prettier */
-import Ember from "ember";
+import Controller from '@ember/controller';
 
-export default Ember.Controller.extend({
-});
+export default class extends Controller {}

test-packages/test-scenarios/fixtures/request-details/app/controllers/show-path.js

@@ -1,5 +1,3 @@
-/* eslint-disable ember/new-module-imports, prettier/prettier */
-import Ember from "ember";
+import Controller from '@ember/controller';
 
-export default Ember.Controller.extend({
-});
+export default class extends Controller {}

test-packages/test-scenarios/fixtures/request-details/app/controllers/show-protocol.js

@@ -1,5 +1,3 @@
-/* eslint-disable ember/new-module-imports, prettier/prettier */
-import Ember from "ember";
+import Controller from '@ember/controller';
 
-export default Ember.Controller.extend({
-});
+export default class extends Controller {}

test-packages/test-scenarios/fixtures/request-details/app/router.js

@@ -1,12 +1,12 @@
-/* eslint-disable ember/new-module-imports, prettier/prettier */
-import Ember from 'ember';
+import EmberRouter from '@ember/routing/router';
 import config from './config/environment';
 
-var Router = Ember.Router.extend({
-  location: config.locationType
-});
+export default class Router extends EmberRouter {
+  location = config.locationType;
+  rootURL = config.rootURL;
+}
 
-Router.map(function() {
+Router.map(function () {
   this.route('list-cookies');
   this.route('list-headers');
   this.route('list-query-params');
@@ -16,5 +16,3 @@ Router.map(function() {
   this.route('show-path');
   this.route('show-protocol');
 });
-
-export default Router;

test-packages/test-scenarios/fixtures/request-details/app/routes/list-cookies.js

@@ -1,12 +1,12 @@
-/* eslint-disable ember/new-module-imports, ember/no-get, prettier/prettier */
-import Ember from "ember";
+import Route from '@ember/routing/route';
+import { service } from '@ember/service';
 
-export default Ember.Route.extend({
-  fastboot: Ember.inject.service(),
+export default class extends Route {
+  @service fastboot;
 
   model() {
     return {
       cookies: this.get('fastboot.request.cookies')
     };
   }
-});
+};

test-packages/test-scenarios/fixtures/request-details/app/routes/list-headers.js

@@ -1,12 +1,12 @@
-/* eslint-disable ember/new-module-imports, ember/no-get, prettier/prettier */
-import Ember from 'ember';
+import Route from '@ember/routing/route';
+import { service } from '@ember/service';
 
-export default Ember.Route.extend({
-  fastboot: Ember.inject.service(),
+export default class extends Route {
+  @service fastboot;
 
   model() {
     return {
       desiredHeader: this.get('fastboot.request.headers').get('X-Fastboot-Info')
     };
   }
-});
+};

test-packages/test-scenarios/fixtures/request-details/app/routes/list-query-params.js

@@ -1,12 +1,12 @@
-/* eslint-disable ember/new-module-imports, ember/no-get, prettier/prettier */
-import Ember from 'ember';
+import Route from '@ember/routing/route';
+import { service } from '@ember/service';
 
-export default Ember.Route.extend({
-  fastboot: Ember.inject.service(),
+export default class extends Route {
+  @service fastboot;
 
   model() {
     return {
       queryParams: this.get('fastboot.request.queryParams')
     };
   }
-});
+};

test-packages/test-scenarios/fixtures/request-details/app/routes/show-body.js

@@ -1,12 +1,12 @@
-/* eslint-disable ember/new-module-imports, ember/no-get, prettier/prettier */
-import Ember from 'ember';
+import Route from '@ember/routing/route';
+import { service } from '@ember/service';
 
-export default Ember.Route.extend({
-  fastboot: Ember.inject.service(),
+export default class extends Route {
+  @service fastboot;
 
   model() {
     return {
       body: this.get('fastboot.request.body')
     };
   }
-});
+};

test-packages/test-scenarios/fixtures/request-details/app/routes/show-host.js

@@ -1,12 +1,12 @@
-/* eslint-disable ember/new-module-imports, ember/no-get, prettier/prettier */
-import Ember from 'ember';
+import Route from '@ember/routing/route';
+import { service } from '@ember/service';
 
-export default Ember.Route.extend({
-  fastboot: Ember.inject.service(),
+export default class extends Route {
+  @service fastboot;
 
   model() {
     return {
       host: this.get('fastboot.request.host')
     };
   }
-});
+};

test-packages/test-scenarios/fixtures/request-details/app/routes/show-method.js

@@ -1,12 +1,12 @@
-/* eslint-disable ember/new-module-imports, ember/no-get, prettier/prettier */
-import Ember from 'ember';
+import Route from '@ember/routing/route';
+import { service } from '@ember/service';
 
-export default Ember.Route.extend({
-  fastboot: Ember.inject.service(),
+export default class extends Route {
+  @service fastboot;
 
   model() {
     return {
       method: this.get('fastboot.request.method')
     };
   }
-});
+};

test-packages/test-scenarios/fixtures/request-details/app/routes/show-path.js

@@ -1,12 +1,12 @@
-/* eslint-disable ember/new-module-imports, ember/no-get, prettier/prettier */
-import Ember from 'ember';
+import Route from '@ember/routing/route';
+import { service } from '@ember/service';
 
-export default Ember.Route.extend({
-  fastboot: Ember.inject.service(),
+export default class extends Route {
+  @service fastboot;
 
   model() {
     return {
       path: this.get('fastboot.request.path')
     };
   }
-});
+};

test-packages/test-scenarios/fixtures/request-details/app/routes/show-protocol.js

@@ -1,12 +1,12 @@
-/* eslint-disable ember/new-module-imports, ember/no-get, prettier/prettier */
-import Ember from 'ember';
+import Route from '@ember/routing/route';
+import { service } from '@ember/service';
 
-export default Ember.Route.extend({
-  fastboot: Ember.inject.service(),
+export default class extends Route {
+  @service fastboot;
 
   model() {
     return {
       protocol: this.get('fastboot.request.protocol')
     };
   }
-});
+};

test-packages/test-scenarios/integration-tests-test.mjs

@@ -25,9 +25,6 @@ appScenarios
     } else {
       project.linkDependency('ember-cli-head', { baseDir: './' });
     }
-
-    // this test app has the service import itself so we need the polyfill to do its work
-    project.linkDevDependency('ember-service-import-polyfill', { baseDir: '.' });
   })
   .forEachScenario((scenario) => {
     Qmodule(scenario.name, function (hooks) {

test-packages/test-scenarios/oneerror-per-visit-test.mjs

@@ -7,6 +7,8 @@ import buildFastboot from './helpers/build-fastboot.mjs';
 const { module: Qmodule, test } = qunit;
 
 appScenarios
+  // Ember.onerror was removed in 7 https://deprecations.emberjs.com/id/deprecate-import-onerror-from-ember
+  .skip('release')
   .map('oneerror-per-visit', (project) => {
     merge(project.files, {
       app: {