github-mirror/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-05-23 19:54:14 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

update message bus for .stop() support, stop the message bus during test

Browse Source
This commit is contained in:
Sam
2013-11-25 18:01:03 +11:00
parent 95c968d7b7
commit 2eee7433f0
2 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
Gemfile_rails4.lock
View File

@ -55,7 +55,7 @@ GIT
GIT GIT
remote: https://github.com/SamSaffron/message_bus remote: https://github.com/SamSaffron/message_bus
revision: 6cdab8a4e0d06203cbdb146b52159e710b891a82 revision: c37c06d4c2db730971e6eb547da316611b3100ae
specs: specs:
message_bus (0.9.2) message_bus (0.9.2)
eventmachine eventmachine
@ -337,7 +337,7 @@ GEM
msgpack (>= 0.4.3) msgpack (>= 0.4.3)
trollop (>= 1.16.2) trollop (>= 1.16.2)
redcarpet (3.0.0) redcarpet (3.0.0)
redis (3.0.5) redis (3.0.6)
redis-actionpack (4.0.0) redis-actionpack (4.0.0)
actionpack (~> 4) actionpack (~> 4)
redis-rack (~> 1.5.0) redis-rack (~> 1.5.0)
@ -428,10 +428,10 @@ GEM
therubyracer (0.12.0) therubyracer (0.12.0)
libv8 (~> 3.16.14.0) libv8 (~> 3.16.14.0)
ref ref
thin (1.6.0) thin (1.6.1)
daemons (>= 1.0.9) daemons (>= 1.0.9)
eventmachine (>= 1.0.0) eventmachine (>= 1.0.0)
rack (>= 1.5.0) rack (>= 1.0.0)
thor (0.18.1) thor (0.18.1)
thread_safe (0.1.3) thread_safe (0.1.3)
atomic atomic

3
test/javascripts/test_helper.js
View File

@ -93,6 +93,9 @@ $.ajax = function() {
return oldAjax.apply(this, arguments); return oldAjax.apply(this, arguments);
}; };
// Stop the message bus so we don't get ajax calls
Discourse.MessageBus.stop();
// Trick JSHint into allow document.write // Trick JSHint into allow document.write
var d = document; var d = document;
d.write('<div id="ember-testing-container"><div id="ember-testing"></div></div>'); d.write('<div id="ember-testing-container"><div id="ember-testing"></div></div>');