diff --git a/Gemfile_rails4.lock b/Gemfile_rails4.lock index ae6d9c178..341f0fb52 100644 --- a/Gemfile_rails4.lock +++ b/Gemfile_rails4.lock @@ -55,7 +55,7 @@ GIT GIT remote: https://github.com/SamSaffron/message_bus - revision: 6cdab8a4e0d06203cbdb146b52159e710b891a82 + revision: c37c06d4c2db730971e6eb547da316611b3100ae specs: message_bus (0.9.2) eventmachine @@ -337,7 +337,7 @@ GEM msgpack (>= 0.4.3) trollop (>= 1.16.2) redcarpet (3.0.0) - redis (3.0.5) + redis (3.0.6) redis-actionpack (4.0.0) actionpack (~> 4) redis-rack (~> 1.5.0) @@ -428,10 +428,10 @@ GEM therubyracer (0.12.0) libv8 (~> 3.16.14.0) ref - thin (1.6.0) + thin (1.6.1) daemons (>= 1.0.9) eventmachine (>= 1.0.0) - rack (>= 1.5.0) + rack (>= 1.0.0) thor (0.18.1) thread_safe (0.1.3) atomic diff --git a/test/javascripts/test_helper.js b/test/javascripts/test_helper.js index 7498b6705..4fd945004 100644 --- a/test/javascripts/test_helper.js +++ b/test/javascripts/test_helper.js @@ -93,6 +93,9 @@ $.ajax = function() { 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 var d = document; d.write('
');