diff options
| author | Matthew Draper <matthew@trebex.net> | 2016-10-02 12:58:58 +1030 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-10-02 12:58:58 +1030 |
| commit | 832b02620b1331212a53186023688c8e84a4ca03 (patch) | |
| tree | 6938e6490090062ad7c2f14f3b4c44bb4f815ad2 /actioncable/test/subscription_adapter/evented_redis_test.rb | |
| parent | 9ce2d1b1a43fc4ef3db59849b7412d30583a4074 (diff) | |
| parent | 7c812c24018989f0f76d00c6e6b4833f942b92c5 (diff) | |
| download | rails-832b02620b1331212a53186023688c8e84a4ca03.tar.gz rails-832b02620b1331212a53186023688c8e84a4ca03.tar.bz2 rails-832b02620b1331212a53186023688c8e84a4ca03.zip | |
Merge pull request #26682 from matthewd/cable-tests
Use websocket-client-simple instead of Faye in tests
Diffstat (limited to 'actioncable/test/subscription_adapter/evented_redis_test.rb')
| -rw-r--r-- | actioncable/test/subscription_adapter/evented_redis_test.rb | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/actioncable/test/subscription_adapter/evented_redis_test.rb b/actioncable/test/subscription_adapter/evented_redis_test.rb index d6ca0e77cb..f316bc46ef 100644 --- a/actioncable/test/subscription_adapter/evented_redis_test.rb +++ b/actioncable/test/subscription_adapter/evented_redis_test.rb @@ -12,6 +12,14 @@ class EventedRedisAdapterTest < ActionCable::TestCase end def teardown + super + + # Ensure EM is shut down before we re-enable warnings + EventMachine.reactor_thread.tap do |thread| + EventMachine.stop + thread.join + end + $VERBOSE = @previous_verbose end |