dchelimsky-rspec 1.1.11.3 → 1.1.11.4

data/History.txt

@@ -23,7 +23,7 @@
   * SpecParser can't handle backtrace paths with colons (John-Mason P. Shackelford). Closes #505.
   * html formatter (and subsequently the textmate formatter) header fills in completely when running a single example
   
-* 7 bug fixes
+* 8 bug fixes
 
   * fixed bug where {:a => 1, :b => 2}.should include(:a, :b) failed (Yossef Mendelssohn)
   * only try to load Test::Unit if Test::Unit is defined (not just Test)
@@ -32,6 +32,7 @@
   * Removed incorrect -S flag on autospec commands. Added explicit spec command for ruby to run, guarantee running rspec (raggi). Closes #507.
   * Check whether test/unit has really been loaded before calling a method it defines (Brian Donovan). Closes #503.
   * Fix spec_path for shared groups (Zach Dennis). Closes #615.
+  * stubbed message expectation not verified if it has been called *before* the expectation (Matthias Hennemeyer). Closes #637.
   
 === Version 1.1.11 / 2008-10-24
 

data/Manifest.txt

@@ -10,8 +10,8 @@ bin/spec
 examples/failing/README.txt
 examples/failing/diffing_spec.rb
 examples/failing/failing_autogenerated_docstrings_example.rb
-examples/failing/failure_in_setup.rb
-examples/failing/failure_in_teardown.rb
+examples/failing/failure_in_after.rb
+examples/failing/failure_in_before.rb
 examples/failing/mocking_example.rb
 examples/failing/mocking_with_flexmock.rb
 examples/failing/mocking_with_mocha.rb
@@ -78,7 +78,6 @@ lib/spec/dsl.rb
 lib/spec/dsl/main.rb
 lib/spec/example.rb
 lib/spec/example/before_and_after_hooks.rb
-lib/spec/example/configuration.rb
 lib/spec/example/errors.rb
 lib/spec/example/example_group.rb
 lib/spec/example/example_group_factory.rb
@@ -95,7 +94,6 @@ lib/spec/expectations/extensions.rb
 lib/spec/expectations/extensions/object.rb
 lib/spec/expectations/extensions/string_and_symbol.rb
 lib/spec/expectations/handler.rb
-lib/spec/expectations/wrap_expectation.rb
 lib/spec/interop/test.rb
 lib/spec/interop/test/unit/autorunner.rb
 lib/spec/interop/test/unit/testcase.rb
@@ -123,6 +121,7 @@ lib/spec/matchers/respond_to.rb
 lib/spec/matchers/satisfy.rb
 lib/spec/matchers/simple_matcher.rb
 lib/spec/matchers/throw_symbol.rb
+lib/spec/matchers/wrap_expectation.rb
 lib/spec/mocks.rb
 lib/spec/mocks/argument_constraints.rb
 lib/spec/mocks/argument_expectation.rb
@@ -144,6 +143,7 @@ lib/spec/runner.rb
 lib/spec/runner/backtrace_tweaker.rb
 lib/spec/runner/class_and_arguments_parser.rb
 lib/spec/runner/command_line.rb
+lib/spec/runner/configuration.rb
 lib/spec/runner/drb_command_line.rb
 lib/spec/runner/example_group_runner.rb
 lib/spec/runner/formatter/base_formatter.rb
@@ -208,7 +208,6 @@ spec/rspec_suite.rb
 spec/ruby_forker.rb
 spec/spec.opts
 spec/spec/dsl/main_spec.rb
-spec/spec/example/configuration_spec.rb
 spec/spec/example/example_group_class_definition_spec.rb
 spec/spec/example/example_group_factory_spec.rb
 spec/spec/example/example_group_methods_spec.rb
@@ -290,10 +289,12 @@ spec/spec/mocks/passing_mock_argument_constraints_spec.rb
 spec/spec/mocks/precise_counts_spec.rb
 spec/spec/mocks/record_messages_spec.rb
 spec/spec/mocks/stub_spec.rb
+spec/spec/mocks/stubbed_message_expectations_spec.rb
 spec/spec/mocks/twice_counts_spec.rb
 spec/spec/package/bin_spec_spec.rb
 spec/spec/runner/class_and_argument_parser_spec.rb
 spec/spec/runner/command_line_spec.rb
+spec/spec/runner/configuration_spec.rb
 spec/spec/runner/drb_command_line_spec.rb
 spec/spec/runner/empty_file.txt
 spec/spec/runner/examples.txt

data/TODO.txt

@@ -1,10 +1,18 @@
+== Refactoring
+
+Refactoring for 1.2.0
+
+* eliminate dependency from Spec::Example to Spec::Runner
+** global predictate matchers should be stored in run_options
+* eliminate dependency on global options and configuration
+** the only place they should exist is in the Runner, which should manage them
+
 == 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
 * rename top level namespace to Rspec and commands to 'rspec' and 'autorspec'
   * continue to support Spec 'spec' and 'autospec' as aliases for a reasonable time
 * separate the underlying framework from the DSL
   * be able to do everything with classes and methods
-* tweak raise_error rdoc to show only one arg
+* tweak raise_error rdoc to show only one arg

data/examples/failing/{failure_in_teardown.rb → failure_in_after.rb}

@@ -1,6 +1,6 @@
 describe "This example" do
   
-  it "should be listed as failing in teardown" do
+  it "should be listed as failing in after" do
   end
   
   after(:each) do

data/examples/failing/{failure_in_setup.rb → failure_in_before.rb}

@@ -4,7 +4,7 @@ describe "This example" do
     NonExistentClass.new
   end
   
-  it "should be listed as failing in setup" do
+  it "should be listed as failing in each" do
   end
   
 end

data/features/example_groups/autogenerated_docstrings.feature

@@ -12,7 +12,7 @@ Feature: autogenerated docstrings
     Then the stdout should match /should equal 5/
     And the stdout should match /should be < 5/
     And the stdout should match /should include "a"/
-    And the stdout should match /should respond to \[:size\]/
+    And the stdout should match /should respond to #size/
 
   Scenario: run failing examples with ruby
     Given the file ../../examples/failing/failing_autogenerated_docstrings_example.rb
@@ -22,7 +22,7 @@ Feature: autogenerated docstrings
     Then the stdout should match /should equal 2/
     And the stdout should match /should be > 5/
     And the stdout should match /should include "b"/
-    And the stdout should match /should not respond to \[:size\]/
+    And the stdout should match /should not respond to #size/
 
   Scenario: run passing examples with spec
     Given the file ../../examples/passing/autogenerated_docstrings_example.rb
@@ -32,7 +32,7 @@ Feature: autogenerated docstrings
     Then the stdout should match /should equal 5/
     And the stdout should match /should be < 5/
     And the stdout should match /should include "a"/
-    And the stdout should match /should respond to \[:size\]/
+    And the stdout should match /should respond to #size/
 
   Scenario: run failing examples with spec
     Given the file ../../examples/failing/failing_autogenerated_docstrings_example.rb
@@ -42,4 +42,4 @@ Feature: autogenerated docstrings
     Then the stdout should match /should equal 2/
     And the stdout should match /should be > 5/
     And the stdout should match /should include "b"/
-    And the stdout should match /should not respond to \[:size\]/
+    And the stdout should match /should not respond to #size/

data/features/example_groups/nested_groups.feature

@@ -10,7 +10,7 @@ Feature: Nested example groups
     Then the stdout should match /Stack \(empty\)/
     And the stdout should match /Stack \(full\)/
 
-  Scenario: Run with ruby
+  Scenario: Run with spec
     Given the file ../../examples/passing/stack_spec_with_nested_example_groups.rb
     When I run it with the spec script -fs
     Then the stdout should match /Stack \(empty\)/

data/features/support/env.rb

@@ -2,6 +2,7 @@ require 'tempfile'
 require File.dirname(__FILE__) + '/../../spec/ruby_forker'
 require File.dirname(__FILE__) + '/matchers/smart_match'
 
+$:.push File.join(File.dirname(__FILE__), "/../../lib")
 require 'spec/expectations'
 require 'spec/matchers'
 

data/lib/adapters/mock_frameworks/flexmock.rb

@@ -6,7 +6,7 @@
 require 'flexmock/rspec'
 
 module Spec
-  module Plugins
+  module Adapters
     module MockFramework
       include FlexMock::MockContainer
       def setup_mocks_for_rspec

data/lib/adapters/mock_frameworks/mocha.rb

@@ -2,7 +2,7 @@ require 'mocha/standalone'
 require 'mocha/object'
 
 module Spec
-  module Plugins
+  module Adapters
     module MockFramework
       include Mocha::Standalone
       def setup_mocks_for_rspec

data/lib/adapters/mock_frameworks/rr.rb

@@ -4,7 +4,7 @@ patterns = ::Spec::Runner::QuietBacktraceTweaker::IGNORE_PATTERNS
 patterns.push(RR::Errors::BACKTRACE_IDENTIFIER)
 
 module Spec
-  module Plugins
+  module Adapters
     module MockFramework
       include RR::Extensions::InstanceMethods
       def setup_mocks_for_rspec

data/lib/adapters/mock_frameworks/rspec.rb

@@ -3,7 +3,7 @@ require 'spec/mocks/framework'
 require 'spec/mocks/extensions'
 
 module Spec
-  module Plugins
+  module Adapters
     module MockFramework
       include Spec::Mocks::ExampleMethods
       def setup_mocks_for_rspec

data/lib/spec/example.rb

@@ -182,6 +182,5 @@ require 'spec/example/example_group'
 require 'spec/example/shared_example_group'
 require 'spec/example/example_group_factory'
 require 'spec/example/errors'
-require 'spec/example/configuration'
 require 'spec/example/example_matcher'
 

data/lib/spec/example/example_group_methods.rb

@@ -2,23 +2,23 @@ module Spec
   module Example
 
     module ExampleGroupMethods
-      include Spec::Example::BeforeAndAfterHooks
-      
-      def self.matcher_class
-        @matcher_class
-      end
-      
-      def self.matcher_class=(matcher_class)
-        @matcher_class = matcher_class
-      end
+      class << self
+        attr_accessor :matcher_class
 
-      def self.description_text(*args)
-        args.inject("") do |description, arg|
-          description << " " unless (description == "" || arg.to_s =~ /^(\s|\.|#)/)
-          description << arg.to_s
+        def description_text(*args)
+          args.inject("") do |description, arg|
+            description << " " unless (description == "" || arg.to_s =~ /^(\s|\.|#)/)
+            description << arg.to_s
+          end
+        end
+
+        def example_group_creation_listeners
+          @example_group_creation_listeners ||= []
         end
       end
 
+      include Spec::Example::BeforeAndAfterHooks
+
       attr_reader :description_options, :spec_path
       alias :options :description_options
       
@@ -42,8 +42,13 @@ WARNING
 
       def inherited(klass)
         super
-        Spec::Runner.options.add_example_group klass
-        Spec::Runner.register_at_exit_hook
+        register_example_group(klass)
+      end
+      
+      def register_example_group(klass)
+        ExampleGroupMethods.example_group_creation_listeners.each do |l|
+          l.register_example_group(klass)
+        end
       end
       
       # Makes the describe/it syntax available from a class. For example:
@@ -103,7 +108,6 @@ WARNING
       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_groups)
         shared_example_groups.each do |group|
           include_shared_example_group(group)
@@ -118,7 +122,7 @@ WARNING
       # a predicate on your class. RSpec provides a couple of these
       # out of the box:
       #
-      #   exist (or state expectations)
+      #   exist (for state expectations)
       #     File.should exist("path/to/file")
       #
       #   an_instance_of (for mock argument constraints)
@@ -167,8 +171,8 @@ WARNING
         return true if examples.empty?
         return dry_run(examples, run_options) if run_options.dry_run?
 
-        plugin_mock_framework
-        define_methods_from_predicate_matchers
+        plugin_mock_framework(run_options)
+        define_methods_from_predicate_matchers(run_options)
 
         success, before_all_instance_variables = run_before_all(run_options)
         success, after_all_instance_variables  = execute_examples(success, before_all_instance_variables, examples, run_options)
@@ -331,19 +335,19 @@ WARNING
         klass.kind_of?(ExampleGroupMethods) && klass.included_modules.include?(ExampleMethods)
       end
 
-      def plugin_mock_framework
-        case mock_framework = Spec::Runner.configuration.mock_framework
+      def plugin_mock_framework(run_options)
+        case mock_framework = run_options.mock_framework
         when Module
           include mock_framework
         else
-          require Spec::Runner.configuration.mock_framework
-          include Spec::Plugins::MockFramework
+          require mock_framework
+          include Spec::Adapters::MockFramework
         end
       end
 
-      def define_methods_from_predicate_matchers # :nodoc:
+      def define_methods_from_predicate_matchers(run_options) # :nodoc:
         all_predicate_matchers = predicate_matchers.merge(
-          Spec::Runner.configuration.predicate_matchers
+          run_options.predicate_matchers
         )
         all_predicate_matchers.each_pair do |matcher_method, method_on_object|
           define_method matcher_method do |*args|

data/lib/spec/expectations.rb

@@ -2,7 +2,6 @@ require 'spec/matchers'
 require 'spec/expectations/errors'
 require 'spec/expectations/extensions'
 require 'spec/expectations/handler'
-require 'spec/expectations/wrap_expectation'
 
 module Spec
   

data/lib/spec/matchers.rb

@@ -18,6 +18,7 @@ require 'spec/matchers/raise_error'
 require 'spec/matchers/respond_to'
 require 'spec/matchers/satisfy'
 require 'spec/matchers/throw_symbol'
+require 'spec/matchers/wrap_expectation'
 
 module Spec
 

data/lib/spec/matchers/equal.rb

@@ -5,7 +5,7 @@ module Spec
     #   should equal(expected)
     #   should_not equal(expected)
     #
-    # Passes if given and expected are the same object (object identity).
+    # Passes if actual 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/respond_to.rb

@@ -4,30 +4,55 @@ module Spec
     class RespondTo #:nodoc:
       def initialize(*names)
         @names = names
+        @expected_arity = nil
         @names_not_responded_to = []
       end
       
-      def matches?(given)
-        @given = given
+      def matches?(actual)
+        @actual = actual
         @names.each do |name|
-          unless given.respond_to?(name)
-            @names_not_responded_to << name
-          end
+          @names_not_responded_to << name unless actual.respond_to?(name) && matches_arity?(actual, name)
         end
         return @names_not_responded_to.empty?
       end
       
       def failure_message
-        "expected #{@given.inspect} to respond to #{@names_not_responded_to.collect {|name| name.inspect }.join(', ')}"
+        "expected #{@actual.inspect} to respond to #{@names_not_responded_to.collect {|name| name.inspect }.join(', ')}#{with_arity}"
       end
       
       def negative_failure_message
-        "expected #{@given.inspect} not to respond to #{@names.collect {|name| name.inspect }.join(', ')}"
+        "expected #{@actual.inspect} not to respond to #{@names.collect {|name| name.inspect }.join(', ')}"
       end
       
       def description
         # Ruby 1.9 returns the same thing for array.to_s as array.inspect, so just use array.inspect here
-        "respond to #{@names.inspect}"
+        "respond to #{pp_names}#{with_arity}"
+      end
+      
+      def with(n)
+        @expected_arity = n
+        self
+      end
+      
+      def argument
+        self
+      end
+      alias :arguments :argument
+      
+    private
+      
+      def matches_arity?(actual, name)
+        @expected_arity.nil?? true :
+          @expected_arity == actual.method(name).arity 
+      end
+      
+      def with_arity
+        @expected_arity.nil?? "" :
+          " with #{@expected_arity} argument#{@expected_arity == 1 ? '' : 's'}"
+      end
+      
+      def pp_names
+        @names.length == 1 ? "##{@names.first}" : @names.inspect
       end
     end
     

data/lib/spec/{expectations → matchers}/wrap_expectation.rb

@@ -1,6 +1,5 @@
 module Spec
   module Matchers
-    
     # wraps an expectation in a block that will return true if the
     # expectation passes and false if it fails (without bubbling up
     # the failure).

data/lib/spec/mocks/message_expectation.rb

@@ -32,6 +32,7 @@ module Spec
         child.expected_from = expected_from
         child.method_block = method_block
         child.expected_received_count = expected_received_count
+        child.clear_actual_received_count!
         new_gen = error_generator.clone
         new_gen.opts = opts
         child.error_generator = new_gen
@@ -87,7 +88,7 @@ module Spec
         @args_to_yield << args
         self
       end
-  
+      
       def matches(sym, args)
         @sym == sym and @args_expectation.args_match?(args)
       end
@@ -191,7 +192,7 @@ module Spec
         @sym == sym and not @args_expectation.args_match?(args)
       end
        
-      def verify_messages_received   
+      def verify_messages_received
         return if expected_messages_received? || failed_fast?
     
         generate_error
@@ -309,6 +310,10 @@ module Spec
               2
           end
         end
+        
+        def clear_actual_received_count!
+          @actual_received_count = 0
+        end
       
     end