From c334bf5a80fd17c91dfc95d35ace838a2274e4b2 Mon Sep 17 00:00:00 2001 From: Robert Jackson Date: Fri, 6 Sep 2019 15:04:19 -0400 Subject: [PATCH 1/2] [FEATURE ember-routing-model-arg] Enable by default. --- packages/@ember/canary-features/index.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/@ember/canary-features/index.ts b/packages/@ember/canary-features/index.ts index d678a5cd70b..1d0c2d4f45f 100644 --- a/packages/@ember/canary-features/index.ts +++ b/packages/@ember/canary-features/index.ts @@ -19,7 +19,7 @@ export const DEFAULT_FEATURES = { EMBER_METAL_TRACKED_PROPERTIES: true, EMBER_CUSTOM_COMPONENT_ARG_PROXY: true, EMBER_GLIMMER_SET_COMPONENT_TEMPLATE: true, - EMBER_ROUTING_MODEL_ARG: null, + EMBER_ROUTING_MODEL_ARG: true, }; /** From 5cb7c11bcee80b9b7ba55baedd9cb492e80b319b Mon Sep 17 00:00:00 2001 From: Robert Jackson Date: Fri, 6 Sep 2019 16:03:49 -0400 Subject: [PATCH 2/2] Avoid using `[].includes` (does not work in IE11). --- packages/ember/tests/routing/decoupled_basic_test.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/ember/tests/routing/decoupled_basic_test.js b/packages/ember/tests/routing/decoupled_basic_test.js index f5e60f7474b..5b7be85a6a8 100644 --- a/packages/ember/tests/routing/decoupled_basic_test.js +++ b/packages/ember/tests/routing/decoupled_basic_test.js @@ -302,12 +302,12 @@ moduleFor( let text = this.$('p').text(); assert.ok( - text.includes('Model: emberjs'), + text.indexOf('Model: emberjs') > -1, 'Passed model was available as the `@model` argument' ); assert.ok( - text.includes('Controller: emberjs'), + text.indexOf('Controller: emberjs') > -1, "Passed model was set as controller's `model` property" ); }