rspec 1.1.12 → 1.2.0

data/lib/spec/mocks/{argument_constraints.rb → argument_matchers.rb}

@@ -1,21 +1,21 @@
 module Spec
   module Mocks
 
-    # ArgumentConstraints are messages that you can include in message
+    # ArgumentMatchers are messages that you can include in message
     # expectations to match arguments against a broader check than simple
     # equality.
     #
-    # With the exception of any_args() and no_args(), the constraints
+    # With the exception of any_args() and no_args(), the matchers
     # are all positional - they match against the arg in the given position.
-    module ArgumentConstraints
+    module ArgumentMatchers
 
-      class AnyArgsConstraint
+      class AnyArgsMatcher
         def description
           "any args"
         end
       end
 
-      class AnyArgConstraint
+      class AnyArgMatcher
         def initialize(ignore)
         end
 
@@ -24,17 +24,13 @@ module Spec
         end
       end
 
-      class NoArgsConstraint
+      class NoArgsMatcher
         def description
           "no args"
         end
-
-        def ==(args)
-          args == []
-        end
       end
 
-      class RegexpConstraint
+      class RegexpMatcher
         def initialize(regexp)
           @regexp = regexp
         end
@@ -45,7 +41,7 @@ module Spec
         end
       end
 
-      class BooleanConstraint
+      class BooleanMatcher
         def initialize(ignore)
         end
 
@@ -54,7 +50,7 @@ module Spec
         end
       end
 
-      class HashIncludingConstraint
+      class HashIncludingMatcher
         def initialize(expected)
           @expected = expected
         end
@@ -73,7 +69,7 @@ module Spec
         end
       end
       
-      class HashNotIncludingConstraint
+      class HashNotIncludingMatcher
         def initialize(expected)
           @expected = expected
         end
@@ -92,7 +88,7 @@ module Spec
         end
       end
       
-      class DuckTypeConstraint
+      class DuckTypeMatcher
         def initialize(*methods_to_respond_to)
           @methods_to_respond_to = methods_to_respond_to
         end
@@ -102,7 +98,7 @@ module Spec
         end
       end
 
-      class MatcherConstraint
+      class MatcherMatcher
         def initialize(matcher)
           @matcher = matcher
         end
@@ -148,7 +144,7 @@ module Spec
       # Passes if object receives :message with any args at all. This is
       # really a more explicit variation of object.should_receive(:message)
       def any_args
-        AnyArgsConstraint.new
+        AnyArgsMatcher.new
       end
       
       # :call-seq:
@@ -156,7 +152,7 @@ module Spec
       #
       # Passes as long as there is an argument.
       def anything
-        AnyArgConstraint.new(nil)
+        AnyArgMatcher.new(nil)
       end
       
       # :call-seq:
@@ -164,7 +160,7 @@ module Spec
       #
       # Passes if no arguments are passed along with the message
       def no_args
-        NoArgsConstraint.new
+        NoArgsMatcher.new
       end
       
       # :call-seq:
@@ -180,7 +176,7 @@ module Spec
       #   display.should_receive(:present_names).with(duck_type(:length, :each))
       #   => passes
       def duck_type(*args)
-        DuckTypeConstraint.new(*args)
+        DuckTypeMatcher.new(*args)
       end
 
       # :call-seq:
@@ -188,7 +184,7 @@ module Spec
       #
       # Passes if the argument is boolean.
       def boolean
-        BooleanConstraint.new(nil)
+        BooleanMatcher.new(nil)
       end
       
       # :call-seq:
@@ -198,7 +194,7 @@ module Spec
       # Passes if the argument is a hash that includes the specified key(s) or key/value
       # pairs. If the hash includes other keys, it will still pass.
       def hash_including(*args)
-        HashIncludingConstraint.new(anythingize_lonely_keys(*args))
+        HashIncludingMatcher.new(anythingize_lonely_keys(*args))
       end
       
       # :call-seq:
@@ -208,7 +204,7 @@ module Spec
       #
       # Passes if the argument is a hash that doesn't include the specified key(s) or key/value
       def hash_not_including(*args)
-        HashNotIncludingConstraint.new(anythingize_lonely_keys(*args))
+        HashNotIncludingMatcher.new(anythingize_lonely_keys(*args))
       end
       
       # Passes if arg.instance_of?(klass)

data/lib/spec/mocks/error_generator.rb

@@ -42,9 +42,10 @@ module Spec
         __raise "#{intro} yielded |#{arg_list(*args_to_yield)}| to block with arity of #{arity}"
       end
       
-      private
+    private
+
       def intro
-        @name ? "Mock '#{@name}'" : @target.class == Class ? "<#{@target.inspect} (class)>" : (@target.nil? ? "nil" : @target.to_s)
+        @name ? "Mock '#{@name}'" : @target.class == Class ? "<#{@target.inspect} (class)>" : (@target.nil? ? "nil" : @target)
       end
       
       def __raise(message)
@@ -57,15 +58,11 @@ module Spec
       end
       
       def format_args(*args)
-        return "(no args)" if args.empty? || args == [:no_args]
-        return "(any args)" if args == [:any_args]
-        "(" + arg_list(*args) + ")"
+        args.empty? ? "(no args)" : "(" + arg_list(*args) + ")"
       end
 
       def arg_list(*args)
-        args.collect do |arg|
-          arg.respond_to?(:description) ? arg.description : arg.inspect
-        end.join(", ")
+        args.collect {|arg| arg.respond_to?(:description) ? arg.description : arg.inspect}.join(", ")
       end
       
       def count_message(count)

data/lib/spec/mocks/framework.rb

@@ -3,7 +3,7 @@
 # object in the system.
 
 require 'spec/mocks/methods'
-require 'spec/mocks/argument_constraints'
+require 'spec/mocks/argument_matchers'
 require 'spec/mocks/spec_methods'
 require 'spec/mocks/proxy'
 require 'spec/mocks/mock'

data/lib/spec/mocks/message_expectation.rb

@@ -17,7 +17,7 @@ module Spec
         @return_block = nil
         @actual_received_count = 0
         @expected_received_count = expected_received_count
-        @args_expectation = ArgumentExpectation.new([ArgumentConstraints::AnyArgsConstraint.new])
+        @args_expectation = ArgumentExpectation.new([ArgumentMatchers::AnyArgsMatcher.new])
         @consecutive = false
         @exception_to_raise = nil
         @symbol_to_throw = nil
@@ -56,8 +56,6 @@ module Spec
                                                     @expected_received_count < values.size
         end
         @return_block = block_given? ? return_block : lambda { value }
-        # Ruby 1.9 - see where this is used below
-        @ignore_args = !block_given?
       end
       
       # :call-seq:
@@ -157,9 +155,7 @@ module Spec
       end
       
       def invoke_consecutive_return_block(args, block)
-        args << block unless block.nil?
-        value = @return_block.call(*args)
-        
+        value = invoke_return_block(args, block)
         index = [@actual_received_count, value.size-1].min
         value[index]
       end
@@ -169,13 +165,9 @@ module Spec
         # Ruby 1.9 - when we set @return_block to return values
         # regardless of arguments, any arguments will result in
         # a "wrong number of arguments" error
-        if @ignore_args
-          @return_block.call()
-        else
-          @return_block.call(*args)
-        end
+        @return_block.arity > 0 ? @return_block.call(*args) : @return_block.call()
       end
-
+      
       def clone_args_to_yield(args)
         @args_to_yield = args.clone
         @args_to_yield_were_cloned = true
@@ -234,7 +226,7 @@ module Spec
         if similar_messages.empty?
           @error_generator.raise_expectation_error(@sym, @expected_received_count, @actual_received_count, *@args_expectation.args)
         else
-          @error_generator.raise_unexpected_message_args_error(self, *@similar_messages.first)
+          @error_generator.raise_unexpected_message_args_error(self, *@similar_messages)
         end
       end
 

data/lib/spec/mocks/mock.rb

@@ -14,16 +14,15 @@ module Spec
       end
       
       # This allows for comparing the mock to other objects that proxy such as
-      # ActiveRecords belongs_to proxy objects By making the other object run
-      # the comparison, we're sure the call gets delegated to the proxy target
-      # This is an unfortunate side effect from ActiveRecord, but this should
-      # be safe unless the RHS redefines == in a nonsensical manner
+      # ActiveRecords belongs_to proxy objects. By making the other object run
+      # the comparison, we're sure the call gets delegated to the proxy
+      # target.
       def ==(other)
         other == __mock_proxy
       end
 
       def method_missing(sym, *args, &block)
-        __mock_proxy.instance_eval {@messages_received << [sym, args, block]}
+        __mock_proxy.record_message_received(sym, args, block)
         begin
           return self if __mock_proxy.null_object?
           super(sym, *args, &block)

data/lib/spec/mocks/proxy.rb

@@ -82,6 +82,10 @@ module Spec
       def has_negative_expectation?(sym)
         @expectations.detect {|expectation| expectation.negative_expectation_for?(sym)}
       end
+      
+      def record_message_received(sym, args, block)
+        @messages_received << [sym, args, block]
+      end
 
       def message_received(sym, *args, &block)
         expectation = find_matching_expectation(sym, *args)
@@ -118,7 +122,7 @@ module Spec
       end
       
       def warn_if_nil_class(sym)
-        if proxy_for_nil_class? && @@warn_about_expectations_on_nil          
+        if proxy_for_nil_class? & @@warn_about_expectations_on_nil          
           Kernel.warn("An expectation of :#{sym} was set on nil. Called from #{caller[2]}. Use allow_message_expectations_on_nil to disable warnings.")
         end
       end
@@ -129,7 +133,7 @@ module Spec
           if target_responds_to?(sym)
             munged_sym = munge(sym)
             target_metaclass.instance_eval do
-              alias_method munged_sym, sym if method_defined?(sym.to_s)
+              alias_method munged_sym, sym if method_defined?(sym)
             end
             @proxied_methods << sym
           end
@@ -162,7 +166,7 @@ module Spec
       end
 
       def munge(sym)
-        "proxied_by_rspec__#{sym.to_s}".to_sym
+        "proxied_by_rspec__#{sym}"
       end
 
       def clear_expectations
@@ -191,9 +195,9 @@ module Spec
         @proxied_methods.each do |sym|
           munged_sym = munge(sym)
           target_metaclass.instance_eval do
-            if method_defined?(munged_sym.to_s)
+            if method_defined?(munged_sym)
               alias_method sym, munged_sym
-              undef_method munged_sym
+              remove_method munged_sym
             else
               remove_method sym
             end

data/lib/spec/mocks/spec_methods.rb

@@ -1,7 +1,7 @@
 module Spec
   module Mocks
     module ExampleMethods
-      include Spec::Mocks::ArgumentConstraints
+      include Spec::Mocks::ArgumentMatchers
 
       # Shortcut for creating an instance of Spec::Mocks::Mock.
       #
@@ -26,10 +26,19 @@ module Spec
       
       alias :stub :mock
 
+      # DEPRECATED - use mock('name').as_null_object instead
+      #
       # Shortcut for creating a mock object that will return itself in response
       # to any message it receives that it hasn't been explicitly instructed
       # to respond to.
       def stub_everything(name = 'stub')
+        Kernel.warn(<<-WARNING)
+
+DEPRECATION: stub_everything('#{name}') is deprecated and will be removed
+from a future version of rspec. Please use mock('#{name}').as_null_object
+or stub('#{name}').as_null_object instead.
+
+WARNING
         mock(name, :null_object => true)
       end
       

data/lib/spec/rake/spectask.rb

@@ -48,7 +48,6 @@ module Spec
     # This task can also be used to run existing Test::Unit tests and get RSpec
     # output, for example like this:
     #
-    #   require 'rubygems'
     #   require 'spec/rake/spectask'
     #   Spec::Rake::SpecTask.new do |t|
     #     t.ruby_opts = ['-rtest/unit']

data/lib/spec/runner.rb

@@ -15,11 +15,10 @@ module Spec
     class ExampleGroupCreationListener
       def register_example_group(klass)
         Spec::Runner.options.add_example_group klass
-        Spec::Runner.register_at_exit_hook
       end
     end
     
-    Spec::Example::ExampleGroupMethods.example_group_creation_listeners << ExampleGroupCreationListener.new
+    Spec::Example::ExampleGroupFactory.example_group_creation_listeners << ExampleGroupCreationListener.new
     
     class << self
       def configuration # :nodoc:
@@ -40,17 +39,9 @@ module Spec
       def configure
         yield configuration
       end
-    
-      def register_at_exit_hook # :nodoc:
-        unless @already_registered_at_exit_hook
-          at_exit do
-            unless $! || run? || Spec::Example::ExampleGroupFactory.registered_or_ancestor_of_registered?(options.example_groups)
-              success = run
-              exit success if exit?
-            end
-          end
-          @already_registered_at_exit_hook = true
-        end
+      
+      def autorun # :nodoc:
+        at_exit {exit run unless $!}
       end
 
       def options # :nodoc:
@@ -65,24 +56,11 @@ module Spec
         @options = options
       end
 
-      def test_unit_defined?
-        Object.const_defined?(:Test) && Test.const_defined?(:Unit) && Test::Unit.respond_to?(:run?)
-      end
-
-      def run?
-        Runner.options.examples_run?
-      end
-
       def run
-        return true if run?
+        return true if options.examples_run?
         options.run_examples
       end
 
-      def exit?
-        !test_unit_defined? || Test::Unit.run?
-      end
     end
   end
-end
-
-require 'spec/interop/test' if Spec::Runner::test_unit_defined?
+end

data/lib/spec/runner/configuration.rb

@@ -143,14 +143,14 @@ module Spec
         [get_type_from_options(options)].flatten.each do |required_example_group|
           required_example_group = required_example_group.to_sym if required_example_group
           modules.each do |mod|
-            Spec::Example::ExampleGroupFactory.get(required_example_group).__send__(action, mod)
+            Spec::Example::ExampleGroupFactory[required_example_group].__send__(action, mod)
           end
         end
       end
 
       def add_callback(sym, *args, &proc)
         scope, options = Spec::Example.scope_and_options(*args)
-        example_group = Spec::Example::ExampleGroupFactory.get(get_type_from_options(options))
+        example_group = Spec::Example::ExampleGroupFactory[get_type_from_options(options)]
         example_group.__send__(sym, scope, &proc)
       end
 
@@ -159,7 +159,7 @@ module Spec
       end
     
       def mock_framework_path(framework_name)
-        File.expand_path(File.join(File.dirname(__FILE__), "..", "..", "adapters", "mock_frameworks", framework_name))
+        File.expand_path(File.join(File.dirname(__FILE__), "/../adapters/mock_frameworks/#{framework_name}"))
       end
     end
   end

data/lib/spec/runner/drb_command_line.rb

@@ -8,7 +8,8 @@ module Spec
       # CommandLine - making it possible for clients to use both interchangeably.
       def self.run(options)
         begin
-          DRb.start_service
+          # See http://redmine.ruby-lang.org/issues/show/496 as to why we specify localhost:0
+          DRb.start_service("druby://localhost:0")
           spec_server = DRbObject.new_with_uri("druby://127.0.0.1:8989")
           spec_server.run(options.argv, options.error_stream, options.output_stream)
         rescue DRb::DRbConnError => e

data/lib/spec/runner/example_group_runner.rb

@@ -6,11 +6,11 @@ module Spec
       end
 
       def load_files(files)
+        $KCODE = 'u' if RUBY_VERSION.to_f < 1.9
         # It's important that loading files (or choosing not to) stays the
         # responsibility of the ExampleGroupRunner. Some implementations (like)
         # the one using DRb may choose *not* to load files, but instead tell
         # someone else to do it over the wire.
-        $KCODE = 'u' if RUBY_VERSION < '1.9'
         files.each do |file|
           load file
         end
@@ -27,7 +27,8 @@ module Spec
         finish
       end
 
-      protected
+    protected
+
       def prepare
         reporter.start(number_of_examples)
         example_groups.reverse! if reverse