Run CI against Rails 6 (#129)

brianswko · valscion · lgebhardt · commit 2851a77d315c · 2020-02-08T11:48:09.000-05:00
* Run CI against Rails 6

* Use ruby 2.5

* Dummy app updates for rails 6

* Run all but Rails 4.2 tests with Ruby 2.5

* Add empty asset manifest to appease Rails

Co-authored-by: Vesa Laakso &lt;482561+valscion@users.noreply.github.com&gt;
diff --git a/.travis.yml b/.travis.yml
@@ -2,17 +2,28 @@ language: ruby
 branches:
   only:
     - master
-rvm:
-  - 2.3
-gemfile:
-  - gemfiles/rails_4_2_pundit_1.gemfile
-  - gemfiles/rails_5_0_pundit_1.gemfile
-  - gemfiles/rails_5_1_pundit_1.gemfile
-  - gemfiles/rails_5_2_pundit_1.gemfile
-  - gemfiles/rails_4_2_pundit_2.gemfile
-  - gemfiles/rails_5_0_pundit_2.gemfile
-  - gemfiles/rails_5_1_pundit_2.gemfile
-  - gemfiles/rails_5_2_pundit_2.gemfile
+jobs:
+  include:
+  - rvm: 2.3
+    gemfile: gemfiles/rails_4_2_pundit_1.gemfile
+  - rvm: 2.3
+    gemfile: gemfiles/rails_4_2_pundit_2.gemfile
+  - rvm: 2.5
+    gemfile: gemfiles/rails_5_0_pundit_1.gemfile
+  - rvm: 2.5
+    gemfile: gemfiles/rails_5_0_pundit_2.gemfile
+  - rvm: 2.5
+    gemfile: gemfiles/rails_5_1_pundit_1.gemfile
+  - rvm: 2.5
+    gemfile: gemfiles/rails_5_1_pundit_2.gemfile
+  - rvm: 2.5
+    gemfile: gemfiles/rails_5_2_pundit_1.gemfile
+  - rvm: 2.5
+    gemfile: gemfiles/rails_5_2_pundit_2.gemfile
+  - rvm: 2.5
+    gemfile: gemfiles/rails_6_0_pundit_1.gemfile
+  - rvm: 2.5
+    gemfile: gemfiles/rails_6_0_pundit_2.gemfile
 before_install:
   - gem install bundler -v '< 2'
 notifications:
diff --git a/Appraisals b/Appraisals
@@ -2,46 +2,88 @@ appraise 'rails-4-2 pundit-1' do
   gem 'rails', '4.2.0'
   gem 'jsonapi-resources', '~> 0.9.0'
   gem 'pundit', '~> 1.0'
+  group :development, :test do
+    gem 'sqlite3', '~> 1.3.13'
+  end
 end
 
 appraise 'rails-5-0 pundit-1' do
   gem 'rails', '5.0.0'
   gem 'jsonapi-resources', '~> 0.9.0'
   gem 'pundit', '~> 1.0'
+  group :development, :test do
+    gem 'sqlite3', '~> 1.3.13'
+  end
 end
 
 appraise 'rails-5-1 pundit-1' do
   gem "rails", "5.1.0"
   gem 'jsonapi-resources', '~> 0.9.0'
   gem 'pundit', '~> 1.0'
+  group :development, :test do
+    gem 'sqlite3', '~> 1.3.13'
+  end
 end
 
 appraise 'rails-5-2 pundit-1' do
   gem 'rails', '5.2.0'
   gem 'jsonapi-resources', '~> 0.9.0'
   gem 'pundit', '~> 1.0'
+  group :development, :test do
+    gem 'sqlite3', '~> 1.3.13'
+  end
+end
+
+appraise 'rails-6-0 pundit-1' do
+  gem 'rails', '~> 6.0.0'
+  gem 'jsonapi-resources', '~> 0.9.0'
+  gem 'pundit', '~> 1.0'
+  group :development, :test do
+    gem 'sqlite3', '~> 1.4.1'
+  end
 end
 
 appraise 'rails-4-2 pundit-2' do
   gem 'rails', '4.2.0'
   gem 'jsonapi-resources', '~> 0.9.0'
   gem 'pundit', '~> 2.0'
+  group :development, :test do
+    gem 'sqlite3', '~> 1.3.13'
+  end
 end
 
 appraise 'rails-5-0 pundit-2' do
   gem 'rails', '5.0.0'
   gem 'jsonapi-resources', '~> 0.9.0'
   gem 'pundit', '~> 2.0'
+  group :development, :test do
+    gem 'sqlite3', '~> 1.3.13'
+  end
 end
 
 appraise 'rails-5-1 pundit-2' do
   gem 'rails', '5.1.0'
   gem 'jsonapi-resources', '~> 0.9.0'
   gem 'pundit', '~> 2.0'
+  group :development, :test do
+    gem 'sqlite3', '~> 1.3.13'
+  end
 end
 
 appraise 'rails-5-2 pundit-2' do
   gem 'rails', '5.2.0'
   gem 'jsonapi-resources', '~> 0.9.0'
   gem 'pundit', '~> 2.0'
+  group :development, :test do
+    gem 'sqlite3', '~> 1.3.13'
+  end
+end
+
+appraise 'rails-6-0 pundit-2' do
+  gem 'rails', '~> 6.0.0'
+  gem 'jsonapi-resources', '~> 0.9.0'
+  gem 'pundit', '~> 2.0'
+  group :development, :test do
+    gem 'sqlite3', '~> 1.4.1'
+  end
 end
diff --git a/gemfiles/rails_4_2_pundit_1.gemfile b/gemfiles/rails_4_2_pundit_1.gemfile
@@ -6,4 +6,8 @@ gem "rails", "4.2.0"
 gem "jsonapi-resources", "~> 0.9.0"
 gem "pundit", "~> 1.0"
 
+group :development, :test do
+  gem "sqlite3", "~> 1.3.13"
+end
+
 gemspec path: "../"
diff --git a/gemfiles/rails_4_2_pundit_2.gemfile b/gemfiles/rails_4_2_pundit_2.gemfile
@@ -6,4 +6,8 @@ gem "rails", "4.2.0"
 gem "jsonapi-resources", "~> 0.9.0"
 gem "pundit", "~> 2.0"
 
+group :development, :test do
+  gem "sqlite3", "~> 1.3.13"
+end
+
 gemspec path: "../"
diff --git a/gemfiles/rails_5_0_pundit_1.gemfile b/gemfiles/rails_5_0_pundit_1.gemfile
@@ -6,4 +6,8 @@ gem "rails", "5.0.0"
 gem "jsonapi-resources", "~> 0.9.0"
 gem "pundit", "~> 1.0"
 
+group :development, :test do
+  gem "sqlite3", "~> 1.3.13"
+end
+
 gemspec path: "../"
diff --git a/gemfiles/rails_5_0_pundit_2.gemfile b/gemfiles/rails_5_0_pundit_2.gemfile
@@ -6,4 +6,8 @@ gem "rails", "5.0.0"
 gem "jsonapi-resources", "~> 0.9.0"
 gem "pundit", "~> 2.0"
 
+group :development, :test do
+  gem "sqlite3", "~> 1.3.13"
+end
+
 gemspec path: "../"
diff --git a/gemfiles/rails_5_1_pundit_1.gemfile b/gemfiles/rails_5_1_pundit_1.gemfile
@@ -6,4 +6,8 @@ gem "rails", "5.1.0"
 gem "jsonapi-resources", "~> 0.9.0"
 gem "pundit", "~> 1.0"
 
+group :development, :test do
+  gem "sqlite3", "~> 1.3.13"
+end
+
 gemspec path: "../"
diff --git a/gemfiles/rails_5_1_pundit_2.gemfile b/gemfiles/rails_5_1_pundit_2.gemfile
@@ -6,4 +6,8 @@ gem "rails", "5.1.0"
 gem "jsonapi-resources", "~> 0.9.0"
 gem "pundit", "~> 2.0"
 
+group :development, :test do
+  gem "sqlite3", "~> 1.3.13"
+end
+
 gemspec path: "../"
diff --git a/gemfiles/rails_5_2_pundit_1.gemfile b/gemfiles/rails_5_2_pundit_1.gemfile
@@ -6,4 +6,8 @@ gem "rails", "5.2.0"
 gem "jsonapi-resources", "~> 0.9.0"
 gem "pundit", "~> 1.0"
 
+group :development, :test do
+  gem "sqlite3", "~> 1.3.13"
+end
+
 gemspec path: "../"
diff --git a/gemfiles/rails_5_2_pundit_2.gemfile b/gemfiles/rails_5_2_pundit_2.gemfile
@@ -6,4 +6,8 @@ gem "rails", "5.2.0"
 gem "jsonapi-resources", "~> 0.9.0"
 gem "pundit", "~> 2.0"
 
+group :development, :test do
+  gem "sqlite3", "~> 1.3.13"
+end
+
 gemspec path: "../"
diff --git a/gemfiles/rails_6_0_pundit_1.gemfile b/gemfiles/rails_6_0_pundit_1.gemfile
@@ -0,0 +1,13 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "rails", "~> 6.0.0"
+gem "jsonapi-resources", "~> 0.9.0"
+gem "pundit", "~> 1.0"
+
+group :development, :test do
+  gem "sqlite3", "~> 1.4.1"
+end
+
+gemspec path: "../"
diff --git a/gemfiles/rails_6_0_pundit_2.gemfile b/gemfiles/rails_6_0_pundit_2.gemfile
@@ -0,0 +1,13 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "rails", "~> 6.0.0"
+gem "jsonapi-resources", "~> 0.9.0"
+gem "pundit", "~> 2.0"
+
+group :development, :test do
+  gem "sqlite3", "~> 1.4.1"
+end
+
+gemspec path: "../"
diff --git a/jsonapi-authorization.gemspec b/jsonapi-authorization.gemspec
@@ -31,5 +31,5 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "pry-rails"
   spec.add_development_dependency "rubocop", "~> 0.36.0"
   spec.add_development_dependency "phare", "~> 0.7.1"
-  spec.add_development_dependency "sqlite3", "~> 1.3.6"
+  spec.add_development_dependency "sqlite3", "~> 1.3"
 end
diff --git a/spec/dummy/app/assets/config/manifest.js b/spec/dummy/app/assets/config/manifest.js
diff --git a/spec/dummy/app/controllers/application_controller.rb b/spec/dummy/app/controllers/application_controller.rb
@@ -0,0 +1,2 @@
+class ApplicationController < ActionController::Base
+end
diff --git a/spec/dummy/app/controllers/articles_controller.rb b/spec/dummy/app/controllers/articles_controller.rb
@@ -1,4 +1,4 @@
-class ArticlesController < ActionController::Base
+class ArticlesController < ApplicationController
   include JSONAPI::ActsAsResourceController
   rescue_from Pundit::NotAuthorizedError, with: :user_not_authorized
 
diff --git a/spec/dummy/app/controllers/comments_controller.rb b/spec/dummy/app/controllers/comments_controller.rb
@@ -1,4 +1,4 @@
-class CommentsController < ActionController::Base
+class CommentsController < ApplicationController
   include JSONAPI::ActsAsResourceController
   rescue_from Pundit::NotAuthorizedError, with: :user_not_authorized
 
diff --git a/spec/dummy/app/controllers/tags_controller.rb b/spec/dummy/app/controllers/tags_controller.rb
@@ -1,4 +1,4 @@
-class TagsController < ActionController::Base
+class TagsController < ApplicationController
   include JSONAPI::ActsAsResourceController
   rescue_from Pundit::NotAuthorizedError, with: :user_not_authorized
 
diff --git a/spec/dummy/app/controllers/users_controller.rb b/spec/dummy/app/controllers/users_controller.rb
@@ -1,4 +1,4 @@
-class UsersController < ActionController::Base
+class UsersController < ApplicationController
   include JSONAPI::ActsAsResourceController
   rescue_from Pundit::NotAuthorizedError, with: :user_not_authorized
 
