Merge pull request #16877 from camerondubas/fix/allow-array-route

[CLEANUP] Allow routes to be named "array" and "object"
emberjs · Aug 13, 2018 · ca4d13c · ca4d13c
2 parents 47aa3e4 + 65d66c8
commit ca4d13c
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git 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', 'application'].indexOf(name) === -1;
       })()
     );
 

diff --git 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', 'application'];
 
       assert.expect(reservedNames.length);