Test against Rails master

Author: Rafael Mendonça França

.travis.yml

@@ -1,9 +1,10 @@
 rvm:
   - 1.9.3
   - 2.0.0
-  - 2.1.0
+  - 2.1.1
 
 gemfile:
+  - Gemfile
   - test/gemfiles/Gemfile.rails-3.0.x
   - test/gemfiles/Gemfile.rails-3.1.x
   - test/gemfiles/Gemfile.rails-3.2.x

Gemfile

@@ -2,5 +2,5 @@ source 'https://rubygems.org'
 gemspec
 
 # Roll w/ branch until 4.0 is cut
-gem 'actionpack', :github => 'rails/rails', branch: '4-0-stable'
-gem 'railties', :github => 'rails/rails', branch: '4-0-stable'
+gem 'actionpack', :github => 'rails/rails', branch: 'master'
+gem 'railties', :github => 'rails/rails', branch: 'master'

Rakefile

@@ -4,6 +4,8 @@ require 'bundler/gem_tasks'
 
 task :default => :test
 
-task :test do
-  exec "testrb test/test_*.rb"
+Rake::TestTask.new(:test) do |t|
+  t.libs << 'lib'
+  t.pattern = 'test/test_*.rb'
+  t.verbose = true
 end

test/test_helper.rb

@@ -1,10 +1,12 @@
-require 'test/unit'
+require 'minitest/autorun'
 
 require 'action_view'
 require 'sprockets'
 require 'sprockets/rails/helper'
 
-class HelperTest < Test::Unit::TestCase
+Minitest::Test = MiniTest::Unit::TestCase unless defined?(Minitest::Test)
+
+class HelperTest < Minitest::Test
   FIXTURES_PATH = File.expand_path("../fixtures", __FILE__)
 
   # class ActionView::Base
@@ -388,27 +390,27 @@ def test_asset_not_precompiled_error
     @view.assets_environment = @assets
     @view.debug_assets       = true
 
-    assert_raise(Sprockets::Rails::Helper::AssetFilteredError) do
+    assert_raises(Sprockets::Rails::Helper::AssetFilteredError) do
       @view.asset_path("foo.js")
     end
 
-    assert_raise(Sprockets::Rails::Helper::AssetFilteredError) do
+    assert_raises(Sprockets::Rails::Helper::AssetFilteredError) do
       @view.asset_url("foo.js")
     end
 
-    assert_raise(Sprockets::Rails::Helper::AssetFilteredError) do
+    assert_raises(Sprockets::Rails::Helper::AssetFilteredError) do
       @view.javascript_include_tag("foo.js")
     end
 
-    assert_raise(Sprockets::Rails::Helper::AssetFilteredError) do
+    assert_raises(Sprockets::Rails::Helper::AssetFilteredError) do
       @view.javascript_include_tag("foo")
     end
 
-    error = assert_raise(Sprockets::Rails::Helper::AssetFilteredError) do
+    error = assert_raises(Sprockets::Rails::Helper::AssetFilteredError) do
       @view.javascript_include_tag(:foo)
     end
 
-    assert_raise(Sprockets::Rails::Helper::AssetFilteredError) do
+    assert_raises(Sprockets::Rails::Helper::AssetFilteredError) do
       @view.stylesheet_link_tag("foo.js")
     end
 
@@ -440,7 +442,7 @@ def test_dependency_error
     Sprockets::Rails::Helper.precompile           = [ lambda {|logical_path| true } ]
     @view.assets_environment                      = @assets
 
-    assert_raise Sprockets::Rails::Helper::DependencyError do
+    assert_raises Sprockets::Rails::Helper::DependencyError do
       @view.asset_path("error/dependency.js")
     end
 

test/test_railtie.rb

@@ -1,8 +1,10 @@
-require 'test/unit'
+require 'minitest/autorun'
 require 'active_support'
 require 'active_support/testing/isolation'
 
-class TestBoot < Test::Unit::TestCase
+Minitest::Test = MiniTest::Unit::TestCase unless defined?(Minitest::Test)
+
+class TestBoot < Minitest::Test
   include ActiveSupport::Testing::Isolation
 
   ROOT = File.expand_path("../../tmp/app", __FILE__)

test/test_task.rb

@@ -1,10 +1,12 @@
-require 'test/unit'
+require 'minitest/autorun'
 require 'tmpdir'
 
 require 'sprockets'
 require 'sprockets/rails/task'
 
-class TestTask < Test::Unit::TestCase
+Minitest::Test = MiniTest::Unit::TestCase unless defined?(Minitest::Test)
+
+class TestTask < Minitest::Test
   FIXTURES_PATH = File.expand_path("../fixtures", __FILE__)
 
   def setup