Merge 574b6d3 into e00a54b

.travis.yml

@@ -1,18 +1,26 @@
 language: ruby
+sudo: false
 rvm:
- - 1.9.3
- - 2.0.0
- - 2.1.2
+  - 2.0.0
+  - 2.1.8
+  - 2.2.4
+  - 2.3.0
 before_install:
   - gem update bundler
 gemfile:
  - gemfiles/rails_3_2.gemfile
- - gemfiles/rails_3_2_stable.gemfile
  - gemfiles/rails_4_0.gemfile
- - gemfiles/rails_4_0_stable.gemfile
  - gemfiles/rails_4_1.gemfile
- - gemfiles/rails_4_1_stable.gemfile
+ - gemfiles/rails_4_2.gemfile
+ - gemfiles/rails_5_0.gemfile
  - gemfiles/rails_master.gemfile
-branches:
-  only:
-    - master
+matrix:
+  exclude:
+  - rvm: 2.0.0
+    gemfile: gemfiles/rails_5_0.gemfile
+  - rvm: 2.0.0
+    gemfile: gemfiles/rails_master.gemfile
+  - rvm: 2.1.8
+    gemfile: gemfiles/rails_5_0.gemfile
+  - rvm: 2.1.8
+    gemfile: gemfiles/rails_master.gemfile

Appraisals

@@ -1,7 +1,9 @@
 appraise 'rails_3_2' do
-  version = '~> 3.2'
+  version = '~> 3.2.0'
   gem 'actionpack', version
   gem 'activesupport', version
+  gem 'minitest', '~> 4.7.5'
+  gem 'test-unit', '~> 3.0'
 end
 
 appraise 'rails_4_0' do
@@ -16,23 +18,25 @@ appraise 'rails_4_1' do
   gem 'activesupport', version
 end
 
-appraise 'rails_master' do
-  gem 'actionview', github: 'rails/rails', branch: 'master'
-  gem 'actionpack', github: 'rails/rails', branch: 'master'
-  gem 'activesupport', github: 'rails/rails', branch: 'master'
-end
-
-appraise 'rails_3_2_stable' do
-  gem 'actionpack', github: 'rails/rails', branch: '3-2-stable'
-  gem 'activesupport', github: 'rails/rails', branch: '3-2-stable'
+appraise 'rails_4_2' do
+  version = '~> 4.2.0'
+  gem 'actionview', version
+  gem 'actionpack', version
+  gem 'activesupport', version
+  gem 'rails-dom-testing'
 end
 
-appraise 'rails_4_0_stable' do
-  gem 'actionpack', github: 'rails/rails', branch: '4-0-stable'
-  gem 'activesupport', github: 'rails/rails', branch: '4-0-stable'
+appraise 'rails_5_0' do
+  version = '~> 5.0.0.beta'
+  gem 'actionview', version
+  gem 'actionpack', version
+  gem 'activesupport', version
+  gem 'rails-dom-testing'
 end
 
-appraise 'rails_4_1_stable' do
-  gem 'actionpack', github: 'rails/rails', branch: '4-1-stable'
-  gem 'activesupport', github: 'rails/rails', branch: '4-1-stable'
+appraise 'rails_master' do
+  gem 'actionview', github: 'rails/rails', branch: 'master'
+  gem 'actionpack', github: 'rails/rails', branch: 'master'
+  gem 'activesupport', github: 'rails/rails', branch: 'master'
+  gem 'rails-dom-testing'
 end

gemfiles/rails_3_2.gemfile

@@ -2,10 +2,12 @@
 
 source "https://rubygems.org"
 
-gem "coveralls", :require=>false
+gem "coveralls", :require => false
 gem "pry"
-gem "appraisal", :github=>"thoughtbot/appraisal"
-gem "actionpack", "~> 3.2"
-gem "activesupport", "~> 3.2"
+gem "appraisal", :github => "thoughtbot/appraisal"
+gem "actionpack", "~> 3.2.0"
+gem "activesupport", "~> 3.2.0"
+gem "minitest", "~> 4.7.5"
+gem "test-unit", "~> 3.0"
 
-gemspec :path=>".././"
+gemspec :path => "../"

gemfiles/rails_4_0.gemfile

@@ -2,10 +2,10 @@
 
 source "https://rubygems.org"
 
-gem "coveralls", :require=>false
+gem "coveralls", :require => false
 gem "pry"
-gem "appraisal", :github=>"thoughtbot/appraisal"
+gem "appraisal", :github => "thoughtbot/appraisal"
 gem "actionpack", "~> 4.0.0"
 gem "activesupport", "~> 4.0.0"
 
-gemspec :path=>".././"
+gemspec :path => "../"

gemfiles/rails_4_1.gemfile

@@ -2,10 +2,10 @@
 
 source "https://rubygems.org"
 
-gem "coveralls", :require=>false
+gem "coveralls", :require => false
 gem "pry"
-gem "appraisal", :github=>"thoughtbot/appraisal"
+gem "appraisal", :github => "thoughtbot/appraisal"
 gem "actionpack", "~> 4.1.0"
 gem "activesupport", "~> 4.1.0"
 
-gemspec :path=>".././"
+gemspec :path => "../"

gemfiles/rails_4_2.gemfile

@@ -0,0 +1,13 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "coveralls", :require => false
+gem "pry"
+gem "appraisal", :github => "thoughtbot/appraisal"
+gem "actionview", "~> 4.2.0"
+gem "actionpack", "~> 4.2.0"
+gem "activesupport", "~> 4.2.0"
+gem "rails-dom-testing"
+
+gemspec :path => "../"

gemfiles/rails_5_0.gemfile

@@ -0,0 +1,13 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "coveralls", :require => false
+gem "pry"
+gem "appraisal", :github => "thoughtbot/appraisal"
+gem "actionview", "~> 5.0.0.beta"
+gem "actionpack", "~> 5.0.0.beta"
+gem "activesupport", "~> 5.0.0.beta"
+gem "rails-dom-testing"
+
+gemspec :path => "../"

gemfiles/rails_master.gemfile

@@ -2,11 +2,12 @@
 
 source "https://rubygems.org"
 
-gem "coveralls", :require=>false
+gem "coveralls", :require => false
 gem "pry"
-gem "appraisal", :github=>"thoughtbot/appraisal"
-gem "actionview", :github=>"rails/rails", :branch=>"master"
-gem "actionpack", :github=>"rails/rails", :branch=>"master"
-gem "activesupport", :github=>"rails/rails", :branch=>"master"
+gem "appraisal", :github => "thoughtbot/appraisal"
+gem "actionview", :github => "rails/rails", :branch => "master"
+gem "actionpack", :github => "rails/rails", :branch => "master"
+gem "activesupport", :github => "rails/rails", :branch => "master"
+gem "rails-dom-testing"
 
-gemspec :path=>".././"
+gemspec :path => "../"

test/test_actionview-link_to_blank.rb

@@ -11,6 +11,7 @@
 require 'action_view'
 require 'action_view/link_to_blank/link_to_blank'
 require 'action_dispatch'
+require 'rails-dom-testing' if Gem::Version.new(ActiveSupport::VERSION::STRING) >= Gem::Version.new("4.2")
 
 # Copy from actionpack/test/abstract_unit.rb
 module RenderERBUtils
@@ -54,7 +55,11 @@ class TestActionViewLinkToBlank < MiniTest::Test
   include ActionView::Helpers::UrlHelper
   include routes.url_helpers
 
-  include ActionDispatch::Assertions::DomAssertions
+  dom_assertion = Gem::Version.new(ActiveSupport::VERSION::STRING) < Gem::Version.new("4.2")\
+  ? ActionDispatch::Assertions::DomAssertions
+  : Rails::Dom::Testing::Assertions::DomAssertions
+
+  include dom_assertion
   include ActiveSupport::Testing::Deprecation
   include ActionView::Context
   include RenderERBUtils