aboutsummaryrefslogtreecommitdiffstats
path: root/actioncable/test
diff options
context:
space:
mode:
authorJeremy Daer <jeremydaer@gmail.com>2016-03-03 23:58:46 -0700
committerJeremy Daer <jeremydaer@gmail.com>2016-03-11 16:32:19 -0700
commitd448918027667bc5ac4296d6df14826193046bc8 (patch)
tree81adf0d7b5044aab2d2316585edda7d668622b23 /actioncable/test
parenteefcc78f7a7d75709bdf03d21d6b039853d06ccf (diff)
downloadrails-d448918027667bc5ac4296d6df14826193046bc8.tar.gz
rails-d448918027667bc5ac4296d6df14826193046bc8.tar.bz2
rails-d448918027667bc5ac4296d6df14826193046bc8.zip
AC: skip PG adapter tests if the db isn't available
Diffstat (limited to 'actioncable/test')
-rw-r--r--actioncable/test/subscription_adapter/postgresql_test.rb7
1 files changed, 7 insertions, 0 deletions
diff --git a/actioncable/test/subscription_adapter/postgresql_test.rb b/actioncable/test/subscription_adapter/postgresql_test.rb
index 64c632b0cd..3b4fadbb2a 100644
--- a/actioncable/test/subscription_adapter/postgresql_test.rb
+++ b/actioncable/test/subscription_adapter/postgresql_test.rb
@@ -15,8 +15,15 @@ class PostgresqlAdapterTest < ActionCable::TestCase
local_config = ARTest.config['arunit']
database_config.update local_config if local_config
end
+
ActiveRecord::Base.establish_connection database_config
+ begin
+ ActiveRecord::Base.connection
+ rescue
+ skip "Couldn't connect to PostgreSQL: #{database_config.inspect}"
+ end
+
super
end