rr 1.1.0 → 1.1.1.rc1

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

@@ -1,15 +1,17 @@
 require File.expand_path('../../spec_helper', __FILE__)
 require File.expand_path('../../../common/adapter_integration_tests', __FILE__)
 
-describe 'MiniTest integration' do
+describe 'Integration with Minitest >= 5' do
+  def adapter_name
+    'minitest'
+  end
+
   def test_framework_path
     'minitest/autorun'
   end
 
   def error_test
-    <<-EOT
-      #{bootstrap}
-
+    with_bootstrap <<-EOT
       class FooTest < Minitest::Test
         def test_foo
           object = Object.new
@@ -20,9 +22,7 @@ describe 'MiniTest integration' do
   end
 
   def include_adapter_test
-    <<-EOT
-      #{bootstrap}
-
+    with_bootstrap <<-EOT
       class Minitest::Test
         include RR::Adapters::MiniTest
       end
@@ -38,9 +38,7 @@ describe 'MiniTest integration' do
   end
 
   def include_adapter_where_rr_included_before_test_framework_test
-    <<-EOT
-      #{bootstrap :include_rr_before => true}
-
+    with_bootstrap <<-EOT, :include_rr_before => true
       class Minitest::Test
         include RR::Adapters::MiniTest
       end

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

@@ -3,15 +3,6 @@ require File.expand_path('../../../common/adapter_tests', __FILE__)
 require File.expand_path('../../../common/adapter_integration_tests', __FILE__)
 
 describe 'Integration with RSpec 2' do
-  include AdapterTests
-  instance_methods.each do |method_name|
-    if method_name =~ /^test_(.+)$/
-      it(method_name) { __send__(method_name) }
-    end
-  end
-
-  include AdapterIntegrationTests
-
   def assert_equal(expected, actual)
     expect(actual).to eq actual
   end
@@ -20,14 +11,20 @@ describe 'Integration with RSpec 2' do
     expect(&block).to raise_error(error, message)
   end
 
+  def adapter_name
+    'rspec_2'
+  end
+
+  def applicable_adapter_names
+    [:RSpec2]
+  end
+
   def test_framework_path
     'rspec/autorun'
   end
 
   def error_test
-    <<-EOT
-      #{bootstrap}
-
+    with_bootstrap <<-EOT
       describe 'A test' do
         it 'is a test' do
           object = Object.new
@@ -38,9 +35,7 @@ describe 'Integration with RSpec 2' do
   end
 
   def include_adapter_test
-    <<-EOT
-      #{bootstrap}
-
+    with_bootstrap <<-EOT
       RSpec.configure do |c|
         c.mock_with :rr
       end
@@ -56,9 +51,7 @@ describe 'Integration with RSpec 2' do
   end
 
   def include_adapter_where_rr_included_before_test_framework_test
-    <<-EOT
-      #{bootstrap :include_rr_before => true}
-
+    with_bootstrap <<-EOT, :include_rr_before_test_framework => true
       RSpec.configure do |c|
         c.mock_with :rr
       end
@@ -74,9 +67,7 @@ describe 'Integration with RSpec 2' do
   end
 
   specify "it is still possible to use a custom RSpec-2 adapter" do
-    output = run_fixture_tests <<-EOT
-      #{bootstrap}
-
+    suite = with_bootstrap <<-EOT
       module RR
         module Adapters
           module RSpec2
@@ -120,6 +111,16 @@ describe 'Integration with RSpec 2' do
         end
       end
     EOT
+    output = run_fixture_tests(suite)
     all_tests_should_pass(output)
   end
+
+  include AdapterTests
+  instance_methods.each do |method_name|
+    if method_name =~ /^test_(.+)$/
+      it(method_name) { __send__(method_name) }
+    end
+  end
+
+  include AdapterIntegrationTests
 end

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

@@ -0,0 +1,57 @@
+require File.expand_path('../../spec_helper', __FILE__)
+require File.expand_path('../../../common/adapter_integration_tests', __FILE__)
+
+describe 'Integration with Test::Unit 2.0.0' do
+  def adapter_name
+    'test_unit_200'
+  end
+
+  def test_framework_path
+    'test/unit'
+  end
+
+  def error_test
+    with_bootstrap <<-EOT
+      class FooTest < Test::Unit::TestCase
+        def test_foo
+          object = Object.new
+          mock(object).foo
+        end
+      end
+    EOT
+  end
+
+  def include_adapter_test
+    with_bootstrap <<-EOT
+      class Test::Unit::TestCase
+        include RR::Adapters::TestUnit
+      end
+
+      class FooTest < Test::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
+    with_bootstrap <<-EOT, :include_rr_before_test_framework => true
+      class Test::Unit::TestCase
+        include RR::Adapters::TestUnit
+      end
+
+      class FooTest < Test::Unit::TestCase
+        def test_foo
+          object = Object.new
+          mock(object).foo
+          object.foo
+        end
+      end
+    EOT
+  end
+
+  include AdapterIntegrationTests
+end

data/spec/suites/rspec_2/integration/{test_unit_spec.rb → test_unit_2_spec.rb}

@@ -1,17 +1,17 @@
 require File.expand_path('../../spec_helper', __FILE__)
 require File.expand_path('../../../common/adapter_integration_tests', __FILE__)
 
-describe 'TestUnit integration' do
-  include AdapterIntegrationTests
+describe 'Integration with Test::Unit >= 2.5' do
+  def adapter_name
+    'test_unit_2'
+  end
 
   def test_framework_path
     'test/unit'
   end
 
   def error_test
-    <<-EOT
-      #{bootstrap}
-
+    with_bootstrap <<-EOT
       class FooTest < Test::Unit::TestCase
         def test_foo
           object = Object.new
@@ -22,9 +22,7 @@ describe 'TestUnit integration' do
   end
 
   def include_adapter_test
-    <<-EOT
-      #{bootstrap}
-
+    with_bootstrap <<-EOT
       class Test::Unit::TestCase
         include RR::Adapters::TestUnit
       end
@@ -40,9 +38,7 @@ describe 'TestUnit integration' do
   end
 
   def include_adapter_where_rr_included_before_test_framework_test
-    <<-EOT
-      #{bootstrap :include_rr_before => true}
-
+    with_bootstrap <<-EOT, :include_rr_before_test_framework => true
       class Test::Unit::TestCase
         include RR::Adapters::TestUnit
       end
@@ -56,4 +52,6 @@ describe 'TestUnit integration' do
       end
     EOT
   end
+
+  include AdapterIntegrationTests
 end

data/spec/suites/rspec_2/spec_helper.rb

@@ -1,27 +1,3 @@
-require 'rspec/core'
-require 'rspec/expectations'
-require 'rspec/autorun'
-
 require File.expand_path('../../../global_helper', __FILE__)
-
-module ExampleMethods
-  def eigen(object)
-    class << object; self; end
-  end
-end
-
-module ExampleGroupMethods
-  def macro(name, &implementation)
-    (class << self; self; end).class_eval do
-      define_method(name, &implementation)
-    end
-  end
-end
-
-RSpec.configure do |c|
-  c.include ExampleMethods
-  c.extend ExampleGroupMethods
-end
-
-Dir[ File.expand_path('../shared/*.rb', __FILE__) ].each {|fn| require fn }
-Dir[ File.expand_path('../support/**/*.rb', __FILE__) ].each {|fn| require fn }
+RR::Test.setup_test_suite(:rspec_2)
+require File.expand_path('../helper', __FILE__)

data/spec/suites/{rspec_2/integration/minitest_4_rails_spec.rb → rspec_2_rails_3/integration/minitest_4_rails_3_spec.rb}

@@ -1,27 +1,25 @@
 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__)
+require File.expand_path('../../../common/rails_integration_tests', __FILE__)
 
-describe 'Integration between MiniTest 4 and Rails' do
+describe 'Integration with MiniTest 4 and Rails 3' do
   def adapter_name
-    'minitest_4'
+    'minitest_4_rails_3'
   end
 
-  def additional_bootstrap
+  def test_framework_path
+    'minitest/autorun'
+  end
+
+  def before_require_test_framework
     <<-EOT
       require 'rails'
       require 'active_support'
     EOT
   end
 
-  def test_framework_path
-    'minitest/autorun'
-  end
-
   def error_test
-    <<-EOT
-      #{bootstrap}
-
+    with_bootstrap <<-EOT
       class FooTest < ActiveSupport::TestCase
         def test_foo
           object = Object.new
@@ -32,9 +30,7 @@ describe 'Integration between MiniTest 4 and Rails' do
   end
 
   def include_adapter_test
-    <<-EOT
-      #{bootstrap}
-
+    with_bootstrap <<-EOT
       class ActiveSupport::TestCase
         include RR::Adapters::MiniTest
       end
@@ -50,9 +46,7 @@ describe 'Integration between MiniTest 4 and Rails' do
   end
 
   def include_adapter_where_rr_included_before_test_framework_test
-    <<-EOT
-      #{bootstrap :include_rr_before => true}
-
+    with_bootstrap <<-EOT, :include_rr_before_test_framework => true
       class ActiveSupport::TestCase
         include RR::Adapters::MiniTest
       end
@@ -68,5 +62,5 @@ describe 'Integration between MiniTest 4 and Rails' do
   end
 
   include AdapterIntegrationTests
-  include IntegrationWithRails
+  include RailsIntegrationTests
 end

data/spec/suites/{rspec_2/integration/test_unit_rails_spec.rb → rspec_2_rails_3/integration/test_unit_200_rails_3_spec.rb}

@@ -1,26 +1,25 @@
 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__)
+require File.expand_path('../../../common/rails_integration_tests', __FILE__)
 
-describe 'Integration between TestUnit and Rails' do
-  include AdapterIntegrationTests
-  include IntegrationWithRails
-
-  def additional_bootstrap
-    <<-EOT
-      require 'rails'
-      require 'active_support'
-    EOT
+describe 'Integration with Test::Unit 2.0.0 and Rails 3' do
+  def adapter_name
+    'test_unit_2_rails_3'
   end
 
   def test_framework_path
     'test/unit'
   end
 
-  def error_test
+  def before_require_test_framework
     <<-EOT
-      #{bootstrap}
+      require 'rails'
+      require 'active_support'
+    EOT
+  end
 
+  def error_test
+    with_bootstrap <<-EOT
       class FooTest < ActiveSupport::TestCase
         def test_foo
           object = Object.new
@@ -31,9 +30,7 @@ describe 'Integration between TestUnit and Rails' do
   end
 
   def include_adapter_test
-    <<-EOT
-      #{bootstrap}
-
+    with_bootstrap <<-EOT
       class ActiveSupport::TestCase
         include RR::Adapters::TestUnit
       end
@@ -49,9 +46,7 @@ describe 'Integration between TestUnit and Rails' do
   end
 
   def include_adapter_where_rr_included_before_test_framework_test
-    <<-EOT
-      #{bootstrap :include_rr_before => true}
-
+    with_bootstrap <<-EOT, :include_rr_before => true
       class ActiveSupport::TestCase
         include RR::Adapters::TestUnit
       end
@@ -65,4 +60,7 @@ describe 'Integration between TestUnit and Rails' do
       end
     EOT
   end
+
+  include AdapterIntegrationTests
+  include RailsIntegrationTests
 end

data/spec/suites/{rspec_1/integration/test_unit_2_rails_spec.rb → rspec_2_rails_3/integration/test_unit_2_rails_3_spec.rb}

@@ -1,33 +1,25 @@
 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__)
+require File.expand_path('../../../common/rails_integration_tests', __FILE__)
 
-describe 'Integration between TestUnit 2 and Rails' do
-  include AdapterIntegrationTests
-  include IntegrationWithRails
+describe 'Integration with Test::Unit >= 2.5 and Rails 3' do
+  def adapter_name
+    'test_unit_2_rails_3'
+  end
 
-  def bootstrap(opts={})
-    str = ""
-    str << <<-EOT
-      RAILS_ROOT = File.expand_path(__FILE__)
-      require 'rubygems'
-    EOT
-    str << "require 'rr'\n" if opts[:include_rr_before]
-    str << <<-EOT
-      require 'rack'
-      require 'test/unit'
-      require 'active_support/all'
-      require 'action_controller'
-      require 'active_support/test_case'
-    EOT
-    str << "require 'rr'\n" unless opts[:include_rr_before]
-    str
+  def test_framework_path
+    'test/unit'
   end
 
-  def error_test
+  def before_require_test_framework
     <<-EOT
-      #{bootstrap}
+      require 'rails'
+      require 'active_support'
+    EOT
+  end
 
+  def error_test
+    with_bootstrap <<-EOT
       class FooTest < ActiveSupport::TestCase
         def test_foo
           object = Object.new
@@ -38,9 +30,7 @@ describe 'Integration between TestUnit 2 and Rails' do
   end
 
   def include_adapter_test
-    <<-EOT
-      #{bootstrap}
-
+    with_bootstrap <<-EOT
       class ActiveSupport::TestCase
         include RR::Adapters::TestUnit
       end
@@ -56,9 +46,7 @@ describe 'Integration between TestUnit 2 and Rails' do
   end
 
   def include_adapter_where_rr_included_before_test_framework_test
-    <<-EOT
-      #{bootstrap :include_rr_before => true}
-
+    with_bootstrap <<-EOT, :include_rr_before => true
       class ActiveSupport::TestCase
         include RR::Adapters::TestUnit
       end
@@ -72,4 +60,7 @@ describe 'Integration between TestUnit 2 and Rails' do
       end
     EOT
   end
+
+  include AdapterIntegrationTests
+  include RailsIntegrationTests
 end