diff options
| author | Kasper Timm Hansen <kaspth@gmail.com> | 2017-05-28 15:06:34 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-05-28 15:06:34 +0200 |
| commit | 01eac87aeedab8c6da6aa72bb2ca3449bf5950ce (patch) | |
| tree | aa2983c3a6e23a62b6e6930587405c2b5a285fb3 | |
| parent | 85211ea1efd5c249ef53182a0e5e09a56d6f9dd8 (diff) | |
| parent | 82e646f3d032dccfaf083ef969ce691bd6f49ce5 (diff) | |
| download | rails-01eac87aeedab8c6da6aa72bb2ca3449bf5950ce.tar.gz rails-01eac87aeedab8c6da6aa72bb2ca3449bf5950ce.tar.bz2 rails-01eac87aeedab8c6da6aa72bb2ca3449bf5950ce.zip | |
Merge pull request #29255 from y-yagi/bring_back_delayed_job_to_integration_test
Bring back delayed_job to test list
| -rw-r--r-- | Gemfile.lock | 8 | ||||
| -rw-r--r-- | activejob/Rakefile | 3 |
2 files changed, 5 insertions, 6 deletions
diff --git a/Gemfile.lock b/Gemfile.lock index 22418fa5e6..15b7aeb639 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -148,10 +148,10 @@ GEM daemons (1.2.4) dalli (2.7.6) dante (0.2.0) - delayed_job (4.1.2) - activesupport (>= 3.0, < 5.1) - delayed_job_active_record (4.1.1) - activerecord (>= 3.0, < 5.1) + delayed_job (4.1.3) + activesupport (>= 3.0, < 5.2) + delayed_job_active_record (4.1.2) + activerecord (>= 3.0, < 5.2) delayed_job (>= 3.0, < 5) em-hiredis (0.3.1) eventmachine (~> 1.0) diff --git a/activejob/Rakefile b/activejob/Rakefile index 43e284d090..dd03ab0b8f 100644 --- a/activejob/Rakefile +++ b/activejob/Rakefile @@ -1,8 +1,7 @@ require "rake/testtask" #TODO: add qu back to the list after it support Rails 5.1 -#TODO: add delayed_job back to the list after it support Rails 5.1 -ACTIVEJOB_ADAPTERS = %w(async inline que queue_classic resque sidekiq sneakers sucker_punch backburner test) +ACTIVEJOB_ADAPTERS = %w(async inline delayed_job que queue_classic resque sidekiq sneakers sucker_punch backburner test) ACTIVEJOB_ADAPTERS.delete("queue_classic") if defined?(JRUBY_VERSION) task default: :test |