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.

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

Already on GitHub? Sign in to your account

Remove this.resource from RouterDSL #15883

Merged
merged 1 commit into from
Jan 1, 2018
Merged

Conversation

locks
Copy link
Contributor

@locks locks commented Nov 29, 2017

No description provided.

@locks locks mentioned this pull request Nov 29, 2017
34 tasks
@rwjblue
Copy link
Member

rwjblue commented Nov 29, 2017

Since this is exposed as Ember.RouterDSL I believe we can definitely move the implementation directly into the legacy addon. Just need to make an issue on ember-2-legacy for this one, and cross link back here.

@@ -18,7 +18,6 @@ QUnit.module('Ember Router DSL', {
});

QUnit.test('should fail when using a reserved route name', function() {
expectDeprecation('this.resource() is deprecated. Use this.route(\'name\', { resetNamespace: true }, function () {}) instead.');
let reservedNames = ['array', 'basic', 'object', 'application'];

expect((reservedNames.length * 2) + 1);
Copy link
Member

Choose a reason for hiding this comment

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

Need to tweak this somewhat, the CI failure is due to it thinking it has 9 assertions and only actually getting 5

@rwjblue
Copy link
Member

rwjblue commented Jan 1, 2018

@locks - Needs a rebase...

@locks locks force-pushed the remove-router-dsl-resource branch from 51e3967 to 587c3fc Compare January 1, 2018 18:01
@locks
Copy link
Contributor Author

locks commented Jan 1, 2018

@rwjblue rebased

@locks locks force-pushed the remove-router-dsl-resource branch from 587c3fc to f791428 Compare January 1, 2018 18:24
@locks locks force-pushed the remove-router-dsl-resource branch from f791428 to 7f97511 Compare January 1, 2018 18:53
@rwjblue rwjblue merged commit 8a5c9ad into master Jan 1, 2018
@rwjblue rwjblue deleted the remove-router-dsl-resource branch February 16, 2018 15:04
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants