rspec 1.3.1 → 1.3.2

data/.autotest

@@ -0,0 +1,5 @@
+Autotest.add_hook :initialize do |at|
+  at.add_exception("spec/interop/test/unit/resources")
+  at.add_exception("spec/spec/runner/drb_command_line_spec.rb")
+end
+

data/.gitignore

@@ -0,0 +1,15 @@
+pkg
+doc
+coverage*
+tmtags
+.DS_Store
+.emacs-project
+*~
+email.txt
+tmp
+*.sw?
+spec/spec_files.txt
+tags
+
+# rubinius byte code files
+*.rbc

data/Gemfile

@@ -0,0 +1,20 @@
+source :rubygems
+
+gemspec
+
+gem "flexmock", '>= 0.8.6'
+gem "heckle", '>= 1.4.2'
+gem "hoe", '>= 2.0'
+gem "nokogiri", '>= 1.2.3'
+gem "mocha", '>= 0.9.5'
+gem "rake", '>= 0.8.4'
+gem "rcov", '>= 0.9.7.1'
+gem "rr", '>= 0.10.0'
+gem "ruby-debug", :platforms => :mri_18
+gem "ruby-debug19", "~> 0.11.6", :platforms => :mri_19
+gem "test-unit", "1.2.3", :platforms => :mri_19
+
+case RUBY_VERSION
+  when '1.9.1'; gem 'ruby-debug-base19', '0.11.23'
+  when '1.9.2'; gem 'ruby-debug-base19', '0.11.24'
+end

data/History.rdoc

@@ -1,3 +1,17 @@
+=== Version 1.3.2 / 2011-04-11
+
+* Enhancements
+  * Raise a meaningful error when an argument-scoped stub is called with the
+    wrong args (Alexey)
+  * Dev: ignore .rbc files (Myron Marston)
+
+* Bug fixes
+  * Fix regression in which an expectation should return the value from a
+    previously defined stub of the same method (Tom Stuart)
+  * Support heckling class methods (Dan Kubb)
+  * Only try to pass messages to the superclass if the superclass responds to
+    the method (Andrew Selder)
+
 === Version 1.3.1 / 2010-10-09
 
 * enhancements

data/README.rdoc

@@ -1,12 +1,15 @@
 == RSpec
 
-http://rspec.info
-
 Behaviour Driven Development for Ruby
 
-This is the repository for rspec-1.x. If you're looking
-for rspec-2 (and if you're not, what are you waiting for?),
-see http://github.com/rspec/rspec
+This is the repository for rspec-1.x. For more information, please
+see http://rspec.info.
+
+If you're looking for rspec-2 (and if you're not, what are you waiting for?),
+see:
+
+* http://relishapp.com/rspec
+* http://github.com/rspec/rspec
 
 == Install
 

data/Rakefile

@@ -1,6 +1,5 @@
-# -*- ruby -*-
-gem 'hoe', '>=2.0.0'
-require 'hoe'
+require 'bundler'
+Bundler::GemHelper.install_tasks
 
 $:.unshift 'lib'
 
@@ -8,38 +7,6 @@ require 'spec/version'
 require 'spec/rake/spectask'
 require 'spec/ruby'
 
-Hoe.spec 'rspec' do
-  self.version = Spec::VERSION::STRING
-  self.summary = Spec::VERSION::SUMMARY
-  self.description = "Behaviour Driven Development for Ruby."
-  self.rubyforge_name = 'rspec'
-  self.developer('RSpec Development Team', 'rspec-devel@rubyforge.org')
-  self.extra_dev_deps << ["cucumber",">=0.3"] << ["fakefs",">=0.2.1"] << ["syntax",">=1.0"] << ["diff-lcs",">=1.1.2"]
-  self.extra_dev_deps << ["heckle",">=1.4.3"] unless Spec::Ruby.version >= "1.9"
-  self.remote_rdoc_dir = "rspec/#{Spec::VERSION::STRING}"
-  self.rspec_options = ['--options', 'spec/spec.opts']
-  self.history_file = 'History.rdoc'
-  self.readme_file  = 'README.rdoc'
-  self.post_install_message = <<-POST_INSTALL_MESSAGE
-#{'*'*50}
-
-  Thank you for installing rspec-#{Spec::VERSION::STRING}
-
-  Please be sure to read History.rdoc and Upgrade.rdoc
-  for useful information about this release.
-
-#{'*'*50}
-POST_INSTALL_MESSAGE
-end
-
-['audit','test','test_deps','default','post_blog'].each do |task|
-  Rake.application.instance_variable_get('@tasks').delete(task)
-end
-
-task :post_blog do
-  # no-op
-end
-
 # Some of the tasks are in separate files since they are also part of the website documentation
 load 'resources/rake/examples.rake'
 load 'resources/rake/examples_with_rcov.rake'
@@ -50,15 +17,19 @@ task :cleanup_rcov_files do
   rm_rf 'coverage.data'
 end
 
-
 if RUBY_VERSION =~ /^1.8/
   task :default => [:cleanup_rcov_files, :features, :verify_rcov]
 else
   task :default => [:spec, :features]
 end
 
-namespace :spec do
+desc "Run all specs"
+Spec::Rake::SpecTask.new(:spec) do |t|
+  t.spec_files = FileList['spec/**/*_spec.rb']
+  t.spec_opts = ['--options', 'spec/spec.opts']
+end
 
+namespace :spec do
   desc "Run all specs with rcov"
   Spec::Rake::SpecTask.new(:rcov) do |t|
     t.spec_files = FileList['spec/**/*_spec.rb']
@@ -121,9 +92,6 @@ task :todo do
   egrep /(FIXME|TODO|TBD)/
 end
 
-desc "verify_committed, verify_rcov, post_news, release"
-task :complete_release => [:verify_committed, :verify_rcov, :post_news, :release]
-
 desc "Verifies that there is no uncommitted code"
 task :verify_committed do
   IO.popen('git status') do |io|
@@ -133,13 +101,6 @@ task :verify_committed do
   end
 end
 
-namespace :update do
-  desc "update the manifest"
-  task :manifest do
-    system %q[touch Manifest.txt; rake check_manifest | grep -v "(in " | patch]
-  end
-end
-
 task :clobber => :clobber_tmp
 
 task :clobber_tmp do

data/example_spec.rb

@@ -0,0 +1,4 @@
+context 'foo' do
+  subject { [] }
+  its(:size) { should == 1 }
+end

data/features-pending/cli/conditional_exclusion.feature

@@ -0,0 +1,39 @@
+Feature: conditional exclusion of example groups
+  
+  Example groups can be excluded from a run by matching the value of the
+  --exclude argument against options passed to an example group. The value
+  can be a key or a key:value pair (separated by a ":").
+  
+  Scenario: exclusion using explicit value
+    Given the following spec:
+      """
+      describe "This should run" do
+        it { 5.should == 5 }
+      end
+      
+      describe "This should not run", :slow => true do
+        it { 1_000_000.times { 5.should == 5 } }
+      end
+      """
+    When I run it with the spec command --format specdoc --exclude slow:true
+    Then the exit code should be 0
+    And the stdout should match "1 example, 0 failures"
+    And the stdout should match /This should run$/m
+    But the stdout should not match "This should not run"
+
+  Scenario: exclusion using default value (true)
+    Given the following spec:
+      """
+      describe "This should run" do
+        it { 5.should == 5 }
+      end
+
+      describe "This should not run", :slow => true do
+        it { 1_000_000.times { 5.should == 5 } }
+      end
+      """
+    When I run it with the spec command --format specdoc --exclude slow
+    Then the exit code should be 0
+    And the stdout should match "1 example, 0 failures"
+    And the stdout should match /This should run$/m
+    But the stdout should not match "This should not run"

data/features-pending/heckle/heckle.feature

@@ -0,0 +1,56 @@
+Feature: heckle a class
+
+  As an RSpec user who wants to verify that
+    my specs cover what I think it covers
+  I want to heckle a class
+
+  Scenario: Heckle finds problems
+    Given a file named "heckle_fail_spec.rb" with:
+      """
+      class Thing
+        def a_or_b
+          if true
+            "a"
+          else
+            "b"
+          end
+        end
+      end
+
+      describe Thing do
+        it "returns a for true" do
+          Thing.new.a_or_b.should == "a"
+        end
+      end
+      """
+    When I run "spec heckle_fail_spec.rb --heckle Thing"
+    Then the stdout should match "The following mutations didn't cause test failures:"
+    But the stdout should not match "FAILED"
+
+  Scenario: Heckle does not find a problem
+    Given a file named "heckle_success_spec.rb" with:
+      """
+      class Thing
+        def a_or_b(key)
+          if key
+            "a"
+          else
+            "b"
+          end
+        end
+      end
+
+      describe Thing do
+        it "returns a for true" do
+          Thing.new.a_or_b(true).should == "a"
+        end
+
+        it "returns b for false" do
+          Thing.new.a_or_b(false).should == "b"
+        end
+      end
+      """
+    When I run "spec heckle_success_spec.rb --heckle Thing"
+    Then the stdout should match "No mutants survived"
+    But the stdout should not match "FAILED"
+

data/features/formatters/custom_formatter.feature

@@ -25,6 +25,6 @@ Feature: custom formatters
       end
       """
 
-    When I run "spec simple_example_spec.rb --require custom_formatter.rb --format CustomFormatter"
+    When I run "spec simple_example_spec.rb --require ./custom_formatter.rb --format CustomFormatter"
     Then the exit code should be 0
     And the stdout should include "example: my example"

data/features/matchers/define_matcher_outside_rspec.feature

@@ -35,4 +35,3 @@ Feature: define matcher outside rspec
     When I run "ruby test_multiples.rb"
     Then the exit code should be 256
     And the stdout should include "expected 9 to be a multiple of 4"
-    And the stdout should include "2 tests, 0 assertions, 1 failures, 0 errors"

data/features/matchers/match_unless_raises.feature

@@ -20,7 +20,7 @@ Feature: match unless raises
   Scenario: passing examples
     Given a file named "match_unless_raises_spec.rb" with:
       """
-      require 'example.rb'
+      require './example.rb'
 
       describe 4 do
         it "is 4" do
@@ -40,7 +40,7 @@ Feature: match unless raises
   Scenario: failing examples
     Given a file named "match_unless_raises_spec.rb" with:
       """
-      require 'example.rb'
+      require './example.rb'
 
       describe 4 do
         it "is 4" do

data/features/matchers/match_unless_raises_unexpected_error.feature

@@ -17,7 +17,7 @@ Feature: match unless raises with an unexpected error
   Scenario: failing examples
     Given a file named "match_unless_raises_spec.rb" with:
       """
-      require 'example.rb'
+      require './example.rb'
 
       describe 4 do
         it "is 4" do
@@ -36,4 +36,4 @@ Feature: match unless raises with an unexpected error
     When I run "spec match_unless_raises_spec.rb"
     Then the stdout should include "2 examples, 2 failures"
     Then the stdout should include "unexpected error"
-  
+  

data/features/support/env.rb

@@ -1,10 +1,10 @@
-$:.unshift File.join(File.dirname(__FILE__), "/../../lib")
+$:.unshift File.expand_path("../../../lib", __FILE__)
 
 require 'spec/expectations'
 require 'forwardable'
 require 'tempfile'
-require 'spec/ruby_forker'
-require 'features/support/matchers/smart_match'
+require './spec/ruby_forker'
+require './features/support/matchers/smart_match'
 require 'spec/stubs/cucumber'
 
 class RspecWorld

data/lib/spec/mocks/message_expectation.rb

@@ -239,7 +239,7 @@ module Spec
         @similar_messages ||= []
       end
 
-      def advise(args, block)
+      def advise(*args)
         similar_messages << args
       end
 

data/lib/spec/mocks/proxy.rb

@@ -40,16 +40,13 @@ module Spec
       def add_message_expectation(expected_from, sym, opts={}, &block)        
         __add sym
         warn_if_nil_class sym
-        @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)
+        if existing_stub = @stubs.detect {|s| s.sym == sym }
+          expectation = existing_stub.build_child(expected_from, block_given?? block : nil, 1, opts)
         else
-          MessageExpectation.new(@error_generator, @expectation_ordering, expected_from, sym, block_given? ? block : nil, 1, opts)
+          expectation = 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)
@@ -67,6 +64,7 @@ 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)
@@ -94,7 +92,7 @@ module Spec
       end
 
       def has_negative_expectation?(sym)
-        @expectations.any? {|expectation| expectation.negative_expectation_for?(sym)}
+        @expectations.detect {|expectation| expectation.negative_expectation_for?(sym)}
       end
       
       def record_message_received(sym, args, block)
@@ -105,41 +103,26 @@ module Spec
         expectation = find_matching_expectation(sym, *args)
         stub = find_matching_method_stub(sym, *args)
 
-        if ok_to_invoke_stub?(stub, expectation)
-          record_stub(stub, sym, args, &block)
+        if (stub && expectation && expectation.called_max_times?) || (stub && !expectation)
+          if expectation = find_almost_matching_expectation(sym, *args)
+            expectation.advise(*args) unless expectation.expected_messages_received?
+          end
+          stub.invoke(*args, &block)
         elsif expectation
-          invoke_expectation(expectation, *args, &block)
+          expectation.invoke(*args, &block)
         elsif expectation = find_almost_matching_expectation(sym, *args)
-          record_almost_matching_expectation(expectation, sym, *args, &block)
-        elsif @target.is_a?(Class)
+          expectation.advise(*args) if null_object? unless expectation.expected_messages_received?
+          raise_unexpected_message_args_error(expectation, *args) unless (has_negative_expectation?(sym) or null_object?)
+        elsif stub = find_almost_matching_stub(sym, *args)
+          stub.advise(*args)
+          raise_unexpected_message_args_error(stub, *args)
+        elsif @target.is_a?(Class) && @target.superclass.respond_to?(sym, true)
           @target.superclass.send(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
@@ -151,7 +134,7 @@ module Spec
       def find_matching_method_stub(sym, *args)
         @stubs.find {|stub| stub.matches(sym, args)}
       end
-      
+
     private
 
       def __add(sym)
@@ -223,11 +206,15 @@ module Spec
       end
 
       def verify_expectations
-        @expectations.map {|e| e.verify_messages_received}
+        @expectations.each do |expectation|
+          expectation.verify_messages_received
+        end
       end
 
       def reset_proxied_methods
-        @proxied_methods.map {|sym| reset_proxied_method(sym)}
+        @proxied_methods.each do |sym|
+          reset_proxied_method(sym)
+        end
       end
 
       def reset_proxied_method(sym)
@@ -254,15 +241,14 @@ 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
+
+      def find_almost_matching_stub(sym, *args)
+        @stubs.find {|stub| stub.matches_name_but_not_args(sym, args)}
+      end
+
     end
   end
 end