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’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[BUGFIX release] Ember.inject.controller() works for all Controller types. #10612

Merged
merged 1 commit into from
Mar 12, 2015
Merged

[BUGFIX release] Ember.inject.controller() works for all Controller types. #10612

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion packages/ember-runtime/lib/controllers/controller.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ var Controller = EmberObject.extend(Mixin);

function controllerInjectionHelper(factory) {
Ember.assert("Defining an injected controller property on a " +
"non-controller is not allowed.", Controller.detect(factory));
"non-controller is not allowed.", Mixin.detect(factory.PrototypeMixin));
}

/**
Expand Down
37 changes: 37 additions & 0 deletions packages/ember-runtime/tests/controllers/controller_test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
import Controller from "ember-runtime/controllers/controller";
import Service from "ember-runtime/system/service";
import ObjectController from "ember-runtime/controllers/object_controller";
import ArrayController from "ember-runtime/controllers/array_controller";
import {
objectControllerDeprecation
} from "ember-runtime/controllers/object_controller";
Expand Down Expand Up @@ -222,6 +223,42 @@ QUnit.test("controllers can be injected into controllers", function() {
equal(postsController, postController.get('postsController'), "controller.posts is injected");
});

QUnit.test("controllers can be injected into ObjectControllers", function() {
var registry = new Registry();
var container = registry.container();

registry.register('controller:post', Controller.extend({
postsController: inject.controller('posts')
}));

registry.register('controller:posts', ObjectController.extend());

var postController = container.lookup('controller:post');
var postsController;
expectDeprecation(function() {
postsController = container.lookup('controller:posts');
}, objectControllerDeprecation);

equal(postsController, postController.get('postsController'), "controller.posts is injected");
});

QUnit.test("controllers can be injected into ArrayControllers", function() {
var registry = new Registry();
var container = registry.container();

registry.register('controller:post', Controller.extend({
postsController: inject.controller('posts')
}));

registry.register('controller:posts', ArrayController.extend());

var postController = container.lookup('controller:post');
var postsController = container.lookup('controller:posts');

equal(postsController, postController.get('postsController'), "controller.posts is injected");
});


QUnit.test("services can be injected into controllers", function() {
var registry = new Registry();
var container = registry.container();
Expand Down