Discource-C
/
discourse
mirror of https://github.com/discourse/discourse.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

DEV: Remove `OK` pretender helper (#22438) 

We already have the `response` helper (which additionally sets the `Content-Type` header)

(also: all-caps name suggested a constant, not a function)
This commit is contained in:
Jarek Radosz 2023-07-06 20:39:23 +02:00 committed by GitHub
parent b8cf50798b
commit dc46acb851
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 25 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

56
plugins/chat/test/javascripts/acceptance/user-status-on-mentions-test.js
View File

@ -7,7 +7,7 @@ import {
} from "discourse/tests/helpers/qunit-helpers";
import { skip } from "qunit";
import { click, triggerEvent, visit, waitFor } from "@ember/test-helpers";
import pretender, { OK } from "discourse/tests/helpers/create-pretender";
import pretender, { response } from "discourse/tests/helpers/create-pretender";
acceptance("Chat | User status on mentions", function (needs) {
const channelId = 1;
@ -74,24 +74,38 @@ acceptance("Chat | User status on mentions", function (needs) {
});
needs.hooks.beforeEach(function () {
pretender.post(`/chat/1`, () => OK());
pretender.put(`/chat/1/edit/${messageId}`, () => OK());
pretender.post(`/chat/drafts`, () => OK());
pretender.put(`/chat/api/channels/1/read/1`, () => OK());
pretender.delete(`/chat/api/channels/1/messages/${messageId}`, () => OK());
pretender.post(`/chat/1`, () => response({}));
pretender.put(`/chat/1/edit/${messageId}`, () => response({}));
pretender.post(`/chat/drafts`, () => response({}));
pretender.put(`/chat/api/channels/1/read/1`, () => response({}));
pretender.delete(`/chat/api/channels/1/messages/${messageId}`, () =>
response({})
);
pretender.put(`/chat/api/channels/1/messages/${messageId}/restore`, () =>
OK()
response({})
);
pretender.get(`/chat/api/channels/1`, () =>
OK({
response({
channel,
chat_messages: [message],
meta: { can_delete_self: true },
})
);
setupAutocompleteResponses([mentionedUser2, mentionedUser3]);
pretender.get("/u/search/users", () =>
response({
users: [mentionedUser2, mentionedUser3],
})
);
pretender.get("/chat/api/mentions/groups.json", () =>
response({
unreachable: [],
over_members_limit: [],
invalid: ["and"],
})
);
});
skip("just posted messages | it shows status on mentions ", async function (assert) {
@ -355,30 +369,6 @@ acceptance("Chat | User status on mentions", function (needs) {
await click(".chat-composer-button.-send");
}
function setupAutocompleteResponses(results) {
pretender.get("/u/search/users", () => {
return [
200,
{},
{
users: results,
},
];
});
pretender.get("/chat/api/mentions/groups.json", () => {
return [
200,
{},
{
unreachable: [],
over_members_limit: [],
invalid: ["and"],
},
];
});
}
function statusSelector(username) {
return `.mention[href='/u/${username}'] .user-status-message img`;
}

4
plugins/chat/test/javascripts/components/chat-channel-test.js
View File

@ -3,7 +3,7 @@ import hbs from "htmlbars-inline-precompile";
import fabricators from "discourse/plugins/chat/discourse/lib/fabricators";
import { render, triggerEvent, waitFor } from "@ember/test-helpers";
import { module, test } from "qunit";
import pretender, { OK } from "discourse/tests/helpers/create-pretender";
import pretender, { response } from "discourse/tests/helpers/create-pretender";
import { publishToMessageBus } from "discourse/tests/helpers/qunit-helpers";
module(
@ -53,7 +53,7 @@ module(
hooks.beforeEach(function () {
pretender.get(`/chat/api/channels/1`, () =>
OK({
response({
channel,
chat_messages: [message],
meta: { can_delete_self: true },