diff options
| author | David Heinemeier Hansson <david@loudthinking.com> | 2016-01-16 15:42:20 +0100 |
|---|---|---|
| committer | David Heinemeier Hansson <david@loudthinking.com> | 2016-01-16 15:42:20 +0100 |
| commit | 01c320001bcce617196270f3d398d48a89a6ea2a (patch) | |
| tree | 18ca55a61b9bd0bd73bcad2f8f0dbc61dfc79f69 /actioncable/test/test_helper.rb | |
| parent | f5065ef60c011a0d84224e74e1e8a0b882c36223 (diff) | |
| download | rails-01c320001bcce617196270f3d398d48a89a6ea2a.tar.gz rails-01c320001bcce617196270f3d398d48a89a6ea2a.tar.bz2 rails-01c320001bcce617196270f3d398d48a89a6ea2a.zip | |
Revert "Merge pull request #22977 from rails/revert-22934-master"
This reverts commit d0393fccffc118a5de37654aa222774b66123393, reversing
changes made to 3b7ccadfc1c8dfec61af898167e1300b17f5cf25.
Diffstat (limited to 'actioncable/test/test_helper.rb')
| -rw-r--r-- | actioncable/test/test_helper.rb | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/actioncable/test/test_helper.rb b/actioncable/test/test_helper.rb index 12dcd98402..325305939f 100644 --- a/actioncable/test/test_helper.rb +++ b/actioncable/test/test_helper.rb @@ -14,11 +14,6 @@ require 'rack/mock' # Require all the stubs and models Dir[File.dirname(__FILE__) + '/stubs/*.rb'].each {|file| require file } -$CELLULOID_DEBUG = false -$CELLULOID_TEST = false -require 'celluloid' -Celluloid.logger = Logger.new(StringIO.new) - require 'faye/websocket' class << Faye::WebSocket remove_method :ensure_reactor_running |