From f099d630a408dd6bb59e2897c1e5a3523ffbd342 Mon Sep 17 00:00:00 2001 From: Cameron Dubas Date: Sat, 11 Aug 2018 14:01:36 -0700 Subject: [PATCH 1/2] Allow routes to be named "array" --- packages/ember-routing/lib/system/dsl.js | 2 +- packages/ember-routing/tests/system/dsl_test.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/ember-routing/lib/system/dsl.js b/packages/ember-routing/lib/system/dsl.js index 7a152ac1026..71d4992824c 100644 --- a/packages/ember-routing/lib/system/dsl.js +++ b/packages/ember-routing/lib/system/dsl.js @@ -26,7 +26,7 @@ class DSL { return true; } - return ['array', 'basic', 'object', 'application'].indexOf(name) === -1; + return ['basic', 'object', 'application'].indexOf(name) === -1; })() ); diff --git a/packages/ember-routing/tests/system/dsl_test.js b/packages/ember-routing/tests/system/dsl_test.js index 7d22a83d935..d9d2b1e822e 100644 --- a/packages/ember-routing/tests/system/dsl_test.js +++ b/packages/ember-routing/tests/system/dsl_test.js @@ -17,7 +17,7 @@ moduleFor( } ['@test should fail when using a reserved route name'](assert) { - let reservedNames = ['array', 'basic', 'object', 'application']; + let reservedNames = ['basic', 'object', 'application']; assert.expect(reservedNames.length); From 65d66c8cdcea76b906c450c5a9b1b0a65c3ef94c Mon Sep 17 00:00:00 2001 From: Cameron Dubas Date: Sun, 12 Aug 2018 12:49:54 -0700 Subject: [PATCH 2/2] Allow routes to be named "object" --- packages/ember-routing/lib/system/dsl.js | 2 +- packages/ember-routing/tests/system/dsl_test.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/ember-routing/lib/system/dsl.js b/packages/ember-routing/lib/system/dsl.js index 71d4992824c..fa81d311052 100644 --- a/packages/ember-routing/lib/system/dsl.js +++ b/packages/ember-routing/lib/system/dsl.js @@ -26,7 +26,7 @@ class DSL { return true; } - return ['basic', 'object', 'application'].indexOf(name) === -1; + return ['basic', 'application'].indexOf(name) === -1; })() ); diff --git a/packages/ember-routing/tests/system/dsl_test.js b/packages/ember-routing/tests/system/dsl_test.js index d9d2b1e822e..c6b480e2a3e 100644 --- a/packages/ember-routing/tests/system/dsl_test.js +++ b/packages/ember-routing/tests/system/dsl_test.js @@ -17,7 +17,7 @@ moduleFor( } ['@test should fail when using a reserved route name'](assert) { - let reservedNames = ['basic', 'object', 'application']; + let reservedNames = ['basic', 'application']; assert.expect(reservedNames.length);