diff options
| author | Rafael França <rafaelmfranca@gmail.com> | 2018-03-19 17:47:23 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-03-19 17:47:23 -0400 |
| commit | 9d9f752661c31b3063d55bec14e797c957d2bb7d (patch) | |
| tree | c6ce9a6aabe6654af03384bd8de7b4a1b71ef3b1 /activejob/test | |
| parent | 538463bce782e58ea72d130315cc510dab50777d (diff) | |
| parent | 6ef720791d6532a107f4777edfe1d708b6b9c068 (diff) | |
| download | rails-9d9f752661c31b3063d55bec14e797c957d2bb7d.tar.gz rails-9d9f752661c31b3063d55bec14e797c957d2bb7d.tar.bz2 rails-9d9f752661c31b3063d55bec14e797c957d2bb7d.zip | |
Merge pull request #32300 from albertoalmagro/albertoalmagro/remove-outdated-todo
ActiveJob: Remove support for Qu gem.
Diffstat (limited to 'activejob/test')
| -rw-r--r-- | activejob/test/adapters/qu.rb | 5 | ||||
| -rw-r--r-- | activejob/test/integration/queuing_test.rb | 2 | ||||
| -rw-r--r-- | activejob/test/support/integration/adapters/qu.rb | 40 |
3 files changed, 1 insertions, 46 deletions
diff --git a/activejob/test/adapters/qu.rb b/activejob/test/adapters/qu.rb deleted file mode 100644 index 5b471fa347..0000000000 --- a/activejob/test/adapters/qu.rb +++ /dev/null @@ -1,5 +0,0 @@ -# frozen_string_literal: true - -require "qu-immediate" - -ActiveJob::Base.queue_adapter = :qu diff --git a/activejob/test/integration/queuing_test.rb b/activejob/test/integration/queuing_test.rb index 7a95d3d039..32afb5ca62 100644 --- a/activejob/test/integration/queuing_test.rb +++ b/activejob/test/integration/queuing_test.rb @@ -82,7 +82,7 @@ class QueuingTest < ActiveSupport::TestCase end test "should supply a provider_job_id when available for immediate jobs" do - skip unless adapter_is?(:async, :delayed_job, :sidekiq, :qu, :que, :queue_classic) + skip unless adapter_is?(:async, :delayed_job, :sidekiq, :que, :queue_classic) test_job = TestJob.perform_later @id assert test_job.provider_job_id, "Provider job id should be set by provider" end diff --git a/activejob/test/support/integration/adapters/qu.rb b/activejob/test/support/integration/adapters/qu.rb deleted file mode 100644 index 67db03e279..0000000000 --- a/activejob/test/support/integration/adapters/qu.rb +++ /dev/null @@ -1,40 +0,0 @@ -# frozen_string_literal: true - -module QuJobsManager - def setup - require "qu-rails" - require "qu-redis" - ActiveJob::Base.queue_adapter = :qu - ENV["REDISTOGO_URL"] = "redis://127.0.0.1:6379/12" - backend = Qu::Backend::Redis.new - backend.namespace = "active_jobs_int_test" - Qu.backend = backend - Qu.logger = Rails.logger - Qu.interval = 0.5 - unless can_run? - puts "Cannot run integration tests for qu. To be able to run integration tests for qu you need to install and start redis.\n" - exit - end - end - - def clear_jobs - Qu.clear "integration_tests" - end - - def start_workers - @thread = Thread.new { Qu::Worker.new("integration_tests").start } - end - - def stop_workers - @thread.kill - end - - def can_run? - begin - Qu.backend.connection.client.connect - rescue - return false - end - true - end -end |