aboutsummaryrefslogtreecommitdiffstats
path: root/test/test_helper.rb
diff options
context:
space:
mode:
authorJeremy Daer <jeremydaer@gmail.com>2015-10-16 00:32:46 -0700
committerJeremy Daer <jeremydaer@gmail.com>2015-10-16 00:32:46 -0700
commit4d6f1b0cbe814e3b62a991450ade6e9c79c966bf (patch)
tree801a3c5643020c917b0202978938e8f8ff939d3a /test/test_helper.rb
parente456d734f70de3dfb245c2d2e3ce9c7e22ebdb71 (diff)
downloadrails-4d6f1b0cbe814e3b62a991450ade6e9c79c966bf.tar.gz
rails-4d6f1b0cbe814e3b62a991450ade6e9c79c966bf.tar.bz2
rails-4d6f1b0cbe814e3b62a991450ade6e9c79c966bf.zip
Shush some low-hanging Ruby warnings
Diffstat (limited to 'test/test_helper.rb')
-rw-r--r--test/test_helper.rb8
1 files changed, 6 insertions, 2 deletions
diff --git a/test/test_helper.rb b/test/test_helper.rb
index 49fb1495f4..b9cb34f891 100644
--- a/test/test_helper.rb
+++ b/test/test_helper.rb
@@ -18,12 +18,16 @@ ActiveSupport.test_order = :sorted
# Require all the stubs and models
Dir[File.dirname(__FILE__) + '/stubs/*.rb'].each {|file| require file }
+$CELLULOID_DEBUG = false
+$CELLULOID_TEST = false
Celluloid.logger = Logger.new(StringIO.new)
-class Faye::WebSocket
+class << Faye::WebSocket
+ remove_method :ensure_reactor_running
+
# We don't want Faye to start the EM reactor in tests because it makes testing much harder.
# We want to be able to start and stop EM loop in tests to make things simpler.
- def self.ensure_reactor_running
+ def ensure_reactor_running
# no-op
end
end