Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We鈥檒l occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[CLEANUP] Allow routes to be named "array" and "object" #16877

Merged
merged 2 commits into from Aug 13, 2018
Merged

[CLEANUP] Allow routes to be named "array" and "object" #16877

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f099d63
Allow routes to be named "array"
camerondubas Aug 11, 2018
65d66c8
Allow routes to be named "object"
camerondubas Aug 12, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion packages/ember-routing/lib/system/dsl.js
View file
Open in desktop
Expand Up @@ -26,7 +26,7 @@ class DSL {
return true;
}

return ['array', 'basic', 'object', 'application'].indexOf(name) === -1;
return ['basic', 'object', 'application'].indexOf(name) === -1;
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can you also remove object? It was essentially the same boat as array and should die too...

})()
);

Expand Down
2 changes: 1 addition & 1 deletion packages/ember-routing/tests/system/dsl_test.js
View file
Open in desktop
Expand Up @@ -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);

Expand Down