DEV: Stop overriding an injected property in topic controller test (#17450)
Similar to e15c6302
, overriding an auto-injected value like this triggers errors in more recent versions of Ember. Instead, we can use the registry to inject the value we need.
Co-authored-by: Peter Wagenet <peter.wagenet@gmail.com>
This commit is contained in:
parent
0c269dfd18
commit
be29197f62
|
@ -26,7 +26,6 @@ discourseModule("Unit | Controller | topic", function (hooks) {
|
||||||
topic.setProperties({
|
topic.setProperties({
|
||||||
selectedPostIds: [],
|
selectedPostIds: [],
|
||||||
selectedPostUsername: null,
|
selectedPostUsername: null,
|
||||||
currentUser: null,
|
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
|
|
||||||
|
@ -279,7 +278,6 @@ discourseModule("Unit | Controller | topic", function (hooks) {
|
||||||
});
|
});
|
||||||
const controller = this.getController("topic", {
|
const controller = this.getController("topic", {
|
||||||
model,
|
model,
|
||||||
currentUser,
|
|
||||||
});
|
});
|
||||||
const selectedPostIds = controller.get("selectedPostIds");
|
const selectedPostIds = controller.get("selectedPostIds");
|
||||||
|
|
||||||
|
@ -376,10 +374,8 @@ discourseModule("Unit | Controller | topic", function (hooks) {
|
||||||
],
|
],
|
||||||
stream: [1, 2],
|
stream: [1, 2],
|
||||||
});
|
});
|
||||||
model.set("currentUser", { admin: false });
|
|
||||||
const controller = this.getController("topic", {
|
const controller = this.getController("topic", {
|
||||||
model,
|
model,
|
||||||
currentUser,
|
|
||||||
});
|
});
|
||||||
const selectedPostIds = controller.get("selectedPostIds");
|
const selectedPostIds = controller.get("selectedPostIds");
|
||||||
|
|
||||||
|
@ -421,10 +417,8 @@ discourseModule("Unit | Controller | topic", function (hooks) {
|
||||||
],
|
],
|
||||||
stream: [1, 2],
|
stream: [1, 2],
|
||||||
});
|
});
|
||||||
model.set("currentUser", { moderator: false });
|
|
||||||
const controller = this.getController("topic", {
|
const controller = this.getController("topic", {
|
||||||
model,
|
model,
|
||||||
currentUser,
|
|
||||||
siteSettings: {
|
siteSettings: {
|
||||||
moderators_change_post_ownership: true,
|
moderators_change_post_ownership: true,
|
||||||
},
|
},
|
||||||
|
@ -679,11 +673,16 @@ discourseModule("Unit | Controller | topic", function (hooks) {
|
||||||
});
|
});
|
||||||
|
|
||||||
const currentUser = EmberObject.create({ moderator: true });
|
const currentUser = EmberObject.create({ moderator: true });
|
||||||
|
this.registry.register("current-user:main", currentUser, {
|
||||||
|
instantiate: false,
|
||||||
|
});
|
||||||
|
this.registry.injection("controller", "currentUser", "current-user:main");
|
||||||
|
|
||||||
let model = topicWithStream({
|
let model = topicWithStream({
|
||||||
stream: [2, 3, 4],
|
stream: [2, 3, 4],
|
||||||
posts: [post, { id: 3 }, { id: 4 }],
|
posts: [post, { id: 3 }, { id: 4 }],
|
||||||
});
|
});
|
||||||
const controller = this.getController("topic", { model, currentUser });
|
const controller = this.getController("topic", { model });
|
||||||
|
|
||||||
const done = assert.async();
|
const done = assert.async();
|
||||||
controller.send("deletePost", post);
|
controller.send("deletePost", post);
|
||||||
|
|
Loading…
Reference in New Issue