rspec 1.2.6 → 1.2.7

data/History.rdoc

@@ -1,3 +1,25 @@
+=== Version 1.2.7 / 2009-06-22
+
+* enhancments
+  * added support for fakes using obj.stub(:method) { # implementation }
+  * allow subject { self } (Jarmo Pertman). Closes #816.
+  * friendly error message when a matcher returns nil on a failure message
+  * add ruby_cmd option to SpecTask (Rick DeNatale). Closes #823.
+    * also added missing specs for SpecTask - thanks Rick!
+  * add support for generating matchers with fluent interfaces with the
+    Matcher DSL
+
+* bug fixes
+  * NegativeOperatorMatcher now returns false (Wesley Beary). Closes #812.
+  * derive MockExpectationError from Exception rather than StandardError
+    (Kerry Buckley). Closes #830.
+  * fix bug where multi-line failure messages weren't getting picked up by
+    autotest (Jarmo Pertman). Closes #832.
+  * --line_number now works for it { should xxx } format (assist from Fred
+    Lee)
+  * warn instead of raise when there is no description supplied for an
+    example. Closes #840.
+
 === Version 1.2.6 / 2009-04-30
 
 * bug fixes

data/Manifest.txt

@@ -1,4 +1,3 @@
-.autotest
 .document
 History.rdoc
 License.txt
@@ -59,6 +58,8 @@ examples/passing/stubbing_example.rb
 examples/passing/yielding_example.rb
 examples/ruby1.9.compatibility/access_to_constants_spec.rb
 features/before_and_after_blocks/before_and_after_blocks.feature
+features/command_line/line_number_option.feature
+features/command_line/line_number_option_with_example_with_no_name.feature
 features/example_groups/example_group_with_should_methods.feature
 features/example_groups/implicit_docstrings.feature
 features/example_groups/nested_groups.feature
@@ -78,6 +79,7 @@ features/mock_framework_integration/use_flexmock.feature
 features/mock_framework_integration/use_mocha.feature
 features/mock_framework_integration/use_rr.feature
 features/mocks/mix_stubs_and_mocks.feature
+features/mocks/stub_implementation.feature
 features/pending/pending_examples.feature
 features/runner/specify_line_number.feature
 features/step_definitions/running_rspec_steps.rb
@@ -198,10 +200,10 @@ lib/spec/runner/formatter/specdoc_formatter.rb
 lib/spec/runner/formatter/text_mate_formatter.rb
 lib/spec/runner/heckle_runner.rb
 lib/spec/runner/heckle_runner_unsupported.rb
+lib/spec/runner/line_number_query.rb
 lib/spec/runner/option_parser.rb
 lib/spec/runner/options.rb
 lib/spec/runner/reporter.rb
-lib/spec/runner/spec_parser.rb
 lib/spec/test/unit.rb
 lib/spec/version.rb
 resources/helpers/cmdline.rb
@@ -290,6 +292,7 @@ spec/spec/mocks/bug_report_7611_spec.rb
 spec/spec/mocks/bug_report_7805_spec.rb
 spec/spec/mocks/bug_report_8165_spec.rb
 spec/spec/mocks/bug_report_8302_spec.rb
+spec/spec/mocks/bug_report_830_spec.rb
 spec/spec/mocks/failing_argument_matchers_spec.rb
 spec/spec/mocks/hash_including_matcher_spec.rb
 spec/spec/mocks/hash_not_including_matcher_spec.rb
@@ -307,10 +310,12 @@ spec/spec/mocks/passing_argument_matchers_spec.rb
 spec/spec/mocks/precise_counts_spec.rb
 spec/spec/mocks/record_messages_spec.rb
 spec/spec/mocks/stub_chain_spec.rb
+spec/spec/mocks/stub_implementation_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/rake/spectask_spec.rb
 spec/spec/runner/class_and_argument_parser_spec.rb
 spec/spec/runner/command_line_spec.rb
 spec/spec/runner/configuration_spec.rb
@@ -343,6 +348,8 @@ spec/spec/runner/formatter/text_mate_formatted-1.9.1.html
 spec/spec/runner/formatter/text_mate_formatter_spec.rb
 spec/spec/runner/heckle_runner_spec.rb
 spec/spec/runner/heckler_spec.rb
+spec/spec/runner/line_number_query/line_number_query_fixture.rb
+spec/spec/runner/line_number_query_spec.rb
 spec/spec/runner/noisy_backtrace_tweaker_spec.rb
 spec/spec/runner/option_parser_spec.rb
 spec/spec/runner/options_spec.rb
@@ -358,8 +365,6 @@ spec/spec/runner/resources/custom_example_group_runner.rb
 spec/spec/runner/resources/utf8_encoded.rb
 spec/spec/runner/spec.opts
 spec/spec/runner/spec_drb.opts
-spec/spec/runner/spec_parser/spec_parser_fixture.rb
-spec/spec/runner/spec_parser_spec.rb
 spec/spec/runner/spec_spaced.opts
 spec/spec/runner_spec.rb
 spec/spec/spec_classes.rb

data/Rakefile

@@ -1,5 +1,5 @@
 # -*- ruby -*-
-gem 'hoe', '>=1.9.0'
+gem 'hoe', '>=2.0.0'
 require 'hoe'
 
 $:.unshift(File.join(File.dirname(__FILE__), 'lib'))
@@ -8,17 +8,18 @@ require 'spec/version'
 require 'spec/rake/spectask'
 require 'cucumber/rake/task'
 
-Hoe.new('rspec', Spec::VERSION::STRING) do |p|
-  p.summary = Spec::VERSION::SUMMARY
-  p.description = "Behaviour Driven Development for Ruby."
-  p.rubyforge_name = 'rspec'
-  p.developer('RSpec Development Team', 'rspec-devel@rubyforge.org')
-  p.extra_dev_deps = [["cucumber",">= 0.2.2"]]
-  p.remote_rdoc_dir = "rspec/#{Spec::VERSION::STRING}"
-  p.rspec_options = ['--options', 'spec/spec.opts']
-  p.history_file = 'History.rdoc'
-  p.readme_file  = 'README.rdoc'
-  p.post_install_message = <<-POST_INSTALL_MESSAGE
+Hoe.spec('rspec') do |hoe|
+  hoe.version = Spec::VERSION::STRING
+  hoe.summary = Spec::VERSION::SUMMARY
+  hoe.description = "Behaviour Driven Development for Ruby."
+  hoe.rubyforge_name = 'rspec'
+  hoe.developer('RSpec Development Team', 'rspec-devel@rubyforge.org')
+  hoe.extra_dev_deps = [["cucumber",">= 0.2.2"]]
+  hoe.remote_rdoc_dir = "rspec/#{Spec::VERSION::STRING}"
+  hoe.rspec_options = ['--options', 'spec/spec.opts']
+  hoe.history_file = 'History.rdoc'
+  hoe.readme_file  = 'README.rdoc'
+  hoe.post_install_message = <<-POST_INSTALL_MESSAGE
 #{'*'*50}
 
   Thank you for installing rspec-#{Spec::VERSION::STRING}

data/Upgrade.rdoc

@@ -1,4 +1,4 @@
-= Upgrade to rspec-1.2.3-1.2.6
+= Upgrade to rspec-1.2.3-1.2.7
 
 == What's Changed
 

data/features/command_line/line_number_option.feature

@@ -0,0 +1,56 @@
+Feature: Spec and test together
+
+  As an RSpec user
+  I want to run one example identified by the line number
+  
+  Background:
+    Given a file named "example.rb" with:
+      """
+      describe "a group" do
+
+        it "has a first example" do
+
+        end
+        
+        it "has a second example" do
+
+        end
+        
+      end
+      """
+
+  Scenario: two examples - first example on declaration line
+    When I run "spec example.rb:3 --format nested"
+    Then the stdout should match "1 example, 0 failures"
+    And the stdout should match "has a first example"
+    But the stdout should not match "has a second example"
+
+  Scenario: two examples - first example from line inside declaration
+    When I run "spec example.rb:4 --format nested"
+    Then the stdout should match "1 example, 0 failures"
+    And the stdout should match "has a first example"
+    But the stdout should not match "has a second example"
+
+  Scenario: two examples - first example from line below declaration
+    When I run "spec example.rb:6 --format nested"
+    Then the stdout should match "1 example, 0 failures"
+    And the stdout should match "has a first example"
+    But the stdout should not match "has a second example"
+
+  Scenario: two examples - second example from line below declaration
+    When I run "spec example.rb:7 --format nested"
+    Then the stdout should match "1 example, 0 failures"
+    And the stdout should match "has a second example"
+    But the stdout should not match "has a first example"
+
+  Scenario: two examples - both examples from the group declaration
+    When I run "spec example.rb:1 --format nested"
+    Then the stdout should match "2 examples, 0 failures"
+    And the stdout should match "has a second example"
+    And the stdout should match "has a first example"
+
+  Scenario: two examples - both examples from above the first example declaration
+    When I run "spec example.rb:2 --format nested"
+    Then the stdout should match "2 examples, 0 failures"
+    And the stdout should match "has a second example"
+    And the stdout should match "has a first example"

data/features/command_line/line_number_option_with_example_with_no_name.feature

@@ -0,0 +1,22 @@
+Feature: Spec and test together
+
+  As an RSpec user
+  I want to run one example identified by the line number
+  
+  Background:
+    Given a file named "example.rb" with:
+      """
+      describe 9 do
+
+        it { should be > 8 }
+
+        it { should be < 10 }
+        
+      end
+      """
+
+  Scenario: two examples - first example on declaration line
+    When I run "spec example.rb:3 --format nested"
+    Then the stdout should match "1 example, 0 failures"
+    Then the stdout should match "should be > 8"
+    But the stdout should not match "should be < 10"

data/features/mocks/stub_implementation.feature

@@ -0,0 +1,26 @@
+Feature: stub implementation
+
+  As an rspec user, I want to stub a complete implementation, not just a
+  return value.
+  
+  Scenario: stub implementation
+    Given a file named "stub_implementation.rb" with:
+      """
+      describe "a stubbed implementation" do
+        it "works" do
+          object = Object.new
+          object.stub(:foo) do |arg|
+            if arg == :this
+              "got this"
+            elsif arg == :that
+              "got that"
+            end
+          end
+          
+          object.foo(:this).should == "got this"
+          object.foo(:that).should == "got that"
+        end
+      end
+      """
+    When I run "spec stub_implementation.rb"
+    Then the stdout should match "1 example, 0 failures"

data/lib/autotest/rspec.rb

@@ -4,13 +4,13 @@ Autotest.add_hook :initialize do |at|
   at.clear_mappings
   # watch out: Ruby bug (1.8.6):
   # %r(/) != /\//
-  at.add_mapping(%r%^spec/.*_spec.rb$%) { |filename, _| 
-    filename 
+  at.add_mapping(%r%^spec/.*_spec.rb$%) { |filename, _|
+    filename
   }
-  at.add_mapping(%r%^lib/(.*)\.rb$%) { |_, m| 
+  at.add_mapping(%r%^lib/(.*)\.rb$%) { |_, m|
     ["spec/#{m[1]}_spec.rb"]
   }
-  at.add_mapping(%r%^spec/(spec_helper|shared/.*)\.rb$%) { 
+  at.add_mapping(%r%^spec/(spec_helper|shared/.*)\.rb$%) {
     at.files_matching %r%^spec/.*_spec\.rb$%
   }
 end
@@ -21,10 +21,10 @@ class Autotest::Rspec < Autotest
 
   def initialize
     super
-    self.failed_results_re = /^\d+\)\n(?:\e\[\d*m)?(?:.*?in )?'([^\n]*)'(?: FAILED)?(?:\e\[\d*m)?\n(.*?)\n\n/m
+    self.failed_results_re = /^\d+\)\n(?:\e\[\d*m)?(?:.*?in )?'([^\n]*)'(?: FAILED)?(?:\e\[\d*m)?\n\n?(.*?(\n\n\(.*?)?)\n\n/m
     self.completed_re = /\n(?:\e\[\d*m)?\d* examples?/m
   end
-  
+
   def consolidate_failures(failed)
     filters = new_hash_of_arrays
     failed.each do |spec, trace|
@@ -40,7 +40,7 @@ class Autotest::Rspec < Autotest
     spec_program = File.expand_path(File.join(File.dirname(__FILE__), '..', '..', 'bin', 'spec'))
     return "#{ruby} #{spec_program} --autospec #{files_to_test.keys.flatten.join(' ')} #{add_options_if_present}"
   end
-  
+
   def add_options_if_present # :nodoc:
     File.exist?("spec/spec.opts") ? "-O spec/spec.opts " : ""
   end

data/lib/spec/autorun.rb

@@ -1,3 +1,3 @@
 require 'spec'
 
-Spec::Runner.autorun
+Spec::Runner.autorun

data/lib/spec/deprecation.rb

@@ -16,15 +16,15 @@ NOTICE
 * please use #{alternate_method} instead.
 ADDITIONAL
       end
-      
+
       message << "*****************************************************************"
       warn(message)
     end
-    
+
     def warn(message)
       Kernel.warn(message)
     end
-    
+
   end
 
   class HashWithDeprecationNotice < Hash

data/lib/spec/dsl.rb

@@ -1,2 +1 @@
 require 'spec/dsl/main'
-

data/lib/spec/dsl/main.rb

@@ -2,7 +2,7 @@ module Spec
   module DSL
     module Main
       include Spec::Example::ArgsAndOptions
-      
+
       # Creates and returns a class that includes the ExampleGroupMethods
       # module. Which ExampleGroup type is created depends on the directory of the file
       # calling this method. For example, Spec::Rails will use different
@@ -28,7 +28,7 @@ module Spec
         Spec::Example::ExampleGroupFactory.create_example_group(*args, &block)
       end
       alias :context :describe
-      
+
       # Creates an example group that can be shared by other example groups
       #
       # == Examples
@@ -39,7 +39,7 @@ module Spec
       #
       #  describe SmallEdition do
       #    it_should_behave_like "All Editions"
-      #  
+      #
       #    it "should do small edition stuff" do
       #      ...
       #    end
@@ -50,7 +50,7 @@ module Spec
         Spec::Example::ExampleGroupFactory.create_shared_example_group(*args, &block)
       end
       alias :shared_examples_for :share_examples_for
-      
+
       # Creates a Shared Example Group and assigns it to a constant
       #
       #  share_as :AllEditions do
@@ -59,7 +59,7 @@ module Spec
       #
       #  describe SmallEdition do
       #    it_should_behave_like AllEditions
-      #  
+      #
       #    it "should do small edition stuff" do
       #      ...
       #    end
@@ -70,7 +70,7 @@ module Spec
       #
       #  describe SmallEdition do
       #    include AllEditions
-      #  
+      #
       #    it "should do small edition stuff" do
       #      ...
       #    end

data/lib/spec/example.rb

@@ -7,102 +7,102 @@ module Spec
   # An Example Group is a group of code examples.
   #
   # RSpec exposes a DSL to describe groups of examples.
-  #  
+  #
   #   describe Account do
   #     it "should have a balance of $0" do
   #       account = Account.new
   #       account.balance.should == Money.new(0, :dollars)
   #     end
   #   end
-  #  
+  #
   # == Before and After
-  #  
+  #
   # You can use the <tt>before()</tt> and <tt>after()</tt> methods to extract
   # common code within an Example Group. Both methods take an optional scope
   # argument so you can run the block before :each example or before :all
   # examples
-  #  
+  #
   #   describe "..." do
   #     before :all do
   #       ...
   #     end
-  #  
+  #
   #     before :each do
   #       ...
   #     end
-  #  
+  #
   #     it "should do something" do
   #       ...
   #     end
-  #  
+  #
   #     it "should do something else" do
   #       ...
   #     end
-  #  
+  #
   #     after :each do
   #       ...
   #     end
-  #  
+  #
   #     after :all do
   #       ...
   #     end
-  #  
+  #
   #   end
-  #  
+  #
   # The <tt>before :each</tt> block will run before each of the examples, once
   # for each example. Likewise, the <tt>after :each</tt> block will run after
   # each of the examples.
-  #  
+  #
   # It is also possible to specify a <tt>before :all</tt> and <tt>after
   # :all</tt> block that will run only once for each example group, before the
   # first <code>before :each</code> and after the last <code>after
   # :each</code> respectively. The use of these is generally discouraged,
   # because it introduces dependencies between the examples. Still, it might
   # prove useful for very expensive operations if you know what you are doing.
-  #  
+  #
   # == Local helper methods
-  #  
+  #
   # You can include local helper methods by simply expressing them within an
   # example group:
-  #  
+  #
   #   describe "..." do
-  #    
+  #
   #     it "..." do
   #       helper_method
   #     end
-  #  
+  #
   #     def helper_method
   #       ...
   #     end
-  #  
+  #
   #   end
-  #  
+  #
   # == Included helper methods
-  #  
+  #
   # You can include helper methods in multiple example groups by expressing
   # them within a module, and then including that module in your example
   # groups:
-  #  
+  #
   #   module AccountExampleHelperMethods
   #     def helper_method
   #       ...
   #     end
   #   end
-  #  
+  #
   #   describe "A new account" do
   #     include AccountExampleHelperMethods
   #     before do
   #       @account = Account.new
   #     end
-  #  
+  #
   #     it "should have a balance of $0" do
   #       helper_method
   #       @account.balance.should eql(Money.new(0, :dollars))
   #     end
   #   end
-  #  
+  #
   # == Shared Example Groups
-  #  
+  #
   # You can define a shared example group, that may be used on other groups
   #
   #  share_examples_for "All Editions" do
@@ -111,7 +111,7 @@ module Spec
   #
   #  describe SmallEdition do
   #    it_should_behave_like "All Editions"
-  #   
+  #
   #    it "should do small edition stuff" do
   #      ...
   #    end
@@ -125,7 +125,7 @@ module Spec
   #
   #  describe SmallEdition do
   #    it_should_behave_like AllEditions
-  #   
+  #
   #    it "should do small edition stuff" do
   #      ...
   #    end
@@ -136,7 +136,7 @@ module Spec
   #
   #  describe SmallEdition do
   #    include AllEditions
-  #   
+  #
   #    it "should do small edition stuff" do
   #      ...
   #    end
@@ -162,4 +162,3 @@ require 'spec/example/shared_example_group'
 require 'spec/example/example_group_factory'
 require 'spec/example/errors'
 require 'spec/example/example_matcher'
-