Merge pull request #15 from Data-Liberation-Front/ruby-2.6

Support Ruby 2.6

Author: Floppy

.github/workflows/push.yml

@@ -5,7 +5,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        ruby-version: ['2.4', '2.5']
+        ruby-version: ['2.4', '2.5', '2.6']
       fail-fast: false
     steps:
       - uses: actions/checkout@v2
@@ -30,7 +30,7 @@ jobs:
         with:
           bundler:  1.17.3
           bundler-cache: true
-          ruby-version: 2.5
+          ruby-version: 2.6
       - name: Install dependencies
         run: bundle install
       - name: Run the tests

.ruby-version

@@ -1 +1 @@
-2.5.8
+2.6.9

resumable_upload.gemspec

@@ -13,7 +13,7 @@ Gem::Specification.new do |s|
   s.summary = "A Resumable.js Rails Engine"
   s.description = "A Resumable.js Rails Engine"
 
-  s.required_ruby_version = ["~> 2.4", "< 2.6"]
+  s.required_ruby_version = [">= 2.4", "< 2.7"]
 
   s.files = Dir["{app,config,db,lib}/**/*", "MIT-LICENSE", "Rakefile", "README.rdoc"]
   s.test_files = Dir["test/**/*"]

spec/controllers/chunks_controller_spec.rb

@@ -1,4 +1,3 @@
-require "spec_helper"
 require "rails_helper"
 
 describe ResumableUpload::ChunksController, type: :controller do

spec/rails_helper.rb

@@ -21,7 +21,7 @@
 # directory. Alternatively, in the individual `*_spec.rb` files, manually
 # require only the support files necessary.
 #
-# Dir[Rails.root.join('spec/support/**/*.rb')].each { |f| require f }
+Dir[File.join(File.dirname(__FILE__), "support", "**", "*.rb")].sort.each { |f| require f }
 
 # Checks for pending migrations before tests are run.
 # If you are not using ActiveRecord, you can remove this line.

spec/support/patch_rails_42_action_controller_test_response.rb

@@ -0,0 +1,13 @@
+if RUBY_VERSION >= "2.6.0"
+  if Rails.version < "5"
+    module ActionController
+      class TestResponse < ActionDispatch::TestResponse
+        def recycle!
+          @mon_mutex_owner_object_id = nil
+          @mon_mutex = nil
+          initialize
+        end
+      end
+    end
+  end
+end