Merge pull request #19206 from andreisebastianc/clean-ember-routing-m…

…odel-arg-feature-flag-18060 [CLEANUP] Remove EMBER_ROUTING_MODEL_ARG feature flag
emberjs · Oct 19, 2020 · 6c4407f · 6c4407f
2 parents 53d5d0b + 02f092a
commit 6c4407f
Show file tree

Hide file tree

Showing 15 changed files with 56 additions and 1,848 deletions.
diff --git a/packages/@ember/-internals/glimmer/tests/integration/application/engine-test.js b/packages/@ember/-internals/glimmer/tests/integration/application/engine-test.js
@@ -9,7 +9,6 @@ import {
 import { Component } from '@ember/-internals/glimmer';
 import { Route } from '@ember/-internals/routing';
 import { RSVP } from '@ember/-internals/runtime';
-import { EMBER_ROUTING_MODEL_ARG } from '@ember/canary-features';
 import Controller from '@ember/controller';
 import Engine from '@ember/engine';
 import { next } from '@ember/runloop';
@@ -552,12 +551,7 @@ moduleFor(
             },
           })
         );
-        this.register(
-          'template:application_error',
-          compile(
-            EMBER_ROUTING_MODEL_ARG ? 'Error! {{@model.message}}' : 'Error! {{this.model.message}}'
-          )
-        );
+        this.register('template:application_error', compile('Error! {{@model.message}}'));
         this.register(
           'route:post',
           Route.extend({
@@ -596,12 +590,7 @@ moduleFor(
             },
           })
         );
-        this.register(
-          'template:error',
-          compile(
-            EMBER_ROUTING_MODEL_ARG ? 'Error! {{@model.message}}' : 'Error! {{this.model.message}}'
-          )
-        );
+        this.register('template:error', compile('Error! {{@model.message}}'));
         this.register(
           'route:post',
           Route.extend({
@@ -640,12 +629,7 @@ moduleFor(
             },
           })
         );
-        this.register(
-          'template:post_error',
-          compile(
-            EMBER_ROUTING_MODEL_ARG ? 'Error! {{@model.message}}' : 'Error! {{this.model.message}}'
-          )
-        );
+        this.register('template:post_error', compile('Error! {{@model.message}}'));
         this.register(
           'route:post',
           Route.extend({
@@ -684,12 +668,7 @@ moduleFor(
             },
           })
         );
-        this.register(
-          'template:post.error',
-          compile(
-            EMBER_ROUTING_MODEL_ARG ? 'Error! {{@model.message}}' : 'Error! {{this.model.message}}'
-          )
-        );
+        this.register('template:post.error', compile('Error! {{@model.message}}'));
         this.register(
           'route:post.comments',
           Route.extend({