Support Rails 6.1

.travis.yml

@@ -1,18 +1,31 @@
 language: ruby
 sudo: false
 env:
-  - "RAILS_VERSION=4.2.6"
-  - "RAILS_VERSION=5.0.0"
-  - "RAILS_VERSION=master"
+  - "RAILS_VERSION=4.2.11"
+  - "RAILS_VERSION=5.0.7.2"
+  - "RAILS_VERSION=5.1.7"
+  - "RAILS_VERSION=5.2.3"
+  - "RAILS_VERSION=6.0.0"
+  - "RAILS_VERSION=6.1.0"
 rvm:
-  - 2.1
-  - 2.2.4
-  - 2.3.0
+  - 2.3.8
+  - 2.4.7
+  - 2.5.6
+  - 2.6.4
 matrix:
-  exclude:
-    - rvm: 2.0
-      env: "RAILS_VERSION=5.0.0"
-    - rvm: 2.1
-      env: "RAILS_VERSION=5.0.0"
   allow_failures:
     - env: "RAILS_VERSION=master"
+    - env: "RAILS_VERSION=6.0.0.beta1"
+  exclude:
+    - rvm: 2.6.4
+      env: "RAILS_VERSION=4.2.11"
+    - rvm: 2.3.8
+      env: "RAILS_VERSION=6.0.0"
+    - rvm: 2.4.7
+      env: "RAILS_VERSION=6.0.0"
+    - rvm: 2.3.8
+      env: "RAILS_VERSION=6.1.0"
+    - rvm: 2.4.7
+      env: "RAILS_VERSION=6.1.0"
+before_install:
+  - gem install bundler --version 1.17.3

lib/jsonapi/resource_controller_metal.rb

@@ -5,10 +5,10 @@ class ResourceControllerMetal < ActionController::Metal
       ActionController::Rendering,
       ActionController::Renderers::All,
       ActionController::StrongParameters,
-      ActionController::ForceSSL,
+      Gem::Requirement.new('< 6.1').satisfied_by?(ActionPack.gem_version) ? ActionController::ForceSSL : nil,
       ActionController::Instrumentation,
       JSONAPI::ActsAsResourceController
-    ].freeze
+    ].compact.freeze
 
     MODULES.each do |mod|
       include mod

test/fixtures/active_record.rb

@@ -342,7 +342,7 @@ class Post < ActiveRecord::Base
   belongs_to :writer, class_name: 'Person', foreign_key: 'author_id'
   has_many :comments
   has_and_belongs_to_many :tags, join_table: :posts_tags
-  has_many :special_post_tags, source: :tag
+  has_many :special_post_tags
   has_many :special_tags, through: :special_post_tags, source: :tag
   belongs_to :section
   has_one :parent_post, class_name: 'Post', foreign_key: 'parent_post_id'

test/unit/resource/resource_test.rb

@@ -13,7 +13,7 @@ class PostWithBadAfterSave < ActiveRecord::Base
   after_save :do_some_after_save_stuff
 
   def do_some_after_save_stuff
-    errors[:base] << 'Boom! Error added in after_save callback.'
+    errors.add(:base, 'Boom! Error added in after_save callback.')
     raise ActiveRecord::RecordInvalid.new(self)
   end
 end
@@ -23,7 +23,7 @@ class PostWithCustomValidationContext < ActiveRecord::Base
   validate :api_specific_check, on: :json_api_create
 
   def api_specific_check
-    errors[:base] << 'Record is invalid'
+    errors.add(:base, 'Record is invalid')
   end
 end