github-mirror/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-05-30 15:28:37 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Revert "DEV: Import MessageBus from message-bus-client instead of globals"

Browse Source 
This reverts commit 9dddbcc00dd1b1f582f31eed756f672e8a56f9f5.
This commit is contained in:
Blake Erickson
2020-05-27 16:14:09 -06:00
parent 6548cd1a96
commit b10e995d9d
9 changed files with 12 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
test/javascripts/acceptance/topic-discovery-test.js
View File

@ -1,6 +1,4 @@
import { acceptance } from "helpers/qunit-helpers";
import MessageBus from "message-bus-client";
acceptance("Topic Discovery", {
settings: {
show_pinned_excerpt_desktop: true
@ -87,7 +85,7 @@ QUnit.test("Live update unread state", async assert => {
);
// Mimic a messagebus message
MessageBus.callbacks.filterBy("channel", "/latest").map(c =>
window.MessageBus.callbacks.filterBy("channel", "/latest").map(c =>
c.func({
message_type: "read",
topic_id: 11995,

8
test/javascripts/test_helper.js
View File

@ -17,7 +17,7 @@
// Stuff we need to load first
//= require vendor
//= require discourse-shims
//= require ember-shim
//= require pretty-text-bundle
//= require markdown-it-bundle
//= require application
@ -55,10 +55,8 @@ sinon.config = {
window.inTestEnv = true;
let MessageBus = require("message-bus-client").default;
// Stop the message bus so we don't get ajax calls
MessageBus.stop();
window.MessageBus.stop();
// Trick JSHint into allow document.write
var d = document;
@ -193,7 +191,7 @@ QUnit.testDone(function() {
window.Discourse.__container__
);
MessageBus.unsubscribe("*");
window.MessageBus.unsubscribe("*");
delete window.server;
window.Mousetrap.reset();
});