CI updates and fixes (#47)

More info: 
- markets/maily@510515f
- travis-ci/travis-ci#8717

.travis.yml

@@ -3,23 +3,31 @@ cache: bundler
 sudo: false
 rvm:
   - ruby-head
-  - 2.5.1
-  - 2.4.4
-  - 2.3.6
-  - 2.2.9
+  - 2.6.2
+  - 2.5.5
+  - 2.4.5
+  - 2.3.8
+  - 2.2.10
 gemfile:
   - gemfiles/rails_5.2.gemfile
   - gemfiles/rails_5.1.gemfile
   - gemfiles/rails_5.0.gemfile
   - gemfiles/rails_4.2.gemfile
   - gemfiles/rails_3.2.gemfile
+before_install:
+  # Rails 4.x requires Bundler version < 2.0.
+  - "find /home/travis/.rvm/rubies -wholename '*default/bundler-*.gemspec' -delete"
+  - rvm @global do gem uninstall bundler -a -x
+  - rvm @global do yes | gem install bundler -v '< 2'
 matrix:
   exclude:
     - rvm: ruby-head
       gemfile: gemfiles/rails_3.2.gemfile
-    - rvm: 2.5.1
+    - rvm: 2.6.2
       gemfile: gemfiles/rails_3.2.gemfile
-    - rvm: 2.4.4
+    - rvm: 2.5.5
+      gemfile: gemfiles/rails_3.2.gemfile
+    - rvm: 2.4.5
       gemfile: gemfiles/rails_3.2.gemfile
   allow_failures:
     - rvm: ruby-head

Appraisals

@@ -11,7 +11,7 @@ appraise "rails-5.0" do
 end
 
 appraise "rails-4.2" do
-  gem "rails", github: 'rails/rails', branch: '4-2-stable'
+  gem "rails", "~> 4.2.0"
 end
 
 appraise "rails-3.2" do

README.md

@@ -171,19 +171,18 @@ If you intend to use I18n with `invisible_captcha`, you _must not_ set `sentence
 If you're encountering unexpected behaviour while testing controllers that use the `invisible_captcha` action filter, you may want to disable timestamp check for the test environment:
 
 ```ruby
-# test/test_helper.rb, spec/rails_helper.rb…
+# test/test_helper.rb, spec/rails_helper.rb, ...
 InvisibleCaptcha.timestamp_enabled = false
-
 ```
 
 Another option is to wait for the timestamp check to be valid:
 
 ```ruby
-# Maybe in a before block.
+# Maybe in a before block
 InvisibleCaptcha.init!
 InvisibleCaptcha.timestamp_threshold = 1
 
-# Before testing your controller action.
+# Before testing your controller action
 sleep InvisibleCaptcha.timestamp_threshold
 ```
 

gemfiles/rails_3.2.gemfile

@@ -4,4 +4,4 @@ source "https://rubygems.org"
 
 gem "rails", "~> 3.2.0"
 
-gemspec :path => "../"
+gemspec path: "../"

gemfiles/rails_4.2.gemfile

@@ -2,6 +2,6 @@
 
 source "https://rubygems.org"
 
-gem "rails", :github => "rails/rails", :branch => "4-2-stable"
+gem "rails", "~> 4.2.0"
 
-gemspec :path => "../"
+gemspec path: "../"

gemfiles/rails_5.0.gemfile

@@ -4,4 +4,4 @@ source "https://rubygems.org"
 
 gem "rails", "~> 5.0.0"
 
-gemspec :path => "../"
+gemspec path: "../"

gemfiles/rails_5.1.gemfile

@@ -4,4 +4,4 @@ source "https://rubygems.org"
 
 gem "rails", "~> 5.1.0"
 
-gemspec :path => "../"
+gemspec path: "../"

gemfiles/rails_5.2.gemfile

@@ -4,4 +4,4 @@ source "https://rubygems.org"
 
 gem "rails", "~> 5.2.0"
 
-gemspec :path => "../"
+gemspec path: "../"

spec/spec_helper.rb

@@ -1,12 +1,27 @@
 ENV['RAILS_ENV'] = 'test'
+
 require File.expand_path("../dummy/config/environment.rb", __FILE__)
 require 'rspec/rails'
 require 'invisible_captcha'
 
 RSpec.configure do |config|
-  config.order = 'random'
+  config.order = :random
   config.expect_with :rspec
   config.mock_with :rspec do |mocks|
     mocks.verify_partial_doubles = true
   end
 end
+
+# Rails 4.2 call `initialize` inside `recycle!`. However Ruby 2.6 doesn't allow calling `initialize` twice.
+# More info: https://github.com/rails/rails/issues/34790
+if RUBY_VERSION >= "2.6.0" && 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