diff options
| author | Cristian Bica <cristian.bica@gmail.com> | 2015-03-05 23:41:14 +0200 |
|---|---|---|
| committer | Cristian Bica <cristian.bica@gmail.com> | 2015-03-05 23:57:57 +0200 |
| commit | cb786219f4cf5f14b9eb8302fb54f3f9c16168cb (patch) | |
| tree | 44914fefd4788a922be1ef6d157d827a7780e9f5 /activejob/test/support | |
| parent | 798a14a6388ac525109e550d72bba0b1118e5e2e (diff) | |
| download | rails-cb786219f4cf5f14b9eb8302fb54f3f9c16168cb.tar.gz rails-cb786219f4cf5f14b9eb8302fb54f3f9c16168cb.tar.bz2 rails-cb786219f4cf5f14b9eb8302fb54f3f9c16168cb.zip | |
Fixed ActiveJob integration tests
Diffstat (limited to 'activejob/test/support')
| -rw-r--r-- | activejob/test/support/integration/adapters/qu.rb | 2 | ||||
| -rw-r--r-- | activejob/test/support/integration/adapters/queue_classic.rb | 4 |
2 files changed, 4 insertions, 2 deletions
diff --git a/activejob/test/support/integration/adapters/qu.rb b/activejob/test/support/integration/adapters/qu.rb index 3a5b66a057..256ddb3cf3 100644 --- a/activejob/test/support/integration/adapters/qu.rb +++ b/activejob/test/support/integration/adapters/qu.rb @@ -3,7 +3,7 @@ module QuJobsManager require 'qu-rails' require 'qu-redis' ActiveJob::Base.queue_adapter = :qu - ENV['REDISTOGO_URL'] = "tcp://127.0.0.1:6379/12" + ENV['REDISTOGO_URL'] = "redis://127.0.0.1:6379/12" backend = Qu::Backend::Redis.new backend.namespace = "active_jobs_int_test" Qu.backend = backend diff --git a/activejob/test/support/integration/adapters/queue_classic.rb b/activejob/test/support/integration/adapters/queue_classic.rb index 038473ccdc..f522b2711f 100644 --- a/activejob/test/support/integration/adapters/queue_classic.rb +++ b/activejob/test/support/integration/adapters/queue_classic.rb @@ -1,6 +1,7 @@ module QueueClassicJobsManager def setup ENV['QC_DATABASE_URL'] ||= 'postgres:///active_jobs_qc_int_test' + ENV['QC_RAILS_DATABASE'] = 'false' ENV['QC_LISTEN_TIME'] = "0.5" uri = URI.parse(ENV['QC_DATABASE_URL']) user = uri.user||ENV['USER'] @@ -20,7 +21,8 @@ module QueueClassicJobsManager end def start_workers - QC::Conn.disconnect + QC.default_conn_adapter.disconnect + QC.default_conn_adapter = nil @pid = fork do worker = QC::Worker.new(q_name: 'integration_tests') worker.start |