rspec 1.0.8 → 1.1.0

data/lib/spec/extensions/object.rb

@@ -3,4 +3,8 @@ class Object
     options = Hash === args.last ? args.pop : {}
     return args, options
   end
-end  
+
+  def metaclass
+    class << self; self; end
+  end
+end

data/lib/spec/interop/test.rb

@@ -0,0 +1,10 @@
+require 'test/unit'
+require 'test/unit/testresult'
+
+require 'spec/interop/test/unit/testcase'
+require 'spec/interop/test/unit/testsuite_adapter'
+require 'spec/interop/test/unit/autorunner'
+require 'spec/interop/test/unit/testresult'
+require 'spec/interop/test/unit/ui/console/testrunner'
+
+Spec::Example::ExampleGroupFactory.default(Test::Unit::TestCase)

data/lib/spec/interop/test/unit/autorunner.rb

@@ -0,0 +1,6 @@
+class Test::Unit::AutoRunner
+  remove_method :process_args
+  def process_args(argv)
+    true
+  end
+end

data/lib/spec/interop/test/unit/testcase.rb

@@ -0,0 +1,61 @@
+require 'test/unit/testcase'
+
+module Test
+  module Unit
+    # This extension of the standard Test::Unit::TestCase makes RSpec
+    # available from within, so that you can do things like:
+    #
+    # require 'test/unit'
+    # require 'spec'
+    #
+    # class MyTest < Test::Unit::TestCase
+    #   it "should work with Test::Unit assertions" do
+    #     assert_equal 4, 2+1
+    #   end
+    #
+    #   def test_should_work_with_rspec_expectations
+    #     (3+1).should == 5
+    #   end
+    # end
+    #
+    # See also Spec::Example::ExampleGroup
+    class TestCase
+      extend Spec::Example::ExampleGroupMethods
+      include Spec::Example::ExampleMethods
+
+      before(:each) {setup}
+      after(:each) {teardown}
+
+      class << self
+        def suite
+          Test::Unit::TestSuiteAdapter.new(self)
+        end
+
+        def example_method?(method_name)
+          should_method?(method_name) || test_method?(method_name)
+        end
+
+        def test_method?(method_name)
+          method_name =~ /^test[_A-Z]./ && (
+            instance_method(method_name).arity == 0 ||
+            instance_method(method_name).arity == -1
+          )
+        end
+      end
+
+      def initialize(defined_description, &implementation)
+        @_defined_description = defined_description
+        @_implementation = implementation
+
+        @_result = ::Test::Unit::TestResult.new
+        # @method_name is important to set here because it "complies" with Test::Unit's interface.
+        # Some Test::Unit extensions depend on @method_name being present.
+        @method_name = @_defined_description
+      end
+
+      def run(ignore_this_argument=nil)
+        super()
+      end
+    end
+  end
+end

data/lib/spec/interop/test/unit/testresult.rb

@@ -0,0 +1,6 @@
+class Test::Unit::TestResult
+  alias_method :tu_passed?, :passed?
+  def passed?
+    return tu_passed? & ::Spec.run
+  end
+end

data/lib/spec/interop/test/unit/testsuite_adapter.rb

@@ -0,0 +1,34 @@
+module Test
+  module Unit
+    class TestSuiteAdapter < TestSuite
+      attr_reader :example_group, :examples
+      alias_method :tests, :examples
+      def initialize(example_group)
+        @example_group = example_group
+        @examples = example_group.examples
+      end
+
+      def name
+        example_group.description
+      end
+
+      def run(*args)
+        return true unless args.empty?
+        example_group.run
+      end
+
+      def size
+        example_group.number_of_examples
+      end
+
+      def delete(example)
+        examples.delete example
+      end
+
+      def empty?
+        examples.empty?
+      end
+    end
+  end
+end
+

data/lib/spec/interop/test/unit/ui/console/testrunner.rb

@@ -0,0 +1,60 @@
+require 'test/unit/ui/console/testrunner'
+
+module Test
+  module Unit
+    module UI
+      module Console
+        class TestRunner
+
+          alias_method :started_without_rspec, :started
+          def started_with_rspec(result)
+            @result = result
+            @need_to_output_started = true
+          end
+          alias_method :started, :started_with_rspec
+
+          alias_method :test_started_without_rspec, :test_started
+          def test_started_with_rspec(name)
+            if @need_to_output_started
+              if @rspec_io
+                @rspec_io.rewind
+                output(@rspec_io.read)
+              end
+              output("Started")
+              @need_to_output_started = false
+            end
+            test_started_without_rspec(name)
+          end
+          alias_method :test_started, :test_started_with_rspec
+
+          alias_method :test_finished_without_rspec, :test_finished
+          def test_finished_with_rspec(name)
+            test_finished_without_rspec(name)
+            @ran_test = true
+          end
+          alias_method :test_finished, :test_finished_with_rspec
+
+          alias_method :finished_without_rspec, :finished
+          def finished_with_rspec(elapsed_time)
+            if @ran_test
+              finished_without_rspec(elapsed_time)
+            end
+          end
+          alias_method :finished, :finished_with_rspec
+          
+          alias_method :setup_mediator_without_rspec, :setup_mediator
+          def setup_mediator_with_rspec
+            orig_io = @io
+            @io = StringIO.new
+            setup_mediator_without_rspec
+          ensure
+            @rspec_io = @io
+            @io = orig_io
+          end
+          alias_method :setup_mediator, :setup_mediator_with_rspec
+          
+        end
+      end
+    end
+  end
+end

data/lib/spec/matchers.rb

@@ -1,8 +1,10 @@
+require 'spec/matchers/simple_matcher'
 require 'spec/matchers/be'
 require 'spec/matchers/be_close'
 require 'spec/matchers/change'
 require 'spec/matchers/eql'
 require 'spec/matchers/equal'
+require 'spec/matchers/exist'
 require 'spec/matchers/has'
 require 'spec/matchers/have'
 require 'spec/matchers/include'
@@ -132,27 +134,21 @@ module Spec
   #
   module Matchers
     module ModuleMethods
-      def description_generated(callback)
-        description_generated_callbacks << callback
-      end
-
-      def unregister_description_generated(callback)
-        description_generated_callbacks.delete(callback)
-      end
+      attr_accessor :generated_description
 
-      def generated_description=(name)
-        description_generated_callbacks.each do |callback|
-          callback.call(name)
-        end
+      def clear_generated_description
+        self.generated_description = nil
       end
 
-      private
-      def description_generated_callbacks
-        @description_generated_callbacks ||= []
+      def capture_generated_description
+        yield
+        description = generated_description
+        clear_generated_description
+        description
       end
     end
     extend ModuleMethods
-    
+
     def method_missing(sym, *args, &block) # :nodoc:
       return Matchers::Be.new(sym, *args) if sym.starts_with?("be_")
       return Matchers::Has.new(sym, *args) if sym.starts_with?("have_")

data/lib/spec/matchers/be.rb

@@ -3,14 +3,17 @@ module Spec
     
     class Be #:nodoc:
       def initialize(*args)
-        @expected = parse_expected(args.shift)
+        if args.empty?
+          @expected = :satisfy_if
+        else
+          @expected = parse_expected(args.shift)
+        end
         @args = args
         @comparison = ""
       end
       
       def matches?(actual)
         @actual = actual
-        return true if match_or_compare unless handling_predicate?
         if handling_predicate?
           begin
             return @result = actual.__send__(predicate, *@args)
@@ -28,8 +31,9 @@ module Spec
           rescue
             raise predicate_error
           end
+        else
+          return match_or_compare
         end
-        return false
       end
       
       def failure_message
@@ -43,6 +47,7 @@ module Spec
       end
       
       def expected
+        return "if to be satisfied" if @expected == :satisfy_if
         return true if @expected == :true
         return false if @expected == :false
         return "nil" if @expected == :nil
@@ -50,6 +55,7 @@ module Spec
       end
       
       def match_or_compare
+        return @actual ? true : false if @expected == :satisfy_if
         return @actual == true if @expected == :true
         return @actual == false if @expected == :false
         return @actual.nil? if @expected == :nil
@@ -63,6 +69,7 @@ module Spec
       end
       
       def ==(expected)
+        @prefix = "be "
         @double_equal = true
         @comparison = "== "
         @expected = expected
@@ -70,6 +77,7 @@ module Spec
       end
 
       def ===(expected)
+        @prefix = "be "
         @triple_equal = true
         @comparison = "=== "
         @expected = expected
@@ -77,6 +85,7 @@ module Spec
       end
 
       def <(expected)
+        @prefix = "be "
         @less_than = true
         @comparison = "< "
         @expected = expected
@@ -84,6 +93,7 @@ module Spec
       end
 
       def <=(expected)
+        @prefix = "be "
         @less_than_or_equal = true
         @comparison = "<= "
         @expected = expected
@@ -91,6 +101,7 @@ module Spec
       end
 
       def >=(expected)
+        @prefix = "be "
         @greater_than_or_equal = true
         @comparison = ">= "
         @expected = expected
@@ -98,6 +109,7 @@ module Spec
       end
 
       def >(expected)
+        @prefix = "be "
         @greater_than = true
         @comparison = "> "
         @expected = expected
@@ -113,10 +125,12 @@ module Spec
           if Symbol === expected
             @handling_predicate = true
             ["be_an_","be_a_","be_"].each do |@prefix|
-              return "#{expected.to_s.sub(@prefix,"")}".to_sym if expected.starts_with?(@prefix)
+              if expected.starts_with?(@prefix)
+                return "#{expected.to_s.sub(@prefix,"")}".to_sym
+              end
             end
           end
-          @prefix = "be "
+          @prefix = ""
           return expected
         end
         
@@ -169,6 +183,7 @@ module Spec
     end
  
     # :call-seq:
+    #   should be
     #   should be_true
     #   should be_false
     #   should be_nil
@@ -177,7 +192,8 @@ module Spec
     #   should_not be_arbitrary_predicate(*args)
     #
     # Given true, false, or nil, will pass if actual is
-    # true, false or nil (respectively).
+    # true, false or nil (respectively). Given no args means
+    # the caller should satisfy an if condition (to be or not to be). 
     #
     # Predicates are any Ruby method that ends in a "?" and returns true or false.
     # Given be_ followed by arbitrary_predicate (without the "?"), RSpec will match
@@ -189,6 +205,7 @@ module Spec
     #
     # == Examples 
     #
+    #   target.should be
     #   target.should be_true
     #   target.should be_false
     #   target.should be_nil

data/lib/spec/matchers/change.rb

@@ -21,6 +21,8 @@ EOF
         return false if @from && (@from != @before)
         return false if @to && (@to != @after)
         return (@before + @amount == @after) if @amount
+        return ((@after - @before) >= @minimum) if @minimum
+        return ((@after - @before) <= @maximum) if @maximum        
         return @before != @after
       end
       
@@ -37,6 +39,10 @@ EOF
           "#{result} should have initially been #{@from.inspect}, but was #{@before.inspect}"
         elsif @amount
           "#{result} should have been changed by #{@amount.inspect}, but was changed by #{actual_delta.inspect}"
+        elsif @minimum
+          "#{result} should have been changed by at least #{@minimum.inspect}, but was changed by #{actual_delta.inspect}"
+        elsif @maximum
+          "#{result} should have been changed by at most #{@maximum.inspect}, but was changed by #{actual_delta.inspect}"
         else
           "#{result} should have changed, but is still #{@before.inspect}"
         end
@@ -59,6 +65,16 @@ EOF
         self
       end
       
+      def by_at_least(minimum)
+        @minimum = minimum
+        self
+      end
+      
+      def by_at_most(maximum)
+        @maximum = maximum
+        self
+      end      
+      
       def to(to)
         @to = to
         self
@@ -88,6 +104,14 @@ EOF
     #     team.add_player(player) 
     #   }.should change(roster, :count).by(1)
     #
+    #   lambda {
+    #     team.add_player(player) 
+    #   }.should change(roster, :count).by_at_least(1)
+    #
+    #   lambda {
+    #     team.add_player(player)
+    #   }.should change(roster, :count).by_at_most(1)    
+    #
     #   string = "string"
     #   lambda {
     #     string.reverse
@@ -109,7 +133,7 @@ EOF
     #
     # == Warning
     # +should_not+ +change+ only supports the form with no subsequent calls to
-    # +be+, +to+ or +from+.
+    # +by+, +by_at_least+, +by_at_most+, +to+ or +from+.
     #
     # blocks passed to +should+ +change+ and +should_not+ +change+
     # must use the <tt>{}</tt> form (<tt>do/end</tt> is not supported)

data/lib/spec/matchers/exist.rb

@@ -0,0 +1,17 @@
+module Spec
+  module Matchers
+    class Exist
+      def matches? actual
+        @actual = actual
+        @actual.exist?
+      end
+      def failure_message
+        "expected #{@actual.inspect} to exist, but it doesn't."
+      end
+      def negative_failure_message
+        "expected #{@actual.inspect} to not exist, but it does."
+      end
+    end
+    def exist; Exist.new; end
+  end
+end