From 46845cd01d926fe6465280e46036a362655cda77 Mon Sep 17 00:00:00 2001
From: Yuji Hanamura <yuji.developer@gmail.com>
Date: Sat, 26 Jun 2021 16:42:59 +0900
Subject: [PATCH] Test against for Rails 6.0

Use sqlite >= 1.4 with Rails 6.0
Use dynamoid >= 3.3 with Rails 6.0
---
 .travis.yml                   |  3 +++
 Appraisals                    | 17 +++++++++++++++++
 Gemfile                       |  4 ++--
 gemfiles/rails_6.0.gemfile    | 14 ++++++++++++++
 spec/spec_helpers/dynamoid.rb |  6 +++++-
 test/minitest_helper.rb       |  6 +++++-
 6 files changed, 46 insertions(+), 4 deletions(-)
 create mode 100644 gemfiles/rails_6.0.gemfile

diff --git a/.travis.yml b/.travis.yml
index 68d7097..3038370 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -33,6 +33,7 @@ gemfile:
 #  - gemfiles/rails_5.0_nobrainer.gemfile
   - gemfiles/rails_5.1.gemfile
   - gemfiles/rails_5.2.gemfile
+  - gemfiles/rails_6.0.gemfile
 
 before_script:
   - mkdir /tmp/dynamodb
@@ -70,6 +71,8 @@ matrix:
       gemfile: gemfiles/rails_5.1.gemfile
     - rvm: jruby-9.1.12.0
       gemfile: gemfiles/rails_5.2.gemfile
+    - rvm: jruby-9.1.12.0
+      gemfile: gemfiles/rails_6.0.gemfile
 #    - rvm: jruby-9.1.12.0
 #      gemfile: gemfiles/rails_4.2_nobrainer.gemfile
 #    - rvm: jruby-9.1.12.0
diff --git a/Appraisals b/Appraisals
index 21965c6..df1ce8a 100644
--- a/Appraisals
+++ b/Appraisals
@@ -1,6 +1,7 @@
 appraise 'rails_4.2' do
   gem 'nokogiri', '1.6.8.1', platforms: %i[ruby_19]
   gem 'mime-types', '~> 2', platforms: %i[ruby_19 jruby]
+  gem 'sqlite3', '~> 1.3.5', platforms: :ruby
   gem 'rails', '4.2.5'
   gem 'mongoid', '~> 4.0'
   gem 'sequel'
@@ -12,11 +13,13 @@ appraise 'rails_4.2' do
 end
 
 appraise 'rails_4.2_nobrainer' do
+  gem 'sqlite3', '~> 1.3.5', platforms: :ruby
   gem 'rails', '4.2.5'
   gem 'nobrainer', '~> 0.33.0'
 end
 
 appraise 'rails_4.2_mongoid_5' do
+  gem 'sqlite3', '~> 1.3.5', platforms: :ruby
   gem 'mime-types', '~> 2', platforms: %i[ruby_19 jruby]
   gem 'rails', '4.2.5'
   gem 'mongoid', '~> 5.0'
@@ -25,6 +28,7 @@ appraise 'rails_4.2_mongoid_5' do
 end
 
 appraise 'rails_5.0' do
+  gem 'sqlite3', '~> 1.3.5', platforms: :ruby
   gem 'rails', '5.0.0'
   gem 'mongoid', '~> 6.0'
   gem 'sequel'
@@ -35,11 +39,13 @@ appraise 'rails_5.0' do
 end
 
 appraise 'rails_5.0_nobrainer' do
+  gem 'sqlite3', '~> 1.3.5', platforms: :ruby
   gem 'rails', '5.0.0'
   gem 'nobrainer', '~> 0.33.0'
 end
 
 appraise 'rails_5.1' do
+  gem 'sqlite3', '~> 1.3.5', platforms: :ruby
   gem 'rails', '5.1'
   gem 'mongoid', '~>6.0'
   gem 'sequel'
@@ -50,6 +56,7 @@ appraise 'rails_5.1' do
 end
 
 appraise 'rails_5.2' do
+  gem 'sqlite3', '~> 1.3.5', platforms: :ruby
   gem 'rails', '5.2'
   gem 'mongoid', '~>6.0'
   gem 'sequel'
@@ -59,6 +66,16 @@ appraise 'rails_5.2' do
   gem "after_commit_everywhere", "~> 1.0"
 end
 
+appraise 'rails_6.0' do
+  gem 'rails', '6.0'
+  gem 'mongoid', '~>7.0', '>= 7.0.5'
+  gem 'sequel'
+  gem 'dynamoid', '~>3.3', platforms: :ruby
+  gem 'aws-sdk-dynamodb', '~> 1'
+  gem 'redis-objects'
+  gem "after_commit_everywhere", "~> 1.0"
+end
+
 appraise 'norails' do
   gem 'sqlite3', '~> 1.3', '>= 1.3.5', platforms: :ruby
   gem 'rails', install_if: false
diff --git a/Gemfile b/Gemfile
index 139ea80..64f58c5 100644
--- a/Gemfile
+++ b/Gemfile
@@ -2,6 +2,6 @@ source "https://rubygems.org"
 
 gemspec
 
-gem 'sqlite3', '~> 1.3.5', :platforms => :ruby
-gem 'rails', '5.1.4'
+gem 'sqlite3', '~> 1.4', :platforms => :ruby
+gem 'rails', '~> 6.0.3', '>= 6.0.3.4'
 gem 'after_commit_everywhere', '~> 1.0'
diff --git a/gemfiles/rails_6.0.gemfile b/gemfiles/rails_6.0.gemfile
new file mode 100644
index 0000000..3aef058
--- /dev/null
+++ b/gemfiles/rails_6.0.gemfile
@@ -0,0 +1,14 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "sqlite3", "~> 1.4", platforms: :ruby
+gem "rails", "6.0"
+gem "after_commit_everywhere", "~> 1.0"
+gem "mongoid", "~>7.0", ">= 7.0.5"
+gem "sequel"
+gem "dynamoid", "~>3.3", platforms: :ruby
+gem "aws-sdk-dynamodb", "~> 1"
+gem "redis-objects"
+
+gemspec path: "../"
diff --git a/spec/spec_helpers/dynamoid.rb b/spec/spec_helpers/dynamoid.rb
index 000bf38..9173b69 100644
--- a/spec/spec_helpers/dynamoid.rb
+++ b/spec/spec_helpers/dynamoid.rb
@@ -2,8 +2,12 @@
 
 begin
   require 'dynamoid'
-  require 'aws-sdk-resources'
   puts "dynamoid #{Dynamoid::VERSION} gem found, running Dynamoid specs \e[32m#{'✔'}\e[0m"
+  if Gem::Version.new(Dynamoid::VERSION) >= Gem::Version.new('3.0.0')
+    require 'aws-sdk-dynamodb'
+  else
+    require 'aws-sdk-resources'
+  end
 
   ENV['ACCESS_KEY'] ||= 'abcd'
   ENV['SECRET_KEY'] ||= '1234'
diff --git a/test/minitest_helper.rb b/test/minitest_helper.rb
index 88f45aa..28f18b2 100644
--- a/test/minitest_helper.rb
+++ b/test/minitest_helper.rb
@@ -23,7 +23,11 @@ end
 # Dynamoid initialization
 begin
   require 'dynamoid'
-  require 'aws-sdk-resources'
+  if Gem::Version.new(Dynamoid::VERSION) >= Gem::Version.new('3.0.0')
+    require 'aws-sdk-dynamodb'
+  else
+    require 'aws-sdk-resources'
+  end
 
   ENV['ACCESS_KEY'] ||= 'abcd'
   ENV['SECRET_KEY'] ||= '1234'