rspec 1.2.9 → 1.3.0

data/lib/spec/mocks/methods.rb

@@ -55,6 +55,19 @@ module Spec
         end
       end
       
+      # Record and otherwise ignore all messages that aren't specified,
+      # with +stub+, +stub!+, or +should_receive+.
+      # 
+      # == Returns
+      #   self
+      def as_null_object
+        __mock_proxy.as_null_object
+      end
+      
+      def null_object?
+        __mock_proxy.null_object?
+      end
+      
       def received_message?(sym, *args, &block) #:nodoc:
         __mock_proxy.received_message?(sym.to_sym, *args, &block)
       end
@@ -66,14 +79,6 @@ module Spec
       def rspec_reset #:nodoc:
         __mock_proxy.reset
       end
-      
-      def as_null_object
-        __mock_proxy.as_null_object
-      end
-      
-      def null_object?
-        __mock_proxy.null_object?
-      end
 
     private
 

data/lib/spec/mocks/proxy.rb

@@ -40,13 +40,16 @@ module Spec
       def add_message_expectation(expected_from, sym, opts={}, &block)        
         __add sym
         warn_if_nil_class sym
-        if existing_stub = @stubs.detect {|s| s.sym == sym }
-          expectation = existing_stub.build_child(expected_from, block_given?? block : nil, 1, opts)
+        @expectations << build_expectation(expected_from, sym, opts, &block)
+        @expectations.last
+      end
+
+      def build_expectation(expected_from, sym, opts, &block)
+        if stub = find_matching_method_stub(sym) 
+          stub.build_child(expected_from, block_given?? block : nil, 1, opts)
         else
-          expectation = MessageExpectation.new(@error_generator, @expectation_ordering, expected_from, sym, block_given? ? block : nil, 1, opts)
+          MessageExpectation.new(@error_generator, @expectation_ordering, expected_from, sym, block_given? ? block : nil, 1, opts)
         end
-        @expectations << expectation
-        @expectations.last
       end
 
       def add_negative_message_expectation(expected_from, sym, &block)
@@ -64,7 +67,6 @@ module Spec
 
       def remove_stub(message)
         message = message.to_sym
-        
         if stub_to_remove = @stubs.detect { |s| s.matches_name?(message) }
           reset_proxied_method(message)
           @stubs.delete(stub_to_remove)
@@ -92,7 +94,7 @@ module Spec
       end
 
       def has_negative_expectation?(sym)
-        @expectations.detect {|expectation| expectation.negative_expectation_for?(sym)}
+        @expectations.any? {|expectation| expectation.negative_expectation_for?(sym)}
       end
       
       def record_message_received(sym, args, block)
@@ -103,21 +105,39 @@ module Spec
         expectation = find_matching_expectation(sym, *args)
         stub = find_matching_method_stub(sym, *args)
 
-        if (stub && expectation && expectation.called_max_times?) || (stub && !expectation)
-          if expectation = find_almost_matching_expectation(sym, *args)
-            expectation.advise(args, block) unless expectation.expected_messages_received?
-          end
-          stub.invoke(*args, &block)
+        if ok_to_invoke_stub?(stub, expectation)
+          record_stub(stub, sym, args, &block)
         elsif expectation
-          expectation.invoke(*args, &block)
+          invoke_expectation(expectation, *args, &block)
         elsif expectation = find_almost_matching_expectation(sym, *args)
-          expectation.advise(args, block) if null_object? unless expectation.expected_messages_received?
-          raise_unexpected_message_args_error(expectation, *args) unless (has_negative_expectation?(sym) or null_object?)
+          record_almost_matching_expectation(expectation, sym, *args, &block)
         else
           @target.__send__ :method_missing, sym, *args, &block
         end
       end
 
+      def record_stub(stub, sym, args, &block)
+        almost_matching_expectation(sym, *args) do |e|
+          e.advise(args, block)
+        end
+        stub.invoke(*args, &block)
+      end
+
+      def invoke_expectation(expectation, *args, &block)
+        expectation.invoke(*args, &block)
+      end
+
+      def record_almost_matching_expectation(expectation, sym, *args, &block)
+        expectation.advise(args, block)
+        unless (null_object? or has_negative_expectation?(sym))
+          raise_unexpected_message_args_error(expectation, *args)
+        end
+      end
+
+      def ok_to_invoke_stub?(stub, expectation)
+        stub && (!expectation || expectation.called_max_times?)
+      end
+
       def raise_unexpected_message_args_error(expectation, *args)
         @error_generator.raise_unexpected_message_args_error expectation, *args
       end
@@ -201,15 +221,11 @@ module Spec
       end
 
       def verify_expectations
-        @expectations.each do |expectation|
-          expectation.verify_messages_received
-        end
+        @expectations.map {|e| e.verify_messages_received}
       end
 
       def reset_proxied_methods
-        @proxied_methods.each do |sym|
-          reset_proxied_method(sym)
-        end
+        @proxied_methods.map {|sym| reset_proxied_method(sym)}
       end
 
       def reset_proxied_method(sym)
@@ -236,10 +252,15 @@ module Spec
         @expectations.find {|expectation| expectation.matches(sym, args)}
       end
 
+      def almost_matching_expectation(sym, *args, &block)
+        if e = find_almost_matching_expectation(sym, *args)
+          yield e
+        end
+      end
+
       def find_almost_matching_expectation(sym, *args)
         @expectations.find {|expectation| expectation.matches_name_but_not_args(sym, args)}
       end
-
     end
   end
 end

data/lib/spec/runner/differs/default.rb

@@ -4,7 +4,7 @@ require 'pp'
 module Spec
   module Expectations
     module Differs
-      unless defined?(Default)
+      unless defined?(Spec::Expectations::Differs::Default)
         class Default
           def initialize(options)
             @options = options

data/lib/spec/runner/drb_command_line.rb

@@ -4,16 +4,21 @@ module Spec
   module Runner
     # Facade to run specs by connecting to a DRB server
     class DrbCommandLine
+
+      def self.port(options)
+        (options.drb_port || ENV["RSPEC_DRB"] || 8989).to_i
+      end
+
       # Runs specs on a DRB server. Note that this API is similar to that of
       # CommandLine - making it possible for clients to use both interchangeably.
       def self.run(options)
         begin
           begin; \
             DRb.start_service("druby://localhost:0"); \
-          rescue SocketError; \
+          rescue SocketError, Errno::EADDRNOTAVAIL; \
             DRb.start_service("druby://:0"); \
           end
-          spec_server = DRbObject.new_with_uri("druby://127.0.0.1:8989")
+          spec_server = DRbObject.new_with_uri("druby://127.0.0.1:#{port(options)}")
           spec_server.run(options.argv, options.error_stream, options.output_stream)
           true
         rescue DRb::DRbConnError
@@ -21,6 +26,7 @@ module Spec
           false
         end
       end
+
     end
   end
 end

data/lib/spec/runner/example_group_runner.rb

@@ -22,9 +22,8 @@ module Spec
         example_groups.each do |example_group|
           success = success & example_group.run(@options)
         end
-        return success
-      ensure
         finish
+        success
       end
 
     protected

data/lib/spec/runner/formatter/nested_text_formatter.rb

@@ -4,6 +4,9 @@ module Spec
   module Runner
     module Formatter
       class NestedTextFormatter < BaseTextFormatter
+
+        INDENT = '  '
+
         def initialize(options, where)
           super
           @last_nested_descriptions = []
@@ -13,8 +16,8 @@ module Spec
           super
 
           example_group.nested_descriptions.each_with_index do |nested_description, i|
-            unless nested_description == @last_nested_descriptions[i]
-              output.puts "#{'  ' * i}#{nested_description}"
+            unless example_group.nested_descriptions[0..i] == @last_nested_descriptions[0..i]
+              output.puts "#{INDENT*i}#{nested_description}"
             end
           end
 
@@ -39,7 +42,7 @@ module Spec
         end
 
         def current_indentation
-          '  ' * @last_nested_descriptions.length
+          INDENT*@last_nested_descriptions.length
         end
       end
     end

data/lib/spec/runner/option_parser.rb

@@ -80,6 +80,7 @@ module Spec
         :runner => ["-U", "--runner RUNNER", "Use a custom Runner."],
         :debug => ["-u", "--debugger", "Enable ruby-debugging."],
         :drb => ["-X", "--drb", "Run examples via DRb. (For example against script/spec_server)"],
+        :drb_port => ["--port PORT", "Port for DRb server. (Ignored without --drb)"],
         :version => ["-v", "--version", "Show version"],
         :help => ["-h", "--help", "You're looking at it"]
       }
@@ -113,6 +114,7 @@ module Spec
         on(*OPTIONS[:runner])           {|runner|  @options.user_input_for_runner = runner}
         on(*OPTIONS[:debug])            {@options.debug = true}
         on(*OPTIONS[:drb])              {}
+        on(*OPTIONS[:drb_port])         {|port| @options.drb_port = port}
         on(*OPTIONS[:version])          {parse_version}
         on("--autospec")                {@options.autospec = true}
         on_tail(*OPTIONS[:help])        {parse_help}

data/lib/spec/runner/options.rb

@@ -50,7 +50,8 @@ module Spec
         :argv
       )
       attr_reader :colour, :differ_class, :files, :examples, :example_groups
-
+      attr_writer :drb_port
+      
       def initialize(error_stream, output_stream)
         @error_stream = error_stream
         @output_stream = output_stream
@@ -289,6 +290,10 @@ module Spec
         @dry_run == true
       end
 
+      def drb_port
+        @drb_port.to_i if defined?(@drb_port)
+      end
+      
     protected
 
       def define_predicate_matchers

data/lib/spec/stubs/cucumber.rb

@@ -1,5 +1,5 @@
 # This plugs RSpec's mocking/stubbing framework into cucumber
 require 'spec/mocks'
-Before {$rspec_stubs ||= Spec::Mocks::Space.new}
-After  {$rspec_stubs.reset_all}
+Before {$rspec_mocks ||= Spec::Mocks::Space.new}
+After  {$rspec_mocks.reset_all}
 World(Spec::Mocks::ExampleMethods)

data/lib/spec/version.rb

@@ -2,8 +2,8 @@ module Spec # :nodoc:
   module VERSION # :nodoc:
     unless defined? MAJOR
       MAJOR  = 1
-      MINOR  = 2
-      TINY   = 9
+      MINOR  = 3
+      TINY   = 0
       PRE    = nil
 
       STRING = [MAJOR, MINOR, TINY, PRE].compact.join('.')

data/spec/autotest/autotest_helper.rb

@@ -5,4 +5,4 @@ rescue LoadError
   raise "You must install ZenTest to use autotest"
 end
 require 'autotest/rspec'
-require 'spec/autotest/autotest_matchers'
+require 'autotest/autotest_matchers'

data/spec/autotest/discover_spec.rb

@@ -1,8 +1,8 @@
-require 'spec/autotest/autotest_helper'
+require 'autotest/autotest_helper'
 
 describe Autotest::Rspec, "discovery" do
   it "adds the rspec autotest plugin" do
     Autotest.should_receive(:add_discovery)
-    load File.expand_path(File.dirname(__FILE__) + "/../../lib/autotest/discover.rb")
+    load File.expand_path("../../../lib/autotest/discover.rb", __FILE__)
   end
 end  

data/spec/autotest/failed_results_re_spec.rb

@@ -1,4 +1,4 @@
-require 'spec/autotest/autotest_helper'
+require 'autotest/autotest_helper'
 
 describe "failed_results_re" do
   it "should match a failure" do
@@ -28,4 +28,4 @@ describe "failed_results_re" do
     $1.should == "this example"
     $2.should == "reason\n/path.rb:37:"
   end
-end
+end

data/spec/autotest/rspec_spec.rb

@@ -1,4 +1,4 @@
-require 'spec/autotest/autotest_helper'
+require 'autotest/autotest_helper'
 
 describe Autotest::Rspec do
   describe "adding spec.opts --options" do 
@@ -26,17 +26,21 @@ describe Autotest::Rspec do
       @ruby = @rspec_autotest.ruby
       @spec_cmd = File.expand_path(File.join(File.dirname(__FILE__), '..', '..', 'bin', 'spec'))
       @options = @rspec_autotest.add_options_if_present
+      files = %w[file_one file_two]
       @files_to_test = {
-        :spec => ["file_one", "file_two"]
+        files[0] => [],
+        files[1] => []
       }
       # this is not the inner representation of Autotest!
-      @rspec_autotest.stub!(:files_to_test).and_return @files_to_test
-      @files_to_test.stub!(:keys).and_return @files_to_test[:spec]
-      @to_test = @files_to_test.keys.flatten.join ' '
+      @rspec_autotest.files_to_test = @files_to_test
+      @to_test = files.map { |f| File.expand_path(f) }.join ' '
     end
   
     it "should make the appropriate test command" do
-      @rspec_autotest.make_test_cmd(@files_to_test).should == "#{@ruby} #{@spec_cmd} --autospec #{@to_test} #{@options}"
+      cmd = @rspec_autotest.make_test_cmd(@files_to_test)
+      (cmd =~ /#{@ruby} #{@spec_cmd} --autospec (.*) #{@options}/).should be_true
+      $1.should =~ /#{File.expand_path('file_one')}/
+      $1.should =~ /#{File.expand_path('file_two')}/
     end
 
     it "should return a blank command for no files" do
@@ -108,4 +112,15 @@ describe Autotest::Rspec do
       @rspec_autotest.consolidate_failures(failures).keys.should_not include(subject_file)
     end
   end
+  
+  describe "normalizing file names" do
+    it "should ensure that a single file appears in files_to_test only once" do
+      @rspec_autotest = Autotest::Rspec.new
+      @files_to_test = {}
+      ['filename.rb', './filename.rb', File.expand_path('filename.rb')].each do |file|
+        @files_to_test[file] = []
+      end
+      @rspec_autotest.normalize(@files_to_test).should have(1).file
+    end
+  end
 end

data/spec/spec/example/example_group_methods_spec.rb

@@ -732,7 +732,7 @@ module Spec
           end
         end
 
-        describe "#define" do
+        describe "#let" do
           let(:counter) do
             Class.new do
               def initialize
@@ -743,6 +743,7 @@ module Spec
               end
             end.new
           end
+
           it "generates an instance method" do
             counter.count.should == 1
           end

data/spec/spec/interop/test/unit/spec_spec.rb

@@ -5,43 +5,43 @@ describe "ExampleGroup with test/unit/interop" do
     
   describe "with passing examples" do
     it "should output 0 failures" do
-      output = ruby("#{resources}/spec_that_passes.rb")
+      output = ruby("'#{resources}/spec_that_passes.rb'")
       output.should include("1 example, 0 failures")
     end
 
     it "should return an exit code of 0" do
-      ruby("#{resources}/spec_that_passes.rb")
+      ruby("'#{resources}/spec_that_passes.rb'")
       $?.should == 0
     end
   end
 
   describe "with failing examples" do
     it "should output 1 failure" do
-      output = ruby("#{resources}/spec_that_fails.rb")
+      output = ruby("'#{resources}/spec_that_fails.rb'")
       output.should include("1 example, 1 failure")
     end
 
     it "should return an exit code of 256" do
-      ruby("#{resources}/spec_that_fails.rb")
+      ruby("'#{resources}/spec_that_fails.rb'")
       $?.should == 256
     end
   end
 
   describe "with example that raises an error" do
     it "should output 1 failure" do
-      output = ruby("#{resources}/spec_with_errors.rb")
+      output = ruby("'#{resources}/spec_with_errors.rb'")
       output.should include("1 example, 1 failure")
     end
 
     it "should return an exit code of 256" do
-      ruby("#{resources}/spec_with_errors.rb")
+      ruby("'#{resources}/spec_with_errors.rb'")
       $?.should == 256
     end
   end
   
   describe "options hash" do
     it "should be exposed" do
-      output = ruby("#{resources}/spec_with_options_hash.rb")
+      output = ruby("'#{resources}/spec_with_options_hash.rb'")
       output.should include("1 example, 0 failures")
     end
   end

data/spec/spec/interop/test/unit/testcase_spec.rb

@@ -9,42 +9,42 @@ describe "Test::Unit::TestCase" do
   
   describe "with passing test case" do
     it "should output 0 failures" do
-      output = ruby("#{@dir}/test_case_that_passes.rb")
+      output = ruby("'#{@dir}/test_case_that_passes.rb'")
       output.should include("1 example, 0 failures")
     end
 
     it "should return an exit code of 0" do
-      ruby("#{@dir}/test_case_that_passes.rb")
+      ruby("'#{@dir}/test_case_that_passes.rb'")
       $?.should == 0
     end
   end
 
   describe "with failing test case" do
     it "should output 1 failure" do
-      output = ruby("#{@dir}/test_case_that_fails.rb")
+      output = ruby("'#{@dir}/test_case_that_fails.rb'")
       output.should include("1 example, 1 failure")
     end
 
     it "should return an exit code of 256" do
-      ruby("#{@dir}/test_case_that_fails.rb")
+      ruby("'#{@dir}/test_case_that_fails.rb'")
       $?.should == 256
     end
   end
 
   describe "with test case that raises an error" do
     it "should output 1 failure" do
-      output = ruby("#{@dir}/test_case_with_errors.rb")
+      output = ruby("'#{@dir}/test_case_with_errors.rb'")
       output.should include("1 example, 1 failure")
     end
 
     it "should return an exit code of 256" do
-      ruby("#{@dir}/test_case_with_errors.rb")
+      ruby("'#{@dir}/test_case_with_errors.rb'")
       $?.should == 256
     end
   end
 
   it "should find all Test::Unit test methods" do
-    output = ruby("#{@dir}/test_case_with_various_names.rb")
+    output = ruby("'#{@dir}/test_case_with_various_names.rb'")
     output.should include("4 examples, 0 failures")
   end
 end