rr 1.1.0 → 1.1.1.rc1

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__)
 
-test_case_superclass = (defined?(Minitest) && defined?(Minitest::VERSION)) ? \
-  Minitest::Test : \
-  MiniTest::Unit::TestCase
-
-class MiniTestIntegrationTest < test_case_superclass
+class MiniTestIntegrationTest < Minitest::Test
   # Test::Unit compatibility
   alias_method :assert_raise, :assert_raises
 
+  def applicable_adapter_names
+    [:Minitest]
+  end
+
   include TestUnitTests
 end

data/spec/suites/minitest/test_helper.rb

@@ -1,3 +1,7 @@
+require File.expand_path('../../../global_helper', __FILE__)
+RR::Test.setup_test_suite(:minitest)
+
 require 'minitest/autorun'
 
-require File.expand_path('../../../global_helper', __FILE__)
+require 'rr'
+

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

@@ -0,0 +1,13 @@
+require File.expand_path('../../test_helper', __FILE__)
+require File.expand_path('../../../common/test_unit_tests', __FILE__)
+
+class MiniTestIntegrationTest < MiniTest::Unit::TestCase
+  # Test::Unit compatibility
+  alias_method :assert_raise, :assert_raises
+
+  def applicable_adapter_names
+    [:MiniTest4]
+  end
+
+  include TestUnitTests
+end

data/spec/suites/minitest_4/test_helper.rb

@@ -0,0 +1,7 @@
+require File.expand_path('../../../global_helper', __FILE__)
+RR::Test.setup_test_suite(:minitest_4)
+
+require 'minitest/autorun'
+
+require 'rr'
+

data/spec/suites/rspec_1/helper.rb

@@ -0,0 +1,24 @@
+require 'spec/autorun'
+
+require 'rr'
+
+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
+
+Spec::Runner.configure do |c|
+  c.include ExampleMethods
+  c.extend ExampleGroupMethods
+end
+
+Dir[ File.expand_path('../shared/*.rb', __FILE__) ].each {|fn| require fn }

data/spec/suites/rspec_1/integration/rspec_1_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 1' 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)
     actual.should be == expected
   end
@@ -20,14 +11,20 @@ describe 'Integration with RSpec 1' do
     expect(&block).to raise_error(error, message)
   end
 
+  def adapter_name
+    'rspec_1'
+  end
+
+  def applicable_adapter_names
+    [:RSpec1]
+  end
+
   def test_framework_path
     'spec/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 1' do
   end
 
   def include_adapter_test
-    <<-EOT
-      #{bootstrap}
-
+    with_bootstrap <<-EOT
       Spec::Runner.configure do |c|
         c.mock_with :rr
       end
@@ -56,9 +51,7 @@ describe 'Integration with RSpec 1' 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
       Spec::Runner.configure do |c|
         c.mock_with :rr
       end
@@ -72,4 +65,13 @@ describe 'Integration with RSpec 1' do
       end
     EOT
   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_1/integration/test_unit_1_spec.rb

@@ -1,21 +1,17 @@
 require File.expand_path('../../spec_helper', __FILE__)
 require File.expand_path('../../../common/adapter_integration_tests', __FILE__)
 
-describe 'Test::Unit 1 integration' do
-  include AdapterIntegrationTests
+describe 'Integration with Test::Unit 1' do
+  def adapter_name
+    'test_unit_1'
+  end
 
-  def bootstrap
-    <<-EOT
-      require 'test/unit'
-      require 'rubygems'
-      require 'rr'
-    EOT
+  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
@@ -26,9 +22,7 @@ describe 'Test::Unit 1 integration' do
   end
 
   def include_adapter_test
-    <<-EOT
-      #{bootstrap}
-
+    with_bootstrap <<-EOT
       class Test::Unit::TestCase
         include RR::Adapters::TestUnit
       end
@@ -42,4 +36,6 @@ describe 'Test::Unit 1 integration' do
       end
     EOT
   end
+
+  include AdapterIntegrationTests
 end

data/spec/suites/rspec_1/integration/test_unit_2_spec.rb

@@ -1,22 +1,17 @@
 require File.expand_path('../../spec_helper', __FILE__)
 require File.expand_path('../../../common/adapter_integration_tests', __FILE__)
 
-describe 'Test::Unit 2 integration' do
-  include AdapterIntegrationTests
+describe 'Integration with Test::Unit 2.4.x' do
+  def adapter_name
+    'test_unit_2'
+  end
 
-  def bootstrap(opts={})
-    str = ""
-    str << "require 'rubygems'\n"
-    str << "require 'rr'\n" if opts[:include_rr_before]
-    str << "require 'test/unit'\n"
-    str << "require 'rr'\n" unless opts[:include_rr_before]
-    str
+  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
@@ -27,9 +22,7 @@ describe 'Test::Unit 2 integration' do
   end
 
   def include_adapter_test
-    <<-EOT
-      #{bootstrap}
-
+    with_bootstrap <<-EOT
       class Test::Unit::TestCase
         include RR::Adapters::TestUnit
       end
@@ -45,9 +38,7 @@ describe 'Test::Unit 2 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 Test::Unit::TestCase
         include RR::Adapters::TestUnit
       end
@@ -61,4 +52,6 @@ describe 'Test::Unit 2 integration' do
       end
     EOT
   end
+
+  include AdapterIntegrationTests
 end

data/spec/suites/rspec_1/spec_helper.rb

@@ -1,24 +1,3 @@
-require 'spec/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
-
-Spec::Runner.configure do |c|
-  c.include ExampleMethods
-  c.extend ExampleGroupMethods
-end
-
-Dir[ File.expand_path('../shared/*.rb', __FILE__) ].each {|fn| require fn }
+RR::Test.setup_test_suite(:rspec_1)
+require File.expand_path('../helper', __FILE__)

data/spec/suites/{rspec_1/integration/test_unit_1_rails_spec.rb → rspec_1_rails_2/integration/test_unit_1_rails_2_spec.rb}

@@ -1,30 +1,28 @@
 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 1 and Rails' do
-  include AdapterIntegrationTests
-  include IntegrationWithRails
+describe 'Integration with Test::Unit 1 and Rails 2' do
+  def adapter_name
+    'test_unit_1_rails_2'
+  end
+
+  def test_framework_path
+    'test/unit'
+  end
 
-  def bootstrap
+  def before_require_test_framework
     <<-EOT
       RAILS_ROOT = File.expand_path(__FILE__)
-      require 'test/unit'
-
-      require 'rubygems'
       require 'rack'
       require 'active_support/all'
       require 'action_controller'
       require 'active_support/test_case'
-
-      require 'rr'
     EOT
   end
 
   def error_test
-    <<-EOT
-      #{bootstrap}
-
+    with_bootstrap <<-EOT
       class FooTest < ActiveSupport::TestCase
         def test_foo
           object = Object.new
@@ -35,9 +33,7 @@ describe 'Integration between TestUnit 1 and Rails' do
   end
 
   def include_adapter_test
-    <<-EOT
-      #{bootstrap}
-
+    with_bootstrap <<-EOT
       class ActiveSupport::TestCase
         include RR::Adapters::TestUnit
       end
@@ -51,4 +47,7 @@ describe 'Integration between TestUnit 1 and Rails' do
       end
     EOT
   end
+
+  include AdapterIntegrationTests
+  include RailsIntegrationTests
 end

data/spec/suites/rspec_1_rails_2/integration/test_unit_2_rails_2_spec.rb

@@ -0,0 +1,57 @@
+require File.expand_path('../../spec_helper', __FILE__)
+require File.expand_path('../../../common/adapter_integration_tests', __FILE__)
+require File.expand_path('../../../common/rails_integration_tests', __FILE__)
+
+describe 'Integration with Test::Unit 2.4.x and Rails 2' do
+  def adapter_name
+    'test_unit_2_rails_2'
+  end
+
+  def test_framework_path
+    'test/unit'
+  end
+
+  def before_require_test_framework
+    <<-EOT
+      RAILS_ROOT = File.expand_path(__FILE__)
+      require 'rack'
+      require 'active_support/all'
+      require 'action_controller'
+      require 'active_support/test_case'
+    EOT
+  end
+
+  def error_test
+    with_bootstrap <<-EOT
+      class ActiveSupport::TestCase
+        include RR::Adapters::TestUnit
+      end
+
+      class FooTest < ActiveSupport::TestCase
+        def test_foo
+          object = Object.new
+          mock(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 ActiveSupport::TestCase
+        include RR::Adapters::TestUnit
+      end
+
+      class FooTest < ActiveSupport::TestCase
+        def test_foo
+          object = Object.new
+          mock(object).foo
+          object.foo
+        end
+      end
+    EOT
+  end
+
+  include AdapterIntegrationTests
+  include RailsIntegrationTests
+end

data/spec/suites/rspec_1_rails_2/spec_helper.rb

@@ -0,0 +1,3 @@
+require File.expand_path('../../../global_helper', __FILE__)
+RR::Test.setup_test_suite(:rspec_1_rails_2)
+require File.expand_path('../../rspec_1/helper', __FILE__)

data/spec/suites/rspec_2/helper.rb

@@ -0,0 +1,27 @@
+require 'rspec/core'
+require 'rspec/expectations'
+require 'rspec/autorun'
+
+require 'rr'
+
+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 }

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

@@ -1,15 +1,17 @@
 require File.expand_path('../../spec_helper', __FILE__)
 require File.expand_path('../../../common/adapter_integration_tests', __FILE__)
 
-describe 'MiniTest 4 integration' do
+describe 'Integration with MiniTest 4' do
   def adapter_name
     'minitest_4'
   end
 
-  def error_test
-    <<-EOT
-      #{bootstrap}
+  def test_framework_path
+    'minitest/autorun'
+  end
 
+  def error_test
+    with_bootstrap <<-EOT
       class FooTest < MiniTest::Unit::TestCase
         def test_foo
           object = Object.new
@@ -20,9 +22,7 @@ describe 'MiniTest 4 integration' do
   end
 
   def include_adapter_test
-    <<-EOT
-      #{bootstrap}
-
+    with_bootstrap <<-EOT
       class MiniTest::Unit::TestCase
         include RR::Adapters::MiniTest
       end
@@ -38,9 +38,7 @@ describe 'MiniTest 4 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 MiniTest::Unit::TestCase
         include RR::Adapters::MiniTest
       end
@@ -56,12 +54,4 @@ describe 'MiniTest 4 integration' do
   end
 
   include AdapterIntegrationTests
-
-  def adapter_name
-    'minitest_4'
-  end
-
-  def test_framework_path
-    'minitest/autorun'
-  end
 end