Merge c42dae9 into 59b09e6

y-yagi · Mar 15, 2019 · 0154ecc · 0154ecc
2 parents 59b09e6 + c42dae9
commit 0154ecc
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 8 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -4,23 +4,25 @@ rvm:
   - 2.3.7
   - 2.4.4
   - 2.5.1
+  - 2.6.2
 
 gemfile:
   - gemfiles/active_job_42.gemfile
   - gemfiles/active_job_50.gemfile
   - gemfiles/active_job_51.gemfile
   - gemfiles/active_job_52.gemfile
-  - gemfiles/active_job_master.gemfile
 
 before_install: gem install bundler || gem install bundler -v 1.17.3
 
 matrix:
-  allow_failures:
-    - gemfile: gemfiles/active_job_master.gemfile
-  exclude:
-    - rvm: 2.2.10
+  include:
+    - rvm: 2.5.1
+      gemfile: gemfiles/active_job_60.gemfile
+    - rvm: 2.6.2
+      gemfile: gemfiles/active_job_60.gemfile
+    - rvm: 2.5.1
       gemfile: gemfiles/active_job_master.gemfile
-    - rvm: 2.3.7
+    - rvm: 2.6.2
       gemfile: gemfiles/active_job_master.gemfile
 
 services:

diff --git a/lib/active_job/cancel/queue_adapters/test_adapter.rb b/lib/active_job/cancel/queue_adapters/test_adapter.rb
@@ -7,8 +7,8 @@ module QueueAdapters
     # on a persisted id to fulfill the canceling of any given job id.
     class TestAdapter
       def initialize
-        if Gem::Requirement.new('~> 5.0').satisfied_by? ActiveJob.version
-          require 'active_job/cancel/queue_adapters/test_adapter/rails_5'
+        if Gem::Requirement.new('>= 5.0').satisfied_by? ActiveJob.version
+          require 'active_job/cancel/queue_adapters/test_adapter/rails'
         elsif Gem::Requirement.new('~> 4.2').satisfied_by? ActiveJob.version
           require 'active_job/cancel/queue_adapters/test_adapter/rails_4'
         end

diff --git a/...el/queue_adapters/test_adapter/rails_5.rb → ...ncel/queue_adapters/test_adapter/rails.rb b/...el/queue_adapters/test_adapter/rails_5.rb → ...ncel/queue_adapters/test_adapter/rails.rb