github-mirror/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2024-11-23 14:49:07 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

DEV: Stop overriding an injected property in topic controller test (#17450)

Browse Source 
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:
David Taylor 2022-07-12 17:29:11 +01:00 committed by GitHub
parent 0c269dfd18
commit be29197f62
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
app/assets/javascripts/discourse/tests/unit/controllers/topic-test.js
View File

@ -26,7 +26,6 @@ discourseModule("Unit | Controller | topic", function (hooks) {
topic.setProperties({
selectedPostIds: [],
selectedPostUsername: null,
currentUser: null,
});
});
@ -279,7 +278,6 @@ discourseModule("Unit | Controller | topic", function (hooks) {
});
const controller = this.getController("topic", {
model,
currentUser,
});
const selectedPostIds = controller.get("selectedPostIds");
@ -376,10 +374,8 @@ discourseModule("Unit | Controller | topic", function (hooks) {
],
stream: [1, 2],
});
model.set("currentUser", { admin: false });
const controller = this.getController("topic", {
model,
currentUser,
});
const selectedPostIds = controller.get("selectedPostIds");
@ -421,10 +417,8 @@ discourseModule("Unit | Controller | topic", function (hooks) {
],
stream: [1, 2],
});
model.set("currentUser", { moderator: false });
const controller = this.getController("topic", {
model,
currentUser,
siteSettings: {
moderators_change_post_ownership: true,
},
@ -679,11 +673,16 @@ discourseModule("Unit | Controller | topic", function (hooks) {
});
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({
stream: [2, 3, 4],
posts: [post, { id: 3 }, { id: 4 }],
});
const controller = this.getController("topic", { model, currentUser });
const controller = this.getController("topic", { model });
const done = assert.async();
controller.send("deletePost", post);