rr 1.1.0.rc2 → 1.1.0.rc3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5b496e2bd3931f611b957bea7bbc3f856fb0f821
-  data.tar.gz: 91f2a185b5ba1ebba0a63c3b30c9e370ea1e8058
+  metadata.gz: 0f7ead27c1ade6086d4ecf049c31d7bb3b3a0e6a
+  data.tar.gz: 263773f5163f8d3101a83ec0bf94903d42c5414d
 SHA512:
-  metadata.gz: ee6ad3bca380cde85a6244860645540366d29fa073adcc5b42f18df740d6057f6076b6d01b8438cd3faaf8064559eeef31d61b707b8d7710c8a1ffd216266221
-  data.tar.gz: 086ecee298ab54916ec6c0b6fcf7c70d102c2354d6738958708fca6a57b09fc298771f358d0020e3dbfa13e4387674a443c509122828c4a31547cca18a200df6
+  metadata.gz: 7d4c5ac4cd5286852fc7b981b0eeb1f259a8eca3b05445e1b5ff846c3d5c702b0f5065d6af304a1e1f8b178d459f4e1bb83fd7f96f74eea1e4a75b980a083a09
+  data.tar.gz: b6a666dc686d23f427df86e1c4c9e83749eef0ab6e7faa5b5ad2d76e8c0fcdd243d341230d085bfc3c9664f4217f5853ae337c03e1d2fc0c881daa86fa2f4d7a

data/CHANGES.md

@@ -3,26 +3,27 @@
 ## 1.1.0 (UNRELEASED)
 
 * Fix a line in RR::Injections::DoubleInjection to use top-level RR constant
-  [Thibaut]
+  ([#3][i3]) [[@Thibaut][Thibaut]]
 * Fix all wildcard matches so they work within hashes and arrays. This means
   that `stub([hash_containing(:foo => 'bar')])` will match
-  `stub([{:foo => 'bar', :baz => 'qux'}])`.
+  `stub([{:foo => 'bar', :baz => 'qux'}])`. ([#4][i4])
 * RR now auto-hooks into whichever test framework you have loaded; there is no
   longer a need to `include RR::Adapters::Whatever` into your test framework. If
   you don't like the autohook and prefer the old way, simply use
   `require 'rr/without_autohook'` instead of `require 'rr'`. (There are now
-  seven adapters; see lib/rr/adapters for the full list.)
+  nine adapters; see [lib/rr/autohook.rb][autohook] for the full list.)
 * Fix Test::Unit adapters to ensure that any additional teardown is completely
   run in the event that RR's verify step produces an error. This was causing
-  weirdness when using Test::Unit alongside Rails.
+  weirdness when using Test::Unit alongside Rails. ([#2][i2])
 * Add an explicit Test::Unit / ActiveSupport adapter. As ActiveSupport::TestCase
   introduces its own setup/teardown hooks, use these when autohooking in RR.
+  ([#2][i2])
+* Add support for Minitest 5
 * Upon release, the tests are now packaged up and uploaded to S3. This is for
   Linux distros like Fedora who wrap gems in RPM packages. You can always find
-  the latest tests at: <http://s3.amazonaws.com/rubygem-rr/tests/vX.Y.Z.tar.gz>,
+  the latest tests at <http://s3.amazonaws.com/rubygem-rr/tests/vX.Y.Z.tar.gz>,
   where X.Y.Z represents a version. I have retroactively packaged the tests for
   1.0.4 and 1.0.5.
-* General cleanup and that sort of thing.
 
 ## 1.0.5 (2013-03-28)
 
@@ -30,12 +31,12 @@
   works with RSpec-1 and a new one that works with RSpec-2. Currently, saying
   `RSpec.configure {|c| c.mock_with(:rr) }` still uses RSpec-1; to use the new
   one, you say `RSpec.configure {|c| c.mock_framework = RR::Adapters::RSpec2 }`.
-  (#66, #68, #80) [njay, james2m]
+  ([#66][xi66], [#68][xi68], [#80][xi80]) [[@njay][njay], [@james2m][james2m]]
 * Fix MethodMissingInjection so that `[stub].flatten` works without throwing a
-  NoMethodError (undefined method #to_ary) error under Ruby 1.9 (#44)
+  NoMethodError (undefined method #to_ary) error under Ruby 1.9 ([#44][xi44])
 * Raise a MiniTest::Assertion error in the MiniTest adapter so that mock
   failures appear in the output as failures rather than uncaught exceptions
-  (#69) [jayferd]
+  ([#69][xi69]) [[@jayferd][jayferd]]
 * Completely remove leftover #new_instance_of method, and also remove
   mention of #new_instance_of from the README
 * Fix tests so they all work and pass again
@@ -414,3 +415,17 @@
 ## 0.1.0 (2007-07-07)
 
 * Initial Release
+
+[i2]: http://github.com/rr/rr/issues/2
+[i3]: http://github.com/rr/rr/issues/3
+[Thibaut]: http://github.com/Thibaut
+[i4]: http://github.com/rr/rr/issues/4
+[xi66]: http://github.com/btakita/rr/issues/66
+[xi68]: http://github.com/btakita/rr/issues/68
+[xi80]: http://github.com/btakita/rr/issues/80
+[njay]: http://github.com/njay
+[james2m]: http://github.com/james2m
+[xi44]: http://github.com/btakita/rr/issues/44
+[xi69]: http://github.com/btakita/rr/issues/69
+[jayferd]: http://github.com/jayferd
+[autohook]: https://github.com/rr/rr/blob/master/lib/rr/autohook.rb

data/README.md

@@ -1,23 +1,51 @@
-# RR [![Build Status](https://secure.travis-ci.org/rr/rr.png)](http://travis-ci.org/rr/rr)
+# RR [![Build Status](https://secure.travis-ci.org/rr/rr.png)](http://travis-ci.org/rr/rr) [![Code Climate GPA](https://codeclimate.com/github/rr/rr.png)](https://codeclimate.com/github/rr/rr)
 
 RR is a test double framework for Ruby that features a rich selection of double
 techniques and a terse syntax.
 
 
-## Getting started
+## Installing RR into your project
 
-Simply add the following to your Gemfile:
+For minimal setup, RR looks for an existing test framework and then hooks itself
+into it. Hence, RR works best when loaded *after* the test framework that you
+are using is loaded.
+
+If you are using Bundler, you can achieve this by specifying the dependency on
+RR with `require: false`; then, require RR directly following your test
+framework.
+
+Here's what this looks like for different kinds of projects:
+
+### Ruby project (without Bundler)
 
 ~~~ ruby
-gem 'rr', '~> 1.0.5'
+require 'your/test/framework'
+require 'rr'
 ~~~
 
-If you're on Rails, make sure to add it to the "test" group:
+### Ruby project (with Bundler)
 
 ~~~ ruby
+# Gemfile
+gem 'rr', require: false
+
+# test helper
+require 'your/test/framework'
+require 'rr'
+~~~
+
+### Rails project
+
+~~~ ruby
+# Gemfile
 group :test do
-  gem 'rr', '~> 1.0.5'
+  gem 'rr', require: false
 end
+
+# test helper
+require File.expand_path('../../config/environment', __FILE__)
+require 'your/test/framework'  # if you are using something other than MiniTest / Test::Unit
+require 'rr'
 ~~~
 
 
@@ -105,9 +133,8 @@ end
 ## Learning more
 
 1. [What is a test double?](doc/01_test_double.md)
-2. [Using RR with your test framework](doc/02_test_framework_integration.md)
-3. [Syntax between RR and other double/mock frameworks](doc/03_syntax_comparison.md)
-4. [API overview](doc/04_api_overview.md)
+2. [Syntax between RR and other double/mock frameworks](doc/02_syntax_comparison.md)
+3. [API overview](doc/03_api_overview.md)
 
 
 ## Help!

data/VERSION

@@ -1 +1 @@
-1.1.0.rc2
+1.1.0.rc3

data/lib/rr/adapters.rb

@@ -19,7 +19,7 @@ module RR
             when :TestUnit
               find_applicable_adapter(:TestUnit1, :TestUnit2ActiveSupport, :TestUnit2)
             when :MiniTest
-              find_applicable_adapter(:MiniTestActiveSupport, :MiniTest)
+              find_applicable_adapter(:MinitestActiveSupport, :Minitest, :MiniTest4ActiveSupport, :MiniTest4)
           end
 
         adapter
@@ -40,10 +40,7 @@ module RR
           (class << mod; self; end).class_eval do
             define_method(:included) do |base|
               # Note: This assumes that the thing that is including this module
-              # is the same that the adapter detected and will hook into. In
-              # most cases this will be true; in cases such as
-              # ActiveSupport::TestCase, well, either stop doing this, or
-              # require 'rr/without_autohook'.
+              # is the same that the adapter detected and will hook into.
               adapter.hook
             end
           end

data/lib/rr/autohook.rb

@@ -6,13 +6,15 @@ module RR
       :TestUnit1,
       :TestUnit2ActiveSupport,
       :TestUnit2,
-      :MiniTestActiveSupport,
-      :MiniTest
+      :MiniTest4ActiveSupport,
+      :MiniTest4,
+      :MinitestActiveSupport,
+      :Minitest
     ]
 
     def autohook
       applicable_adapters.each do |adapter|
-        #puts "Using adapter: #{adapter.name}"
+        puts "Using adapter: #{adapter.name}" if RR.debug?
         adapter.hook
       end
     end

data/lib/rr/integrations/minitest.rb

@@ -1,44 +1,26 @@
 module RR
   module Integrations
-    class MiniTest
-      module Mixin
-        def assert_received(subject, &block)
-          block.call(received(subject)).call
-        end
-      end
-
+    class Minitest < MiniTest4
       def name
-        'MiniTest'
+        'Minitest'
       end
 
       def applies?
-        defined?(::MiniTest)
+        mt_version >= 5
+      rescue NameError
+        false
       end
 
-      def hook
-        ::MiniTest::Unit::TestCase.class_eval do
-          include RR::Adapters::RRMethods
-          include Mixin
+      def test_case_class
+        ::Minitest::Test
+      end
 
-          unless instance_methods.any? { |method_name| method_name.to_sym == :setup_with_rr }
-            alias_method :setup_without_rr, :setup
-            def setup_with_rr
-              setup_without_rr
-              RR.reset
-              RR.trim_backtrace = true
-              RR.overridden_error_class = ::MiniTest::Assertion
-            end
-            alias_method :setup, :setup_with_rr
+      def assertion_error_class
+        ::Minitest::Assertion
+      end
 
-            alias_method :teardown_without_rr, :teardown
-            def teardown_with_rr
-              RR.verify
-            ensure
-              teardown_without_rr
-            end
-            alias_method :teardown, :teardown_with_rr
-          end
-        end
+      def version_constant
+        ::Minitest::VERSION
       end
     end
   end

data/lib/rr/integrations/minitest_4.rb

@@ -0,0 +1,66 @@
+module RR
+  module Integrations
+    class MiniTest4
+      module Mixin
+        def assert_received(subject, &block)
+          block.call(received(subject)).call
+        end
+      end
+
+      def name
+        'MiniTest 4'
+      end
+
+      def applies?
+        mt_version < 5
+      rescue NameError
+        false
+      end
+
+      def test_case_class
+        ::MiniTest::Unit::TestCase
+      end
+
+      def assertion_error_class
+        ::MiniTest::Assertion
+      end
+
+      def version_constant
+        ::MiniTest::Unit::VERSION
+      end
+
+      def mt_version
+        version_constant.split('.')[0].to_i
+      end
+
+      def hook
+        assertion_error_class = self.assertion_error_class
+        test_case_class.class_eval do
+          include RR::Adapters::RRMethods
+          include Mixin
+
+          unless instance_methods.any? { |method_name| method_name.to_sym == :setup_with_rr }
+            alias_method :setup_without_rr, :setup
+            define_method(:setup_with_rr) do
+              setup_without_rr
+              RR.reset
+              RR.trim_backtrace = true
+              RR.overridden_error_class = assertion_error_class
+            end
+            alias_method :setup, :setup_with_rr
+
+            alias_method :teardown_without_rr, :teardown
+            define_method(:teardown_with_rr) do
+              begin
+                RR.verify
+              ensure
+                teardown_without_rr
+              end
+            end
+            alias_method :teardown, :teardown_with_rr
+          end
+        end
+      end
+    end
+  end
+end

data/lib/rr/integrations/minitest_4_active_support.rb

@@ -0,0 +1,39 @@
+module RR
+  module Integrations
+    class MiniTest4ActiveSupport
+      def initialize
+        @mt_adapter = parent_adapter_class.new
+      end
+
+      def parent_adapter_class
+        MiniTest4
+      end
+
+      def name
+        'MiniTest 4 + ActiveSupport'
+      end
+
+      def applies?
+        @mt_adapter.applies? && defined?(::ActiveSupport::TestCase)
+      end
+
+      def hook
+        parent_adapter_class = self.parent_adapter_class
+        ::ActiveSupport::TestCase.class_eval do
+          include RR::Adapters::RRMethods
+          include parent_adapter_class::Mixin
+
+          setup do
+            RR.reset
+            RR.trim_backtrace = true
+            RR.overridden_error_class = ::ActiveSupport::TestCase::Assertion
+          end
+
+          teardown do
+            RR.verify
+          end
+        end
+      end
+    end
+  end
+end

data/lib/rr/integrations/minitest_active_support.rb

@@ -1,33 +1,12 @@
 module RR
   module Integrations
-    class MiniTestActiveSupport
-      def initialize
-        @mt_adapter = MiniTest.new
+    class MinitestActiveSupport < MiniTest4ActiveSupport
+      def parent_adapter_class
+        Minitest
       end
 
       def name
-        'MiniTest + ActiveSupport'
-      end
-
-      def applies?
-        @mt_adapter.applies? && defined?(::ActiveSupport::TestCase)
-      end
-
-      def hook
-        ::ActiveSupport::TestCase.class_eval do
-          include RR::Adapters::RRMethods
-          include MiniTest::Mixin
-
-          setup do
-            RR.reset
-            RR.trim_backtrace = true
-            RR.overridden_error_class = ::ActiveSupport::TestCase::Assertion
-          end
-
-          teardown do
-            RR.verify
-          end
-        end
+        'Minitest + ActiveSupport'
       end
     end
   end

data/lib/rr/without_autohook.rb

@@ -93,6 +93,8 @@ require 'rr/integrations/rspec_2'
 require 'rr/integrations/test_unit_1'
 require 'rr/integrations/test_unit_2'
 require 'rr/integrations/test_unit_2_active_support'
+require 'rr/integrations/minitest_4'
+require 'rr/integrations/minitest_4_active_support'
 require 'rr/integrations/minitest'
 require 'rr/integrations/minitest_active_support'
 require 'rr/integrations/none'
@@ -110,5 +112,10 @@ module RR
         end
       METHOD
     end
+
+    attr_accessor :debug
+    alias_method :debug?, :debug
   end
 end
+
+RR.debug = (ENV['RR_DEBUG'] == '1')

data/spec/suite.rb

@@ -1,9 +1,14 @@
 require 'session'
 
 class SpecSuite
-  def self.def_runner(runner_name, runner_desc, &block)
+  def self.def_runner(runner_name, runner_desc, program_name, suffix, opts={}, &block)
+    adapter_name = opts[:adapter] || runner_name
+    path = opts[:path] || runner_name
+    env = opts[:env] || {}
     runner_method = "run_#{runner_name}"
-    define_method(runner_method, &block)
+    define_method(runner_method) do
+      run_command(build_command(program_name, adapter_name, path, suffix, env))
+    end
     runners << [runner_name, runner_desc]
   end
 
@@ -46,30 +51,22 @@ class SpecSuite
   end
 
   if ruby_18?
-    def_runner :test_unit_1, 'Test::Unit 1' do
-      run_command(build_command('ruby', 'test_unit_1', 'test'))
-    end
+    def_runner :test_unit_1, 'Test::Unit 1', 'ruby', 'test'
   end
 
-  def_runner :test_unit_2, 'Test::Unit 2' do
-    run_command(build_command('ruby', 'test_unit_2', 'test'))
-  end
+  def_runner :test_unit_2, 'Test::Unit 2', 'ruby', 'test'
 
   unless ruby_18?
-    def_runner :minitest, 'MiniTest' do
-      run_command(build_command('ruby', 'minitest', 'test'))
-    end
+    def_runner :minitest_4, 'MiniTest 4', 'ruby', 'test', :path => :minitest
+
+    def_runner :minitest, 'Minitest', 'ruby', 'test'
   end
 
   if ruby_18?
-    def_runner :rspec_1, 'RSpec 1' do
-      run_command(build_command('spec', 'rspec_1', 'spec'))
-    end
+    def_runner :rspec_1, 'RSpec 1', 'spec', 'spec'
   else
-    def_runner :rspec_2, 'RSpec 2' do
-      ENV['SPEC_OPTS'] = '--format progress'
-      run_command(build_command('rspec', 'rspec_2', 'spec'))
-    end
+    def_runner :rspec_2, 'RSpec 2', 'rspec', 'spec',
+      :env => {'SPEC_OPTS' => '--format progress'}
   end
 
   private
@@ -81,9 +78,10 @@ class SpecSuite
     session
   end
 
-  def build_command(program_name, adapter_name, suffix)
-    ENV['ADAPTER'] = adapter_name
-    file_list = build_file_list(adapter_name, suffix)
+  def build_command(program_name, adapter_name, path, suffix, env)
+    env = env.merge('ADAPTER' => adapter_name)
+    env.each {|k,v| ENV[k.to_s] = v.to_s }
+    file_list = build_file_list(path, suffix)
     ['bundle', 'exec', program_name, *file_list]
   end
 

data/spec/suites/common/adapter_integration_tests.rb

@@ -4,7 +4,7 @@ require 'tempfile'
 
 module AdapterIntegrationTests
   def debug?
-    ENV['RR_DEBUG'] == '1'
+    RR.debug?
   end
 
   def run_fixture_tests(content)
@@ -42,7 +42,14 @@ module AdapterIntegrationTests
 
   def bootstrap(opts={})
     str = ""
-    str << "require 'rubygems'\n"
+    if respond_to?(:adapter_name)
+      str << "ENV['ADAPTER'] = '#{adapter_name}'\n"
+    end
+    str << <<-EOT
+      require 'rubygems'
+      require 'bundler'
+      Bundler.setup(:default)
+    EOT
     str << "require 'rr'\n" if opts[:include_rr_before]
     str << <<-EOT
       require '#{test_framework_path}'
@@ -72,9 +79,11 @@ module AdapterIntegrationTests
         output.should match /1 failure/
       end
 
-      specify "it is still possible to include the adapter into the test framework manually" do
-        output = run_fixture_tests(include_adapter_test)
-        all_tests_should_pass(output)
+      if method_defined?(:include_adapter_test)
+        specify "it is still possible to include the adapter into the test framework manually" do
+          output = run_fixture_tests(include_adapter_test)
+          all_tests_should_pass(output)
+        end
       end
 
       if method_defined?(:include_adapter_where_rr_included_before_test_framework_test)

data/spec/suites/common/test_unit_tests.rb

@@ -18,8 +18,4 @@ module TestUnitTests
       assert_received(subject) {|s| s.foobar(1, 2, 3) }
     end
   end
-
-  def test_trim_backtrace_is_set
-    assert RR.trim_backtrace
-  end
 end

data/spec/suites/minitest/integration/minitest_test.rb

@@ -1,13 +1,13 @@
 require File.expand_path('../../test_helper', __FILE__)
 require File.expand_path('../../../common/test_unit_tests', __FILE__)
 
-class MiniTestIntegrationTest < MiniTest::Unit::TestCase
+test_case_superclass = (defined?(Minitest) && defined?(Minitest::VERSION)) ? \
+  Minitest::Test : \
+  MiniTest::Unit::TestCase
+
+class MiniTestIntegrationTest < test_case_superclass
   # Test::Unit compatibility
   alias_method :assert_raise, :assert_raises
 
   include TestUnitTests
-
-  def test_backtrace_tweaking
-    skip "test this later"
-  end
 end

data/spec/suites/rspec_2/integration/minitest_4_rails_spec.rb

@@ -0,0 +1,72 @@
+require File.expand_path('../../spec_helper', __FILE__)
+require File.expand_path('../../../common/adapter_integration_tests', __FILE__)
+require File.expand_path('../../../common/rails_integration_test', __FILE__)
+
+describe 'Integration between MiniTest 4 and Rails' do
+  def adapter_name
+    'minitest_4'
+  end
+
+  def additional_bootstrap
+    <<-EOT
+      require 'rails'
+      require 'active_support'
+    EOT
+  end
+
+  def test_framework_path
+    'minitest/autorun'
+  end
+
+  def error_test
+    <<-EOT
+      #{bootstrap}
+
+      class FooTest < ActiveSupport::TestCase
+        def test_foo
+          object = Object.new
+          mock(object).foo
+        end
+      end
+    EOT
+  end
+
+  def include_adapter_test
+    <<-EOT
+      #{bootstrap}
+
+      class ActiveSupport::TestCase
+        include RR::Adapters::MiniTest
+      end
+
+      class FooTest < ActiveSupport::TestCase
+        def test_foo
+          object = Object.new
+          mock(object).foo
+          object.foo
+        end
+      end
+    EOT
+  end
+
+  def include_adapter_where_rr_included_before_test_framework_test
+    <<-EOT
+      #{bootstrap :include_rr_before => true}
+
+      class ActiveSupport::TestCase
+        include RR::Adapters::MiniTest
+      end
+
+      class FooTest < ActiveSupport::TestCase
+        def test_foo
+          object = Object.new
+          mock(object).foo
+          object.foo
+        end
+      end
+    EOT
+  end
+
+  include AdapterIntegrationTests
+  include IntegrationWithRails
+end

data/spec/suites/rspec_2/integration/minitest_4_spec.rb

@@ -0,0 +1,67 @@
+require File.expand_path('../../spec_helper', __FILE__)
+require File.expand_path('../../../common/adapter_integration_tests', __FILE__)
+
+describe 'MiniTest 4 integration' do
+  def adapter_name
+    'minitest_4'
+  end
+
+  def error_test
+    <<-EOT
+      #{bootstrap}
+
+      class FooTest < MiniTest::Unit::TestCase
+        def test_foo
+          object = Object.new
+          mock(object).foo
+        end
+      end
+    EOT
+  end
+
+  def include_adapter_test
+    <<-EOT
+      #{bootstrap}
+
+      class MiniTest::Unit::TestCase
+        include RR::Adapters::MiniTest
+      end
+
+      class FooTest < MiniTest::Unit::TestCase
+        def test_foo
+          object = Object.new
+          mock(object).foo
+          object.foo
+        end
+      end
+    EOT
+  end
+
+  def include_adapter_where_rr_included_before_test_framework_test
+    <<-EOT
+      #{bootstrap :include_rr_before => true}
+
+      class MiniTest::Unit::TestCase
+        include RR::Adapters::MiniTest
+      end
+
+      class FooTest < MiniTest::Unit::TestCase
+        def test_foo
+          object = Object.new
+          mock(object).foo
+          object.foo
+        end
+      end
+    EOT
+  end
+
+  include AdapterIntegrationTests
+
+  def adapter_name
+    'minitest_4'
+  end
+
+  def test_framework_path
+    'minitest/autorun'
+  end
+end

data/spec/suites/rspec_2/integration/minitest_rails_spec.rb

@@ -3,9 +3,6 @@ require File.expand_path('../../../common/adapter_integration_tests', __FILE__)
 require File.expand_path('../../../common/rails_integration_test', __FILE__)
 
 describe 'Integration between MiniTest and Rails' do
-  include AdapterIntegrationTests
-  include IntegrationWithRails
-
   def additional_bootstrap
     <<-EOT
       require 'rails'
@@ -65,4 +62,7 @@ describe 'Integration between MiniTest and Rails' do
       end
     EOT
   end
+
+  include AdapterIntegrationTests
+  include IntegrationWithRails
 end

data/spec/suites/rspec_2/integration/minitest_spec.rb

@@ -2,8 +2,6 @@ require File.expand_path('../../spec_helper', __FILE__)
 require File.expand_path('../../../common/adapter_integration_tests', __FILE__)
 
 describe 'MiniTest integration' do
-  include AdapterIntegrationTests
-
   def test_framework_path
     'minitest/autorun'
   end
@@ -12,7 +10,7 @@ describe 'MiniTest integration' do
     <<-EOT
       #{bootstrap}
 
-      class FooTest < MiniTest::Unit::TestCase
+      class FooTest < Minitest::Test
         def test_foo
           object = Object.new
           mock(object).foo
@@ -25,11 +23,11 @@ describe 'MiniTest integration' do
     <<-EOT
       #{bootstrap}
 
-      class MiniTest::Unit::TestCase
+      class Minitest::Test
         include RR::Adapters::MiniTest
       end
 
-      class FooTest < MiniTest::Unit::TestCase
+      class FooTest < Minitest::Test
         def test_foo
           object = Object.new
           mock(object).foo
@@ -43,11 +41,11 @@ describe 'MiniTest integration' do
     <<-EOT
       #{bootstrap :include_rr_before => true}
 
-      class MiniTest::Unit::TestCase
+      class Minitest::Test
         include RR::Adapters::MiniTest
       end
 
-      class FooTest < MiniTest::Unit::TestCase
+      class FooTest < Minitest::Test
         def test_foo
           object = Object.new
           mock(object).foo
@@ -56,4 +54,6 @@ describe 'MiniTest integration' do
       end
     EOT
   end
+
+  include AdapterIntegrationTests
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rr
 version: !ruby/object:Gem::Version
-  version: 1.1.0.rc2
+  version: 1.1.0.rc3
 platform: ruby
 authors:
 - Brian Takita
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-11 00:00:00.000000000 Z
+date: 2013-05-21 00:00:00.000000000 Z
 dependencies: []
 description: RR is a double framework that features a rich selection of double techniques
   and a terse syntax.
@@ -76,6 +76,8 @@ files:
 - lib/rr/injections/singleton_method_added_injection.rb
 - lib/rr/integrations.rb
 - lib/rr/integrations/minitest.rb
+- lib/rr/integrations/minitest_4.rb
+- lib/rr/integrations/minitest_4_active_support.rb
 - lib/rr/integrations/minitest_active_support.rb
 - lib/rr/integrations/none.rb
 - lib/rr/integrations/rspec/invocation_matcher.rb
@@ -137,6 +139,8 @@ files:
 - spec/suites/rspec_2/functional/strong_spec.rb
 - spec/suites/rspec_2/functional/stub_spec.rb
 - spec/suites/rspec_2/functional/wildcard_matchers_spec.rb
+- spec/suites/rspec_2/integration/minitest_4_rails_spec.rb
+- spec/suites/rspec_2/integration/minitest_4_spec.rb
 - spec/suites/rspec_2/integration/minitest_rails_spec.rb
 - spec/suites/rspec_2/integration/minitest_spec.rb
 - spec/suites/rspec_2/integration/rspec_2_spec.rb
@@ -247,6 +251,8 @@ test_files:
 - spec/suites/rspec_2/functional/strong_spec.rb
 - spec/suites/rspec_2/functional/stub_spec.rb
 - spec/suites/rspec_2/functional/wildcard_matchers_spec.rb
+- spec/suites/rspec_2/integration/minitest_4_rails_spec.rb
+- spec/suites/rspec_2/integration/minitest_4_spec.rb
 - spec/suites/rspec_2/integration/minitest_rails_spec.rb
 - spec/suites/rspec_2/integration/minitest_spec.rb
 - spec/suites/rspec_2/integration/rspec_2_spec.rb