rspec 1.1.5 → 1.1.6

data/History.txt

@@ -1,4 +1,15 @@
-=== Version 1.1.5
+=== Version 1.1.6 / 2008-10-02
+
+* 2 bug fixes
+
+	* fixed bug where negative message expectations following stubs resulted in false (negative) positives (Pat Maddox). Closes #548.
+	* fixed bug where Not Yet Implemented examples report incorrect caller (Scott Taylor). Closes #547.
+
+* 1 minor enhancement
+
+	* removed deprecated mock argument constraint symbols
+
+=== Version 1.1.5 / 2008-09-28
 
 IMPORTANT: use the new 'autospec' command instead of 'autotest'. We changed
 the way autotest discovers rspec so the autotest executable won't

data/Manifest.txt

@@ -204,15 +204,14 @@ rake_tasks/failing_examples_with_html.rake
 rake_tasks/verify_rcov.rake
 rspec.gemspec
 spec/README.jruby
+spec/autotest/autotest_helper.rb
+spec/autotest/autotest_matchers.rb
 spec/autotest/discover_spec.rb
 spec/autotest/rspec_spec.rb
-spec/autotest_helper.rb
-spec/autotest_matchers.rb
 spec/rspec_suite.rb
 spec/ruby_forker.rb
 spec/spec.opts
 spec/spec/adapters/ruby_engine_spec.rb
-spec/spec/example/base_formatter_spec.rb
 spec/spec/example/configuration_spec.rb
 spec/spec/example/example_group/described_module_spec.rb
 spec/spec/example/example_group/warning_messages_spec.rb
@@ -300,6 +299,7 @@ spec/spec/runner/drb_command_line_spec.rb
 spec/spec/runner/empty_file.txt
 spec/spec/runner/examples.txt
 spec/spec/runner/failed.txt
+spec/spec/runner/formatter/base_formatter_spec.rb
 spec/spec/runner/formatter/failing_example_groups_formatter_spec.rb
 spec/spec/runner/formatter/failing_examples_formatter_spec.rb
 spec/spec/runner/formatter/html_formatted-1.8.4.html

data/Rakefile

@@ -19,7 +19,6 @@ Hoe.new('rspec', Spec::VERSION::STRING) do |p|
   p.description = "Behaviour Driven Development for Ruby."
   p.rubyforge_name = 'rspec'
   p.developer('RSpec Development Team', 'rspec-devel@rubyforge.org')
-  p.spec_extras = { :to_ruby => lambda { |str| File.open("rspec.gemspec", "w+"){ |f| f.puts str } } }
 end
 
 ['audit','test','test_deps','default','publish_docs','post_blog'].each do |task|

data/TODO.txt

@@ -1 +1,9 @@
+== 1.1.6
 
+* resolve windows tty/colorization issue
+
+== Future
+
+* do SOMETHING with the website
+* extract spec/story to rspec-stories (new gem)
+* remove the ruby engine adapter unless Rubinius team plans to use it

data/bin/autospec

@@ -1,4 +1,3 @@
 #!/usr/bin/env ruby
 ENV['RSPEC'] = 'true'
-ENV['AUTOTEST'] = 'true'
 system("autotest", *ARGV)

data/examples/pure/autogenerated_docstrings_example.rb

@@ -5,15 +5,15 @@ require File.dirname(__FILE__) + '/spec_helper'
 describe "Examples with no descriptions" do
   
   # description is auto-generated as "should equal(5)" based on the last #should
-  it do
+  specify do
     3.should equal(3)
     5.should equal(5)
   end
   
-  it { 3.should be < 5 }
+  specify { 3.should be < 5 }
   
-  it { ["a"].should include("a") }
+  specify { ["a"].should include("a") }
   
-  it { [1,2,3].should respond_to(:size) }
+  specify { [1,2,3].should respond_to(:size) }
   
 end

data/lib/autotest/discover.rb

@@ -1,3 +1,3 @@
 Autotest.add_discovery do
-  "rspec" if File.exist?('spec') && ENV['RSPEC']
+  "rspec" if File.directory?('spec') && ENV['RSPEC']
 end

data/lib/spec/example/errors.rb

@@ -1,15 +1,30 @@
 module Spec
   module Example
     class ExamplePendingError < StandardError
-      def initialize(a_message=nil)
+      attr_reader :pending_caller
+
+      def initialize(message=nil)
         super
         @pending_caller = caller[2]
       end
+    end
+    
+    class NotYetImplementedError < ExamplePendingError
+      MESSAGE = "Not Yet Implemented"
+      RSPEC_ROOT_LIB = File.expand_path(File.dirname(__FILE__) + "/../..")
       
-      attr_reader :pending_caller
+      def initialize(backtrace)
+        super(MESSAGE)
+        @pending_caller = pending_caller_from(backtrace)
+      end
+      
+    private
+      
+      def pending_caller_from(backtrace)
+        backtrace.detect {|line| !line.include?(RSPEC_ROOT_LIB) }
+      end
     end
 
-    class PendingExampleFixedError < StandardError
-    end
+    class PendingExampleFixedError < StandardError; end
   end
 end

data/lib/spec/example/example_group.rb

@@ -8,7 +8,14 @@ module Spec
 
       def initialize(defined_description, &implementation)
         @_defined_description = defined_description
-        @_implementation = implementation
+        @_implementation = implementation || pending_implementation
+      end
+      
+    private
+      
+      def pending_implementation
+        error = NotYetImplementedError.new(caller)
+        lambda { raise(error) }
       end
     end
   end

data/lib/spec/example/example_group_methods.rb

@@ -38,24 +38,30 @@ module Spec
       def describe(*args, &example_group_block)
         args << {} unless Hash === args.last
         if example_group_block
-          params = args.last
-          params[:spec_path] = eval("caller(0)[1]", example_group_block) unless params[:spec_path]
-          if params[:shared]
-            SharedExampleGroup.new(*args, &example_group_block)
+          options = args.last
+          options[:spec_path] = eval("caller(0)[1]", example_group_block) unless options[:spec_path]
+          if options[:shared]
+            create_shared_example_group(args, example_group_block)
           else
-            self.subclass("Subclass") do
-              describe(*args)
-              module_eval(&example_group_block)
-            end
+            create_nested_example_group(args, example_group_block)
           end
         else
           set_description(*args)
-          before_eval
-          self
         end
       end
       alias :context :describe
-
+      
+      def create_shared_example_group(args, example_group_block)
+        SharedExampleGroup.new(*args, &example_group_block)
+      end
+      
+      def create_nested_example_group(args, example_group_block)
+        self.subclass("Subclass") do
+          describe(*args)
+          module_eval(&example_group_block)
+        end
+      end
+      
       # Use this to pull in examples from shared example groups.
       # See Spec::Runner for information about shared example groups.
       def it_should_behave_like(shared_example_group)
@@ -103,21 +109,24 @@ module Spec
         @predicate_matchers ||= {:an_instance_of => :is_a?}
       end
 
-      # Creates an instance of Spec::Example::Example and adds
-      # it to a collection of examples of the current example group.
-      def it(description=nil, &implementation)
+      # Creates an instance of the current example group class and adds it to
+      # a collection of examples of the current example group.
+      def example(description=nil, &implementation)
         e = new(description, &implementation)
         example_objects << e
         e
       end
 
-      alias_method :specify, :it
+      alias_method :it, :example
+      alias_method :specify, :example
 
       # Use this to temporarily disable an example.
-      def xit(description=nil, opts={}, &block)
+      def xexample(description=nil, opts={}, &block)
         Kernel.warn("Example disabled: #{description}")
       end
-      alias_method :xspecify, :xit
+      
+      alias_method :xit, :xexample
+      alias_method :xspecify, :xexample
 
       def run
         examples = examples_to_run
@@ -410,9 +419,6 @@ module Spec
         end
       end
 
-      def before_eval
-      end
-
       def add_method_examples(examples)
         instance_methods.sort.each do |method_name|
           if example_method?(method_name)

data/lib/spec/example/example_methods.rb

@@ -5,11 +5,6 @@ module Spec
       extend ModuleReopeningFix
       include ModuleInclusionWarnings
       
-
-      PENDING_EXAMPLE_BLOCK = lambda {
-        raise Spec::Example::ExamplePendingError.new("Not Yet Implemented")
-      }
-
       def execute(options, instance_variables)
         options.reporter.example_started(self)
         set_instance_variables_from_hash(instance_variables)
@@ -80,7 +75,7 @@ module Spec
       end
 
       def eval_block
-        return instance_eval(&(@_implementation || PENDING_EXAMPLE_BLOCK))
+        instance_eval(&@_implementation)
       end
 
       def implementation_backtrace
@@ -104,4 +99,4 @@ module Spec
       end
     end
   end
-end
+end

data/lib/spec/matchers/be.rb

@@ -12,11 +12,11 @@ module Spec
         @comparison = ""
       end
       
-      def matches?(actual)
-        @actual = actual
+      def matches?(given)
+        @given = given
         if handling_predicate?
           begin
-            return @result = actual.__send__(predicate, *@args)
+            return @result = given.__send__(predicate, *@args)
           rescue => predicate_error
             # This clause should be empty, but rcov will not report it as covered
             # unless something (anything) is executed within the clause
@@ -24,7 +24,7 @@ module Spec
           end
 
           begin
-            return @result = actual.__send__(present_tense_predicate, *@args)
+            return @result = given.__send__(present_tense_predicate, *@args)
           rescue
             raise predicate_error
           end
@@ -34,12 +34,12 @@ module Spec
       end
       
       def failure_message
-        return "expected #{@comparison}#{expected}, got #{@actual.inspect}" unless handling_predicate?
+        return "expected #{@comparison}#{expected}, got #{@given.inspect}" unless handling_predicate?
         return "expected #{predicate}#{args_to_s} to return true, got #{@result.inspect}"
       end
       
       def negative_failure_message
-        return "expected not #{expected}, got #{@actual.inspect}" unless handling_predicate?
+        return "expected not #{expected}, got #{@given.inspect}" unless handling_predicate?
         return "expected #{predicate}#{args_to_s} to return false, got #{@result.inspect}"
       end
       
@@ -52,17 +52,17 @@ 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
-        return @actual < @expected if @less_than
-        return @actual <= @expected if @less_than_or_equal
-        return @actual >= @expected if @greater_than_or_equal
-        return @actual > @expected if @greater_than
-        return @actual == @expected if @double_equal
-        return @actual === @expected if @triple_equal
-        return @actual.equal?(@expected)
+        return @given ? true : false if @expected == :satisfy_if
+        return @given == true if @expected == :true
+        return @given == false if @expected == :false
+        return @given.nil? if @expected == :nil
+        return @given < @expected if @less_than
+        return @given <= @expected if @less_than_or_equal
+        return @given >= @expected if @greater_than_or_equal
+        return @given > @expected if @greater_than
+        return @given == @expected if @double_equal
+        return @given === @expected if @triple_equal
+        return @given.equal?(@expected)
       end
       
       def ==(expected)
@@ -189,7 +189,7 @@ module Spec
     #   should_not be_nil
     #   should_not be_arbitrary_predicate(*args)
     #
-    # Given true, false, or nil, will pass if actual is
+    # Given true, false, or nil, will pass if given value is
     # true, false or nil (respectively). Given no args means
     # the caller should satisfy an if condition (to be or not to be). 
     #

data/lib/spec/matchers/be_close.rb

@@ -7,13 +7,13 @@ module Spec
         @delta = delta
       end
       
-      def matches?(actual)
-        @actual = actual
-        (@actual - @expected).abs < @delta
+      def matches?(given)
+        @given = given
+        (@given - @expected).abs < @delta
       end
       
       def failure_message
-        "expected #{@expected} +/- (< #{@delta}), got #{@actual}"
+        "expected #{@expected} +/- (< #{@delta}), got #{@given}"
       end
       
       def description
@@ -25,7 +25,7 @@ module Spec
     #   should be_close(expected, delta)
     #   should_not be_close(expected, delta)
     #
-    # Passes if actual == expected +/- delta
+    # Passes if given == expected +/- delta
     #
     # == Example
     #

data/lib/spec/matchers/eql.rb

@@ -6,17 +6,17 @@ module Spec
         @expected = expected
       end
   
-      def matches?(actual)
-        @actual = actual
-        @actual.eql?(@expected)
+      def matches?(given)
+        @given = given
+        @given.eql?(@expected)
       end
 
       def failure_message
-        return "expected #{@expected.inspect}, got #{@actual.inspect} (using .eql?)", @expected, @actual
+        return "expected #{@expected.inspect}, got #{@given.inspect} (using .eql?)", @expected, @given
       end
       
       def negative_failure_message
-        return "expected #{@actual.inspect} not to equal #{@expected.inspect} (using .eql?)", @expected, @actual
+        return "expected #{@given.inspect} not to equal #{@expected.inspect} (using .eql?)", @expected, @given
       end
 
       def description
@@ -28,7 +28,7 @@ module Spec
     #   should eql(expected)
     #   should_not eql(expected)
     #
-    # Passes if actual and expected are of equal value, but not necessarily the same object.
+    # Passes if given and expected are of equal value, but not necessarily the same object.
     #
     # See http://www.ruby-doc.org/core/classes/Object.html#M001057 for more information about equality in Ruby.
     #

data/lib/spec/matchers/equal.rb

@@ -6,17 +6,17 @@ module Spec
         @expected = expected
       end
   
-      def matches?(actual)
-        @actual = actual
-        @actual.equal?(@expected)
+      def matches?(given)
+        @given = given
+        @given.equal?(@expected)
       end
 
       def failure_message
-        return "expected #{@expected.inspect}, got #{@actual.inspect} (using .equal?)", @expected, @actual
+        return "expected #{@expected.inspect}, got #{@given.inspect} (using .equal?)", @expected, @given
       end
 
       def negative_failure_message
-        return "expected #{@actual.inspect} not to equal #{@expected.inspect} (using .equal?)", @expected, @actual
+        return "expected #{@given.inspect} not to equal #{@expected.inspect} (using .equal?)", @expected, @given
       end
       
       def description
@@ -28,7 +28,7 @@ module Spec
     #   should equal(expected)
     #   should_not equal(expected)
     #
-    # Passes if actual and expected are the same object (object identity).
+    # Passes if given and expected are the same object (object identity).
     #
     # See http://www.ruby-doc.org/core/classes/Object.html#M001057 for more information about equality in Ruby.
     #

data/lib/spec/matchers/exist.rb

@@ -1,17 +1,22 @@
 module Spec
   module Matchers
     class Exist
-      def matches? actual
-        @actual = actual
-        @actual.exist?
+      def matches?(given)
+        @given = given
+        @given.exist?
       end
       def failure_message
-        "expected #{@actual.inspect} to exist, but it doesn't."
+        "expected #{@given.inspect} to exist, but it doesn't."
       end
       def negative_failure_message
-        "expected #{@actual.inspect} to not exist, but it does."
+        "expected #{@given.inspect} to not exist, but it does."
       end
     end
+    # :call-seq:
+    #   should exist
+    #   should_not exist
+    #
+    # Passes if given.exist?
     def exist; Exist.new; end
   end
 end