rr 1.1.0 → 1.1.1.rc1

data/lib/rr/without_autohook.rb

@@ -87,17 +87,19 @@ require 'rr/spy_verification'
 
 require 'rr/adapters'
 require 'rr/integrations'
+require 'rr/integrations/decorator'
 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_4'
 require 'rr/integrations/minitest_4_active_support'
 require 'rr/integrations/minitest'
 require 'rr/integrations/minitest_active_support'
-require 'rr/integrations/none'
+require 'rr/integrations/test_unit_1'
+require 'rr/integrations/test_unit_200'
+require 'rr/integrations/test_unit_200_active_support'
+require 'rr/integrations/test_unit_2'
+require 'rr/integrations/test_unit_2_active_support'
 
 require 'rr/version'
 
@@ -115,6 +117,10 @@ module RR
 
     attr_accessor :debug
     alias_method :debug?, :debug
+
+    def ruby_18?
+      RUBY_VERSION =~ /^1\.8/
+    end
   end
 end
 

data/spec/global_helper.rb

@@ -1,12 +1,53 @@
-
 require 'pp'
-
 require 'rubygems'
+require 'appraisal/file'
+require 'bundler'
 
 if ENV['COVERAGE']
   require 'simplecov'
   SimpleCov.start
 end
 
-$LOAD_PATH.unshift File.expand_path("../../lib", __FILE__)
-require 'rr'
+module RR
+  module Test
+    class Adapter
+      attr_reader :name
+
+      def initialize(name)
+        @name = name
+      end
+
+      def appraisal_name
+        parts = []
+        parts << (RUBY_VERSION =~ /^1\.8/ ? 'ruby_18' : 'ruby_19')
+        parts << name
+        parts.join('_')
+      end
+
+      def appraisal
+        @appraisal ||= Appraisal::File.new.appraisals.find do |appraisal|
+          appraisal.name == appraisal_name
+        end
+      end
+    end
+
+    def self.setup_test_suite(adapter_name)
+      puts "Setting up test suite for #{adapter_name}" if ENV['RR_DEBUG']
+      unset_bundler_vars
+      adapter = Adapter.new(adapter_name)
+      ENV['ADAPTER'] = adapter.name.to_s
+      puts "Using appraisal: #{adapter.appraisal.name}" if ENV['RR_DEBUG']
+      ENV['BUNDLE_GEMFILE'] = adapter.appraisal.gemfile_path
+      puts "Using gemfile: #{adapter.appraisal.gemfile_path}" if ENV['RR_DEBUG']
+      Bundler.setup(:default)
+      $:.unshift File.expand_path('../../lib', __FILE__)
+    end
+
+    def self.unset_bundler_vars
+      # Copied from appraisal
+      %w(RUBYOPT BUNDLE_PATH BUNDLE_BIN_PATH BUNDLE_GEMFILE).each do |name|
+        ENV[name] = nil
+      end
+    end
+  end
+end

data/spec/spec.opts

@@ -0,0 +1,2 @@
+--color
+--format nested

data/spec/suite.rb

@@ -5,9 +5,10 @@ class SpecSuite
     adapter_name = opts[:adapter] || runner_name
     path = opts[:path] || runner_name
     env = opts[:env] || {}
+    args = opts[:args] || ""
     runner_method = "run_#{runner_name}"
     define_method(runner_method) do
-      run_command(build_command(program_name, adapter_name, path, suffix, env))
+      run_command(build_command(program_name, adapter_name, path, suffix, env, args))
     end
     runners << [runner_name, runner_desc]
   end
@@ -54,19 +55,34 @@ class SpecSuite
     def_runner :test_unit_1, 'Test::Unit 1', 'ruby', 'test'
   end
 
-  def_runner :test_unit_2, 'Test::Unit 2', 'ruby', 'test'
+  if ruby_18?
+    def_runner :test_unit_2, 'Test::Unit 2.4.x', 'ruby', 'test'
+    def_runner :test_unit_2_rails_2, 'Test::Unit 2.4.x + Rails 2', 'ruby', 'test'
+  else
+    def_runner :test_unit_200, 'Test::Unit 2.0.0', 'ruby', 'test'
+    def_runner :test_unit_200_rails_3, 'Test::Unit 2.0.0 + Rails 3', 'ruby', 'test'
+    def_runner :test_unit_2, 'Test::Unit >= 2.5', 'ruby', 'test'
+    def_runner :test_unit_2_rails_3, 'Test::Unit >= 2.5 + Rails 3', 'ruby', 'test'
+    def_runner :test_unit_2_rails_4, 'Test::Unit >= 2.5 + Rails 4', 'ruby', 'test'
+  end
 
   unless ruby_18?
-    def_runner :minitest_4, 'MiniTest 4', 'ruby', 'test', :path => :minitest
-
+    def_runner :minitest_4, 'MiniTest 4', 'ruby', 'test'
     def_runner :minitest, 'Minitest', 'ruby', 'test'
   end
 
   if ruby_18?
-    def_runner :rspec_1, 'RSpec 1', 'spec', 'spec'
+    def_runner :rspec_1, 'RSpec 1', 'spec', 'spec',
+      :args => '--format progress'
+    def_runner :rspec_1_rails_2, 'RSpec 1 + Rails 2', 'spec', 'spec',
+      :args => '--format progress'
   else
     def_runner :rspec_2, 'RSpec 2', 'rspec', 'spec',
       :env => {'SPEC_OPTS' => '--format progress'}
+    def_runner :rspec_2_rails_3, 'RSpec 2 + Rails 3', 'rspec', 'spec',
+      :env => {'SPEC_OPTS' => '--format progress'}
+    def_runner :rspec_2_rails_4, 'RSpec 2 + Rails 4', 'rspec', 'spec',
+      :env => {'SPEC_OPTS' => '--format progress'}
   end
 
   private
@@ -78,11 +94,11 @@ class SpecSuite
     session
   end
 
-  def build_command(program_name, adapter_name, path, suffix, env)
+  def build_command(program_name, adapter_name, path, suffix, env, args)
     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]
+    ['ruby'] + file_list + [args]
   end
 
   def build_file_list(adapter_name, suffix)

data/spec/suites/common/adapter_integration_tests.rb

@@ -1,68 +1,103 @@
 require 'rubygems'
 require 'session'
 require 'tempfile'
+require 'appraisal'
 
 module AdapterIntegrationTests
+  ROOT_DIR = File.expand_path('../../../..', __FILE__)
+  LIB_DIR = File.join(ROOT_DIR, 'lib')
+  TEMP_DIR = '/tmp/rr_integration_tests'
+
+  def create_link(filename)
+    FileUtils.ln_s(File.join(ROOT_DIR, filename), File.join(TEMP_DIR, filename))
+  end
+
   def debug?
     RR.debug?
   end
 
+  def ruby_18?
+    RUBY_VERSION =~ /^1\.8/
+  end
+
   def run_fixture_tests(content)
-    output = nil
-    f = Tempfile.new('rr_test_fixture')
+    fixture_path = File.join(TEMP_DIR, 'rr_test_fixture_spec.rb')
+    FileUtils.rm_f(fixture_path)
+    f = File.open(fixture_path, 'w')
     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/)
+    # Bundler will set RUBYOPT to "-I <path to bundler> -r bundler/setup".
+    # This is unfortunate as it causes Bundler to be loaded before we
+    # load Bundler in RR::Test.setup_test_suite, thereby rendering our
+    # second Bundler.setup a no-op.
+    command = "env RUBYOPT='' ruby -I #{LIB_DIR} #{f.path} 2>&1"
+    puts command if debug?
+    stdout, _ = bash.execute(command)
+    exit_status = bash.exit_status
+    success = !!(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__)
+    FileUtils.rm_f(fixture_path) if fixture_path
   end
 
   def test_helper_path
-    File.expand_path('../../../global_helper', __FILE__)
-  end
-
-  def ruby_18?
-    RUBY_VERSION =~ /^1\.8/
+    File.join(ROOT_DIR, 'spec/global_helper.rb')
   end
 
-  def bootstrap(opts={})
+  def full_bootstrap(opts={})
     str = ""
-    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}'
-      #{additional_bootstrap}
+      require 'fileutils'
+      temp_dir = '#{TEMP_DIR}'
+      Dir.chdir(temp_dir)
+      require '#{test_helper_path}'
+      RR::Test.setup_test_suite('#{adapter_name}')
     EOT
-    str << "require 'rr'\n" unless opts[:include_rr_before]
+    str << opts[:before_require_rr] if opts[:before_require_rr]
+    str << require_rr if opts[:include_rr_before_test_framework]
+    str << require_test_framework(opts)
+    str << require_rr unless opts[:include_rr_before_test_framework]
     str
   end
 
-  def additional_bootstrap
+  def require_rr
+    "require 'rr'\n"
+  end
+
+  def before_require_test_framework
+    ""
+  end
+
+  def require_test_framework(opts={})
+    parts = [
+      before_require_test_framework,
+      opts[:before_require_test_framework] || "",
+    ]
+    paths = test_framework_path
+    paths = [paths] unless paths.is_a?(Array)
+    paths.each do |path|
+      parts << "require '#{path}'"
+    end
+    parts << after_require_test_framework
+    parts.join("\n")
+  end
+
+  def after_require_test_framework
     ""
   end
 
+  def with_bootstrap(*args)
+    opts = args.last.is_a?(Hash) ? args.pop : {}
+    str = args.first || ""
+    [full_bootstrap(opts), str].join("\n")
+  end
+
   def all_tests_should_pass(output)
     if output =~ /(\d+) failure/
       $1.should be == '0'
@@ -74,6 +109,18 @@ module AdapterIntegrationTests
 
   def self.included(base)
     base.class_eval do
+      before :all do
+        FileUtils.rm_rf(TEMP_DIR)
+        FileUtils.mkdir(TEMP_DIR)
+        create_link('Gemfile')
+        create_link('Appraisals')
+        create_link('gemfiles')
+      end
+
+      after :all do
+        FileUtils.rm_rf(TEMP_DIR)
+      end
+
       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/
@@ -92,6 +139,22 @@ module AdapterIntegrationTests
           all_tests_should_pass(output)
         end
       end
+
+      # issue #29
+      specify "loading Cucumber doesn't mess up RR's autohook mechanism" do
+        FileUtils.mkdir(File.join(TEMP_DIR, 'features'))
+        loading_cucumber_test = <<-EOT
+          require 'fileutils'
+          temp_dir = '#{TEMP_DIR}'
+          Dir.chdir(temp_dir)
+          require '#{test_helper_path}'
+          RR::Test.setup_test_suite('#{adapter_name}')
+          # This is what gets loaded within the `cucumber` executable
+          require 'cucumber/rspec/disable_option_parser'
+          require 'rr'
+        EOT
+        run_fixture_tests(loading_cucumber_test)
+      end
     end
   end
 end

data/spec/suites/common/adapter_tests.rb

@@ -1,4 +1,10 @@
+require 'set'
+
 module AdapterTests
+  def test_the_correct_adapters_are_loaded
+    assert_equal Set.new(applicable_adapter_names), Set.new(RR.loaded_adapter_names)
+  end
+
   def test_using_a_mock
     subject = Object.new
     mock(subject).foobar(1, 2) { :baz }

data/spec/suites/common/{rails_integration_test.rb → rails_integration_tests.rb}

@@ -1,12 +1,13 @@
 $is_java = (RUBY_PLATFORM == 'java')
 if $is_java
+  require 'active_record'
   require 'arjdbc'
   require 'arjdbc/sqlite3'
 else
   require 'sqlite3'
 end
 
-module IntegrationWithRails
+module RailsIntegrationTests
   def sqlite_adapter
     $is_java ? 'jdbcsqlite3' : 'sqlite3'
   end
@@ -19,10 +20,8 @@ module IntegrationWithRails
     ruby_18? ? 'test_help' : 'rails/test_help'
   end
 
-  def bootstrap_active_record
-    <<-EOT
-      #{bootstrap}
-
+  def with_active_record_bootstrap(str)
+    with_bootstrap str, :before_require_test_framework => <<-EOT
       require 'active_record'
 
       # This is necessary to turn on transactional tests, for some reason
@@ -33,55 +32,58 @@ module IntegrationWithRails
       ActiveRecord::Base.establish_connection(config)
 
       require '#{rails_test_helper}'
+
+      ActiveRecord::Base.logger = Logger.new(File.open('/tmp/tests.log', 'a+'))
+      class Person < ActiveRecord::Base; end
     EOT
   end
 
-  def self.included(base)
-    base.class_eval do
-      specify "the database is properly rolled back after an RR error" do
-        require 'active_record'
-        FileUtils.rm_f(sqlite_db_file_path)
-        ActiveRecord::Base.establish_connection(
-          :adapter => sqlite_adapter,
-          :database => sqlite_db_file_path
-        )
-        unless debug?
-          old_stdout = $stdout
-          $stdout = File.open('/dev/null', 'w')
+  def database_properly_rolled_back_test
+    with_active_record_bootstrap <<-EOT
+      class FooTest < ActiveRecord::TestCase
+        def test_one
+          Person.create!(:name => 'Joe Blow')
+          object = Object.new
+          mock(object).foo
         end
-        ActiveRecord::Migration.create_table :people do |t|
-          t.string :name
+      end
+    EOT
+  end
+
+  def activerecord_teardown_still_works_test
+    with_active_record_bootstrap <<-EOT
+      class FooTest < ActiveRecord::TestCase
+        teardown do
+          raise 'hell'
         end
-        unless debug?
-          $stdout = old_stdout
+
+        def test_one
+          # whatever
         end
+      end
+    EOT
+  end
+
+  def self.included(base)
+    base.class_eval do
+      specify "the database is properly rolled back after an RR error" do
+        setup_database
 
         count = ActiveRecord::Base.connection.select_value('SELECT COUNT(*) from people')
         count.to_i.should be == 0
 
-        run_fixture_tests <<-EOT
-          #{bootstrap_active_record}
-
-          ActiveRecord::Base.logger = Logger.new(File.open('/tmp/tests.log', 'a+'))
-
-          class Person < ActiveRecord::Base; end
-
-          require "#{test_helper_path}"
-
-          class FooTest < ActiveRecord::TestCase
-            def test_one
-              Person.create!(:name => 'Joe Blow')
-              object = Object.new
-              mock(object).foo
-            end
-          end
-        EOT
+        run_fixture_tests(database_properly_rolled_back_test)
 
         count = ActiveRecord::Base.connection.select_value('SELECT COUNT(*) from people')
         count.to_i.should be == 0
       end
 
       specify "throwing an error in teardown doesn't mess things up" do
+        setup_database
+        run_fixture_tests(activerecord_teardown_still_works_test)
+      end
+
+      def setup_database
         require 'active_record'
         FileUtils.rm_f(sqlite_db_file_path)
         ActiveRecord::Base.establish_connection(
@@ -98,26 +100,6 @@ module IntegrationWithRails
         unless debug?
           $stdout = old_stdout
         end
-
-        output = run_fixture_tests <<-EOT
-          #{bootstrap_active_record}
-
-          ActiveRecord::Base.logger = Logger.new(File.open('/tmp/tests.log', 'a+'))
-
-          class Person < ActiveRecord::Base; end
-
-          require "#{test_helper_path}"
-
-          class FooTest < ActiveRecord::TestCase
-            teardown do
-              raise 'hell'
-            end
-
-            def test_one
-              # whatever
-            end
-          end
-        EOT
       end
     end
   end