From b09d6b9601058a4b09b291304c0144db3a183307 Mon Sep 17 00:00:00 2001
From: Takuya Sugimoto <tsugimoto@aiming-inc.com>
Date: Fri, 24 Jan 2020 18:54:34 +0900
Subject: [PATCH 1/4] Test Rails 6

---
 Appraisals | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/Appraisals b/Appraisals
index 4bb41b2..a3b8a3b 100644
--- a/Appraisals
+++ b/Appraisals
@@ -9,3 +9,7 @@ end
 appraise "5.2" do
   gem "rails", "5.2.rc2"
 end
+
+appraise "6.0" do
+  gem "rails", "~> 6.0.0"
+end

From 8aabd2cd7d1f10707c722db43224a6d973016c74 Mon Sep 17 00:00:00 2001
From: Takuya Sugimoto <tsugimoto@aiming-inc.com>
Date: Fri, 24 Jan 2020 18:58:08 +0900
Subject: [PATCH 2/4] Move Approval::Mixins into lib/

---
 lib/approval/engine.rb                          | 1 +
 {app/models/concerns => lib}/approval/mixins.rb | 0
 2 files changed, 1 insertion(+)
 rename {app/models/concerns => lib}/approval/mixins.rb (100%)

diff --git a/lib/approval/engine.rb b/lib/approval/engine.rb
index 04e8f57..03c9365 100644
--- a/lib/approval/engine.rb
+++ b/lib/approval/engine.rb
@@ -1,4 +1,5 @@
 require "rails"
+require "approval/mixins"
 
 module Approval
   class Engine < ::Rails::Engine
diff --git a/app/models/concerns/approval/mixins.rb b/lib/approval/mixins.rb
similarity index 100%
rename from app/models/concerns/approval/mixins.rb
rename to lib/approval/mixins.rb

From e8c7f2b419546e6e87740cc6a510422f88845239 Mon Sep 17 00:00:00 2001
From: Takuya Sugimoto <tsugimoto@aiming-inc.com>
Date: Fri, 24 Jan 2020 19:04:59 +0900
Subject: [PATCH 3/4] Add gemfile for 6.0

---
 gemfiles/6.0.gemfile | 22 ++++++++++++++++++++++
 1 file changed, 22 insertions(+)
 create mode 100644 gemfiles/6.0.gemfile

diff --git a/gemfiles/6.0.gemfile b/gemfiles/6.0.gemfile
new file mode 100644
index 0000000..ddccdc4
--- /dev/null
+++ b/gemfiles/6.0.gemfile
@@ -0,0 +1,22 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "appraisal"
+gem "rails", "~> 6.0.0"
+
+group :development, :test do
+  gem "sqlite3", platform: :mri
+end
+
+group :development do
+  gem "onkcop", require: false
+end
+
+group :test do
+  gem "factory_bot_rails"
+  gem "rspec-rails"
+  gem "shoulda-matchers"
+end
+
+gemspec path: "../"

From c2ab4aa52e4487943fb58d2d6d4e0121d5f70d8f Mon Sep 17 00:00:00 2001
From: Takuya Sugimoto <tsugimoto@aiming-inc.com>
Date: Fri, 24 Jan 2020 19:06:08 +0900
Subject: [PATCH 4/4] Upgrade Travis

---
 .travis.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.travis.yml b/.travis.yml
index f08d570..f6c1b66 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -6,6 +6,7 @@ gemfile:
   - gemfiles/5.0.gemfile
   - gemfiles/5.1.gemfile
   - gemfiles/5.2.gemfile
+  - gemfiles/6.0.gemfile
 rvm:
   - 2.3.8
   - 2.4.7