rr 1.1.0.rc1 → 1.1.0.rc2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ef054bac4349c5c3f76cc2b3d338b04197427cb7
-  data.tar.gz: b518e1419972353a82dabb2132cb75a0866320d4
+  metadata.gz: 5b496e2bd3931f611b957bea7bbc3f856fb0f821
+  data.tar.gz: 91f2a185b5ba1ebba0a63c3b30c9e370ea1e8058
 SHA512:
-  metadata.gz: 427ec24ae2a285c7b2ba881d230c32d7ff0d99c2c3d8e4efe6295b1b368679869b5131ffb53e773c0b4546cf897adfcfd5de3b8423b21944244cdd74cc49a8be
-  data.tar.gz: e743dc167bfcb5fbc315042f44ca6df094f9aba0bc0aecac9b1d8b6b0696544a40e1940aa3630bff10437f07b78a519fe5ca69bcc67c346e90ec9192b7b0c266
+  metadata.gz: ee6ad3bca380cde85a6244860645540366d29fa073adcc5b42f18df740d6057f6076b6d01b8438cd3faaf8064559eeef31d61b707b8d7710c8a1ffd216266221
+  data.tar.gz: 086ecee298ab54916ec6c0b6fcf7c70d102c2354d6738958708fca6a57b09fc298771f358d0020e3dbfa13e4387674a443c509122828c4a31547cca18a200df6

data/VERSION

@@ -1 +1 @@
-1.1.0.rc1
+1.1.0.rc2

data/lib/rr/adapters.rb

@@ -0,0 +1,64 @@
+module RR
+  module Adapters
+    class << self
+      DEPRECATED_ADAPTERS = [
+        :MiniTest,
+        :TestUnit
+      ]
+
+      def const_missing(adapter_const_name)
+        unless DEPRECATED_ADAPTERS.include?(adapter_const_name)
+          super
+          return
+        end
+
+        show_warning_for(adapter_const_name)
+
+        adapter = shim_adapters[adapter_const_name] ||=
+          case adapter_const_name
+            when :TestUnit
+              find_applicable_adapter(:TestUnit1, :TestUnit2ActiveSupport, :TestUnit2)
+            when :MiniTest
+              find_applicable_adapter(:MiniTestActiveSupport, :MiniTest)
+          end
+
+        adapter
+      end
+
+      private
+
+      def shim_adapters
+        @shim_adapters ||= {}
+      end
+
+      def find_applicable_adapter(*adapter_const_names)
+        adapter = adapter_const_names.
+          map { |adapter_const_name| RR::Integrations.build(adapter_const_name) }.
+          find { |adapter| adapter.applies? }
+        if adapter
+          mod = Module.new
+          (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'.
+              adapter.hook
+            end
+          end
+          mod
+        end
+      end
+
+      def show_warning_for(adapter_const_name)
+        warn <<EOT
+--------------------------------------------------------------------------------
+RR deprecation warning: RR now has an autohook system. You don't need to
+`include RR::Adapters::*` in your test framework's base class anymore.
+--------------------------------------------------------------------------------
+EOT
+      end
+    end
+  end
+end

data/lib/rr/autohook.rb

@@ -11,7 +11,7 @@ module RR
     ]
 
     def autohook
-      find_applicable_adapters.each do |adapter|
+      applicable_adapters.each do |adapter|
         #puts "Using adapter: #{adapter.name}"
         adapter.hook
       end
@@ -21,21 +21,14 @@ module RR
 
     def adapters
       @adapters ||= ADAPTER_NAMES.map { |adapter_name|
-        [adapter_name, RR::Adapters.const_get(adapter_name).new]
+        [adapter_name, RR::Integrations.build(adapter_name)]
       }
     end
 
-    def find_applicable_adapters
-      @applicable_adapters ||= begin
-        applicable_adapters = adapters.inject([]) { |arr, (_, adapter)|
-          arr << adapter if adapter.applies?
-          arr
-        }
-        if applicable_adapters.empty?
-          applicable_adapters << adapters.index(:None)
-        end
-        applicable_adapters
-      end
+    def applicable_adapters
+      @applicable_adapters ||= adapters.
+        map { |_, adapter| adapter }.
+        select { |adapter| adapter.applies? }
     end
   end
 end

data/lib/rr/integrations.rb

@@ -0,0 +1,7 @@
+module RR
+  module Integrations
+    def self.build(name)
+      const_get(name).new
+    end
+  end
+end

data/lib/rr/{adapters → integrations}/minitest.rb

@@ -1,7 +1,7 @@
 module RR
-  module Adapters
+  module Integrations
     class MiniTest
-      module AdapterMethods
+      module Mixin
         def assert_received(subject, &block)
           block.call(received(subject)).call
         end
@@ -17,8 +17,8 @@ module RR
 
       def hook
         ::MiniTest::Unit::TestCase.class_eval do
-          include RRMethods
-          include AdapterMethods
+          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

data/lib/rr/{adapters → integrations}/minitest_active_support.rb

@@ -1,12 +1,12 @@
 module RR
-  module Adapters
+  module Integrations
     class MiniTestActiveSupport
       def initialize
         @mt_adapter = MiniTest.new
       end
 
       def name
-        'MiniTest w/ ActiveSupport'
+        'MiniTest + ActiveSupport'
       end
 
       def applies?
@@ -15,8 +15,8 @@ module RR
 
       def hook
         ::ActiveSupport::TestCase.class_eval do
-          include RRMethods
-          include MiniTest::AdapterMethods
+          include RR::Adapters::RRMethods
+          include MiniTest::Mixin
 
           setup do
             RR.reset

data/lib/rr/{adapters → integrations}/none.rb

@@ -1,5 +1,5 @@
 module RR
-  module Adapters
+  module Integrations
     class None
       def name
         'No adapter'

data/lib/rr/{adapters → integrations}/rspec/invocation_matcher.rb

@@ -1,5 +1,5 @@
 module RR
-  module Adapters
+  module Integrations
     module RSpec
       class InvocationMatcher < SpyVerificationProxy
         attr_reader :failure_message, :spy_verification_proxy
@@ -37,3 +37,11 @@ module RR
     end
   end
 end
+
+module RR
+  module Adapters
+    module Rspec
+      InvocationMatcher = RR::Integrations::RSpec::InvocationMatcher
+    end
+  end
+end

data/lib/rr/{adapters → integrations}/rspec_1.rb

@@ -1,7 +1,7 @@
 module RR
-  module Adapters
+  module Integrations
     class RSpec1
-      module AdapterMethods
+      module Mixin
         def setup_mocks_for_rspec
           RR.reset
         end
@@ -29,8 +29,8 @@ module RR
 
       def hook
         ::Spec::Runner.configure do |config|
-          config.mock_with AdapterMethods
-          config.include RRMethods
+          config.mock_with Mixin
+          config.include RR::Adapters::RRMethods
         end
         patterns = ::Spec::Runner::QuietBacktraceTweaker::IGNORE_PATTERNS
         unless patterns.include?(RR::Errors::BACKTRACE_IDENTIFIER)

data/lib/rr/{adapters → integrations}/rspec_2.rb

@@ -1,5 +1,5 @@
 module RR
-  module Adapters
+  module Integrations
     class RSpec2 < RSpec1
       def name
         'RSpec 2'
@@ -11,8 +11,8 @@ module RR
 
       def hook
         ::RSpec.configure do |config|
-          config.mock_with AdapterMethods
-          config.include RRMethods
+          config.mock_with Mixin
+          config.include RR::Adapters::RRMethods
         end
         patterns = ::RSpec.configuration.backtrace_clean_patterns
         unless patterns.include?(RR::Errors::BACKTRACE_IDENTIFIER)

data/lib/rr/{adapters → integrations}/test_unit_1.rb

@@ -1,7 +1,7 @@
 module RR
-  module Adapters
+  module Integrations
     class TestUnit1
-      module AdapterMethods
+      module Mixin
         def assert_received(subject, &block)
           block.call(received(subject)).call
         end
@@ -17,8 +17,8 @@ module RR
 
       def hook(test_case_class = ::Test::Unit::TestCase)
         test_case_class.class_eval do
-          include RRMethods
-          include AdapterMethods
+          include RR::Adapters::RRMethods
+          include Mixin
 
           unless instance_methods.detect {|method_name| method_name.to_sym == :setup_with_rr }
             alias_method :setup_without_rr, :setup

data/lib/rr/{adapters → integrations}/test_unit_2.rb

@@ -1,5 +1,5 @@
 module RR
-  module Adapters
+  module Integrations
     class TestUnit2 < TestUnit1
       def name
         'Test::Unit 2'

data/lib/rr/{adapters → integrations}/test_unit_2_active_support.rb

@@ -1,5 +1,5 @@
 module RR
-  module Adapters
+  module Integrations
     class TestUnit2ActiveSupport
       def initialize
         @tu2_adapter = TestUnit2.new
@@ -18,8 +18,8 @@ module RR
         RR.overridden_error_class = ::Test::Unit::AssertionFailedError
 
         ::ActiveSupport::TestCase.class_eval do
-          include RRMethods
-          include TestUnit1::AdapterMethods
+          include RR::Adapters::RRMethods
+          include TestUnit1::Mixin
 
           setup do
             RR.reset

data/lib/rr/without_autohook.rb

@@ -85,15 +85,17 @@ require 'rr/times_called_matchers/at_most_matcher'
 require 'rr/spy_verification_proxy'
 require 'rr/spy_verification'
 
-require 'rr/adapters/rspec/invocation_matcher'
-require 'rr/adapters/rspec_1'
-require 'rr/adapters/rspec_2'
-require 'rr/adapters/test_unit_1'
-require 'rr/adapters/test_unit_2'
-require 'rr/adapters/test_unit_2_active_support'
-require 'rr/adapters/minitest'
-require 'rr/adapters/minitest_active_support'
-require 'rr/adapters/none'
+require 'rr/adapters'
+require 'rr/integrations'
+require 'rr/integrations/rspec/invocation_matcher'
+require 'rr/integrations/rspec_1'
+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'
+require 'rr/integrations/minitest_active_support'
+require 'rr/integrations/none'
 
 require 'rr/version'
 

data/spec/suites/common/adapter_integration_tests.rb

@@ -0,0 +1,88 @@
+require 'rubygems'
+require 'session'
+require 'tempfile'
+
+module AdapterIntegrationTests
+  def debug?
+    ENV['RR_DEBUG'] == '1'
+  end
+
+  def run_fixture_tests(content)
+    output = nil
+    f = Tempfile.new('rr_test_fixture')
+    puts content if debug?
+    f.write(content)
+    f.close
+    bash = Session::Bash.new
+    cmd = "ruby -I #{lib_path} #{f.path} 2>&1"
+    puts cmd if debug?
+    stdout, stderr = bash.execute(cmd)
+    success = !!(bash.exit_status == 0 || stdout =~ /Finished/)
+    if debug? or !success
+      puts stdout
+      puts stderr
+    end
+    success.should be_true
+    stdout
+  ensure
+    f.unlink
+  end
+
+  def lib_path
+    File.expand_path('../../../../lib', __FILE__)
+  end
+
+  def test_helper_path
+    File.expand_path('../../../global_helper', __FILE__)
+  end
+
+  def ruby_18?
+    RUBY_VERSION =~ /^1\.8/
+  end
+
+  def bootstrap(opts={})
+    str = ""
+    str << "require 'rubygems'\n"
+    str << "require 'rr'\n" if opts[:include_rr_before]
+    str << <<-EOT
+      require '#{test_framework_path}'
+      #{additional_bootstrap}
+    EOT
+    str << "require 'rr'\n" unless opts[:include_rr_before]
+    str
+  end
+
+  def additional_bootstrap
+    ""
+  end
+
+  def all_tests_should_pass(output)
+    if output =~ /(\d+) failure/
+      $1.should be == '0'
+    end
+    if output =~ /(\d+) error/
+      $1.should be == '0'
+    end
+  end
+
+  def self.included(base)
+    base.class_eval do
+      specify "when RR raises an error it raises a failure not an exception" do
+        output = run_fixture_tests(error_test)
+        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)
+      end
+
+      if method_defined?(:include_adapter_where_rr_included_before_test_framework_test)
+        specify "it is still possible to include the adapter into the test framework manually when RR is included before the test framework" do
+          output = run_fixture_tests(include_adapter_where_rr_included_before_test_framework_test)
+          all_tests_should_pass(output)
+        end
+      end
+    end
+  end
+end

data/spec/suites/common/rails_integration_test.rb

@@ -1,6 +1,3 @@
-require 'rubygems'
-require 'session'
-require 'tempfile'
 $is_java = (RUBY_PLATFORM == 'java')
 if $is_java
   require 'arjdbc'
@@ -10,34 +7,6 @@ else
 end
 
 module IntegrationWithRails
-  def debug?
-    false
-  end
-
-  def run_fixture_tests(content)
-    output = nil
-    f = Tempfile.new('rr_test_fixture')
-    f.write(content)
-    f.close
-    bash = Session::Bash.new
-    cmd = "ruby #{f.path} 2>&1"
-    puts cmd if debug?
-    stdout, stderr = bash.execute(cmd)
-    success = !!(bash.exit_status == 0 || stdout =~ /Finished/)
-    if debug? or !success
-      puts stdout
-      puts stderr
-    end
-    success.should be_true
-    stdout
-  ensure
-    f.unlink
-  end
-
-  def test_helper_path
-    File.expand_path('../../../global_helper', __FILE__)
-  end
-
   def sqlite_adapter
     $is_java ? 'jdbcsqlite3' : 'sqlite3'
   end
@@ -50,10 +19,6 @@ module IntegrationWithRails
     ruby_18? ? 'test_help' : 'rails/test_help'
   end
 
-  def ruby_18?
-    RUBY_VERSION =~ /^1\.8/
-  end
-
   def bootstrap_active_record
     <<-EOT
       #{bootstrap}
@@ -73,22 +38,6 @@ module IntegrationWithRails
 
   def self.included(base)
     base.class_eval do
-      specify "when RR raises an error it raises a failure not an exception" do
-        output = run_fixture_tests <<-EOT
-          #{bootstrap}
-          require "#{test_helper_path}"
-
-          class FooTest < ActiveSupport::TestCase
-            def test_one
-              object = Object.new
-              mock(object).foo
-            end
-          end
-        EOT
-        output.should  match /Failure/
-        output.should match /1 failures/
-      end
-
       specify "the database is properly rolled back after an RR error" do
         require 'active_record'
         FileUtils.rm_f(sqlite_db_file_path)