aboutsummaryrefslogtreecommitdiffstats
path: root/actioncable
diff options
context:
space:
mode:
authorMatthew Draper <matthew@trebex.net>2016-10-04 06:40:38 +1030
committerMatthew Draper <matthew@trebex.net>2016-10-04 06:40:38 +1030
commit39fb3069f8eee6f72a4288dd71e3c4a1ec6d7f8a (patch)
treea4ac4bc9f03c5db2e06dcff7324b0d3708490cdb /actioncable
parent60cc5064756c3d804596a1498a1d5196321342af (diff)
downloadrails-39fb3069f8eee6f72a4288dd71e3c4a1ec6d7f8a.tar.gz
rails-39fb3069f8eee6f72a4288dd71e3c4a1ec6d7f8a.tar.bz2
rails-39fb3069f8eee6f72a4288dd71e3c4a1ec6d7f8a.zip
Don't shut down adapters that haven't been set
We hit when we skip the PostgreSQL adapter.
Diffstat (limited to 'actioncable')
-rw-r--r--actioncable/test/subscription_adapter/common.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/actioncable/test/subscription_adapter/common.rb b/actioncable/test/subscription_adapter/common.rb
index 8cf0b5c684..3aa88c2caa 100644
--- a/actioncable/test/subscription_adapter/common.rb
+++ b/actioncable/test/subscription_adapter/common.rb
@@ -20,7 +20,7 @@ module CommonSubscriptionAdapterTest
end
def teardown
- [@rx_adapter, @tx_adapter].uniq.each(&:shutdown)
+ [@rx_adapter, @tx_adapter].uniq.compact.each(&:shutdown)
end
def subscribe_as_queue(channel, adapter = @rx_adapter)