From e088ca41588fd798473a6c542be8905a6354db0c Mon Sep 17 00:00:00 2001
From: "yuuji.yaginuma" <yuuji.yaginuma@gmail.com>
Date: Fri, 15 Mar 2019 11:56:46 +0900
Subject: [PATCH 1/2] Test against Rails 6.0

---
 .travis.yml | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index c2baf1a..decac29 100644
--- 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:

From c42dae96ecec80982dce7fc989d77056bd5f071b Mon Sep 17 00:00:00 2001
From: "yuuji.yaginuma" <yuuji.yaginuma@gmail.com>
Date: Fri, 15 Mar 2019 12:14:02 +0900
Subject: [PATCH 2/2] Make test adapter cancel operation work with Rails 6

---
 lib/active_job/cancel/queue_adapters/test_adapter.rb          | 4 ++--
 .../queue_adapters/test_adapter/{rails_5.rb => rails.rb}      | 0
 2 files changed, 2 insertions(+), 2 deletions(-)
 rename lib/active_job/cancel/queue_adapters/test_adapter/{rails_5.rb => rails.rb} (100%)

diff --git a/lib/active_job/cancel/queue_adapters/test_adapter.rb b/lib/active_job/cancel/queue_adapters/test_adapter.rb
index eca8464..4803eed 100644
--- 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/lib/active_job/cancel/queue_adapters/test_adapter/rails_5.rb b/lib/active_job/cancel/queue_adapters/test_adapter/rails.rb
similarity index 100%
rename from lib/active_job/cancel/queue_adapters/test_adapter/rails_5.rb
rename to lib/active_job/cancel/queue_adapters/test_adapter/rails.rb