rspec 1.2.9 → 1.3.0

data/History.rdoc

@@ -1,3 +1,36 @@
+=== Version 1.3.0 / 2010-01-11
+
+* enhancements
+  * capture ExpectationNotMet error by default in matcher DSL
+    * supports wrapping other expectations
+  * added match_unless_raises to matcher DSL
+    * supports easy wrapping of t/u assertions in matchers
+    * thanks to Chad Fowler and Glenn Vanderburg for the name
+  * add chain to matcher DSL (Joe Ferris - #935)
+    * see rdoc for Spec::Matchers
+  * and_yield provides configurable eval_context
+    * Eric Meyer & David Chelimsky
+  * CTRL-C actually stops execution! (Bryan Helmkamp - #911)
+  * make drb port configurable (Chris Flipse - #875)
+  * changed raise_error to raise_exception (#933)
+    * kept raise_error aliased, so this is completely
+      backwards compatible
+
+* bug fixes
+  * don't define top-level context() method when running in IRB (#899)
+  * remove Ruby warning for uninitialized ivar (Bryan Helmkamp - #892)
+  * fully qualify reference to Default (Alex Sharp - #895)
+  * use runtime version of Test::Unit::VERSION in incompatibility message
+    (Ryan Bigg - #916)
+  * quote paths in RSpec's own specs so people running in paths with
+    spaces in them can achieve green too (Ryan Bigg - #917)
+  * ensure drb specs run when EADDRNOTAVAIL (Michael Klett - #881)
+  * throw_symbol matcher correctly bubbles errors up (#918)
+  * make Rakefile work without Cucumber installed (#919 - devrandom)
+  * escape . in regexp (#925)
+  * align be_true and be_false with Ruby's conditional semantics (#931)
+  * print duplicate nested descriptions (when appropriate) (#936)
+
 === Version 1.2.9 / 2009-10-05
 
 * enhancements
@@ -25,7 +58,7 @@
   * better handling of determining test names in test/unit/interop mode
     * Joe Ferris
     * closes #854
-    
+
 * bug fixes
 
   * Fixed problem with colorized output when writing to a file

data/License.txt

@@ -1,6 +1,6 @@
 (The MIT License)
 
-Copyright (c) 2005-2009 The RSpec Development Team
+Copyright (c) 2005-2010 The RSpec Development Team
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

data/Manifest.txt

@@ -67,6 +67,8 @@ features/expectations/expect_change.feature
 features/expectations/expect_error.feature
 features/extensions/custom_example_group.feature
 features/formatters/custom_formatter.feature
+features/formatters/nested_formatter.feature
+features/interop/cucumber_stubs_dont_leak.feature
 features/interop/examples_and_tests_together.feature
 features/interop/rspec_output.feature
 features/interop/test_but_not_test_unit.feature
@@ -78,19 +80,24 @@ features/matchers/define_matcher.feature
 features/matchers/define_matcher_outside_rspec.feature
 features/matchers/define_matcher_with_fluent_interface.feature
 features/matchers/define_wrapped_matcher.feature
+features/matchers/match_unless_raises.feature
+features/matchers/match_unless_raises_unexpected_error.feature
 features/mock_framework_integration/use_flexmock.feature
 features/mock_framework_integration/use_mocha.feature
 features/mock_framework_integration/use_rr.feature
+features/mocks/block_local_expectations.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/spec_helper/spec_helper.feature
 features/step_definitions/running_rspec_steps.rb
+features/step_definitions/stubbing_steps.rb
 features/subject/explicit_subject.feature
 features/subject/implicit_subject.feature
 features/support/env.rb
 features/support/matchers/smart_match.rb
+geminstaller.yml
 init.rb
 lib/autotest/discover.rb
 lib/autotest/rspec.rb
@@ -126,6 +133,7 @@ lib/spec/expectations/extensions.rb
 lib/spec/expectations/extensions/kernel.rb
 lib/spec/expectations/fail_with.rb
 lib/spec/expectations/handler.rb
+lib/spec/extensions/instance_exec.rb
 lib/spec/interop/test.rb
 lib/spec/interop/test/unit/autorunner.rb
 lib/spec/interop/test/unit/testcase.rb
@@ -144,7 +152,6 @@ lib/spec/matchers/eql.rb
 lib/spec/matchers/equal.rb
 lib/spec/matchers/errors.rb
 lib/spec/matchers/exist.rb
-lib/spec/matchers/extensions/instance_exec.rb
 lib/spec/matchers/generated_descriptions.rb
 lib/spec/matchers/has.rb
 lib/spec/matchers/have.rb
@@ -155,7 +162,7 @@ lib/spec/matchers/matcher.rb
 lib/spec/matchers/method_missing.rb
 lib/spec/matchers/operator_matcher.rb
 lib/spec/matchers/pretty.rb
-lib/spec/matchers/raise_error.rb
+lib/spec/matchers/raise_exception.rb
 lib/spec/matchers/respond_to.rb
 lib/spec/matchers/satisfy.rb
 lib/spec/matchers/simple_matcher.rb
@@ -274,15 +281,15 @@ spec/spec/matchers/have_spec.rb
 spec/spec/matchers/include_spec.rb
 spec/spec/matchers/match_array_spec.rb
 spec/spec/matchers/match_spec.rb
-spec/spec/matchers/matcher_methods_spec.rb
 spec/spec/matchers/matcher_spec.rb
 spec/spec/matchers/matchers_spec.rb
 spec/spec/matchers/operator_matcher_spec.rb
-spec/spec/matchers/raise_error_spec.rb
+spec/spec/matchers/raise_exception_spec.rb
 spec/spec/matchers/respond_to_spec.rb
 spec/spec/matchers/satisfy_spec.rb
 spec/spec/matchers/simple_matcher_spec.rb
 spec/spec/matchers/throw_symbol_spec.rb
+spec/spec/mocks/and_yield_spec.rb
 spec/spec/mocks/any_number_of_times_spec.rb
 spec/spec/mocks/argument_expectation_spec.rb
 spec/spec/mocks/argument_matchers_spec.rb

data/README.rdoc

@@ -50,6 +50,5 @@ examples.
 
   [sudo] gem install rspec
 
- or
-
- clone, build, install - See http://wiki.github.com/dchelimsky/rspec
+See http://wiki.github.com/dchelimsky/rspec if you want
+to clone/build/install.

data/Rakefile

@@ -7,7 +7,6 @@ $:.unshift 'lib'
 require 'spec/version'
 require 'spec/rake/spectask'
 require 'spec/ruby'
-require 'cucumber/rake/task'
 
 Hoe.spec 'rspec' do
   self.version = Spec::VERSION::STRING
@@ -15,7 +14,7 @@ Hoe.spec 'rspec' do
   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"] << ["bmabey-fakefs",">=0.1.1"] << ["syntax",">=1.0"] << ["diff-lcs",">=1.1.2"]
+  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']
@@ -78,18 +77,23 @@ namespace :spec do
   end
 end
 
-desc "Run Cucumber features"
-if RUBY_VERSION =~ /^1.8/
-  Cucumber::Rake::Task.new :features do |t|
-    t.rcov = true
-    t.rcov_opts = ['--exclude', "features,kernel,load-diff-lcs\.rb,instance_exec\.rb,lib/spec.rb,lib/spec/runner.rb,^spec/*,bin/spec,examples,/gems,/Library/Ruby,\.autotest,#{ENV['GEM_HOME']}"]
-    t.rcov_opts << '--no-html --aggregate coverage.data'
-    t.cucumber_opts = %w{--format progress}
-  end
-else
-  task :features do
-    sh 'cucumber --profile no_heckle'
+begin
+  require 'cucumber/rake/task'
+  desc "Run Cucumber features"
+  if RUBY_VERSION =~ /^1.8/
+    Cucumber::Rake::Task.new :features do |t|
+      t.rcov = true
+      t.rcov_opts = ['--exclude', "features,kernel,load-diff-lcs\.rb,instance_exec\.rb,lib/spec.rb,lib/spec/runner.rb,^spec/*,bin/spec,examples,/gems,/Library/Ruby,\.autotest,#{ENV['GEM_HOME']}"]
+      t.rcov_opts << '--no-html --aggregate coverage.data'
+      t.cucumber_opts = %w{--format progress}
+    end
+  else
+    task :features do
+      sh 'cucumber --profile no_heckle'
+    end
   end
+rescue LoadError
+  puts "You need cucumber installed to run cucumber tasks"
 end
 
 desc "Run failing examples (see failure output)"

data/Upgrade.rdoc

@@ -1,3 +1,61 @@
+= Upgrade to 1.3.0
+
+== What's changed
+
+=== +be_true+ and +be_false+
+
+These methods now align with Ruby's conditional semantics:
+
+* +be_false+ passes for +false+ and +nil+
+* +be_true+ passes for everything else
+
+This is a change from the previous behaviour (which wasn't working correctly
+anyway), which was supposed to treat +be_true+ as <tt>equal(true)</tt>, and +be_false+ as
+<tt>equal(false)</tt>. 
+
+If the actual values +true+ and +false+ are meaningful to your examples, you'll
+want to change the to use <tt>equal(true)</tt> and <tt>equal(false)</tt> (or
+<tt>==(true)</tt> and <tt>==(false)</tt>).
+
+=== +raise_exception+
+
+We changed the +raise_error+ matcher to +raise_exception+, and aliased it with
++raise_error+. This maintains backward compatibility, and also gives you the
+option of being more precise in specs about what is expected.
+
+=== Matcher DSL
+
+==== +match+ rescues from +ExpectationNotMetErrror+ by default
+
+This allows you to wrap other expectations in the +match+ method. Consider
+this matcher:
+
+    Spec::Matchers.define :teach do |subject|
+      match do |teacher|
+        teacher.subjects.should include(subject)
+      end
+    end
+
+The block passed to +match+ is called internally by Rspec, and is expected to
+return a boolean value. In this case, if <tt>should include(subject)</tt>
+fails, it raises an +ExpectationNotMetError+.
+
+Beginning with rspec-1.3.0, when the match block raises an
++ExpectationNotMetError+, it is captured and the block returns +false+.
+Otherwise it returns +true+, so it works like any other matcher.
+
+==== match_unless_raises
+
+The new +match_unless_raises+ method allows you to wrap <tt>Test::Unit</tt>
+assertions by capturing +AssertionFailedError+ and returning false, just as the
++match+ method now does with +ExpectationNotMetError+.
+
+    Spec::Matchers.define :teach do |subject|
+      match_unless_raises Test::Unit::AssertionFailedError do |teacher|
+        assert teacher.subjects.include?(subject)
+      end
+    end
+
 = Upgrade to rspec-1.2.9
 
 == What's new
@@ -9,8 +67,11 @@ automatically as long as you don't include any options on the command line.
 
 === let()
 
-Writing specs tends to follow a regular pattern of using local variables, discovering duplication, and then having to convert to local variables to instance variables by adding an "@" symbol. The let() method assigns the result of a lazy eval'd block as the return value of an instance method using
-the same name. This way you can go from this:
+Writing specs tends to follow a regular pattern of using local variables,
+discovering duplication, and then having to convert to local variables to
+instance variables by adding an "@" symbol. The let() method assigns the result
+of a lazy eval'd block as the return value of an instance method using the same
+name. This way you can go from this:
 
     describe Subscription do
       it "does something" do

data/features/formatters/nested_formatter.feature

@@ -0,0 +1,32 @@
+Feature: nested formatter
+
+  The nested formatter follows the nesting in each spec.
+
+  Scenario: parallel contexts
+    Given a file named "simple_example_spec.rb" with:
+      """
+      describe "first group" do
+        context "with context" do
+          specify "does something" do
+          end
+        end
+      end
+      describe "second group" do
+        context "with context" do
+          specify "does something" do
+          end
+        end
+      end
+      """
+
+    When I run "spec simple_example_spec.rb --format nested"
+    Then the exit code should be 0
+    And the stdout should include
+      """
+      first group
+        with context
+          does something
+      second group
+        with context
+          does something
+      """

data/features/interop/cucumber_stubs_dont_leak.feature

@@ -0,0 +1,11 @@
+Feature: Cucumber Stubs Don't Leak
+  In order to not explode from frustration
+  a developer
+  does not want rspec stubs to leak between cucumber scenarios
+
+  Scenario: Create a stub
+    When I stub "nap" on "Time" to "When I Get Cranky"
+    Then calling "nap" on "Time" should return "When I Get Cranky"
+
+  Scenario: Check to see if the stub leaked
+    Then "nap" should not be defined on "Time"

data/features/matchers/define_matcher_with_fluent_interface.feature

@@ -25,3 +25,24 @@ Feature: define matcher
     When I run "spec between_spec.rb --format specdoc"
     Then the stdout should include "1 example, 0 failures"
     And  the stdout should include "should be bigger than 4"
+
+  Scenario: generate method using dsl
+    Given a file named "between_spec.rb" with:
+      """
+      Spec::Matchers.define :be_bigger_than do |first|
+        chain :but_smaller_than do |limit|
+          @limit = limit
+        end
+        
+        match do |actual|
+          (actual > first) && (actual < @limit)
+        end
+      end
+
+      describe 5 do
+        it { should be_bigger_than(4).but_smaller_than(6) }
+      end
+      """
+    When I run "spec between_spec.rb --format specdoc"
+    Then the stdout should include "1 example, 0 failures"
+    And  the stdout should include "should be bigger than 4"

data/features/matchers/define_wrapped_matcher.feature

@@ -3,8 +3,11 @@ Feature: define wrapped matcher
   In order to reuse existing matchers
   As an RSpec user
   I want to define matchers that wrap other matchers
+
+  When the wrapped matcher passes, the wrapping matcher returns true.
+  When the wrapped matcher fails, the wrapping matcher returns false.
   
-  Scenario: one additional method
+  Scenario: wrap a matcher using should
     Given a file named "new_model_spec.rb" with:
       """
       Spec::Matchers.define :have_tag do |tag|
@@ -27,3 +30,27 @@ Feature: define wrapped matcher
       """
     When I run "spec new_model_spec.rb --format specdoc"
     Then the stdout should include "1 example, 0 failures"
+
+  Scenario: wrap a matcher using should_not
+    Given a file named "new_model_spec.rb" with:
+      """
+      Spec::Matchers.define :have_tag do |tag|
+        match do |markup|
+          markup =~ /<#{tag}>.*<\/#{tag}>/
+        end
+      end
+      
+      Spec::Matchers.define :have_button do
+        match do |markup|
+          markup.should have_tag('button')
+        end
+      end
+      
+      describe "some markup" do
+        it "has no buttons" do
+          "<p>Label</p>".should_not have_button
+        end
+      end
+      """
+    When I run "spec new_model_spec.rb --format specdoc"
+    Then the stdout should include "1 example, 0 failures"

data/features/matchers/match_unless_raises.feature

@@ -0,0 +1,60 @@
+Feature: match unless raises
+
+  In order, primarily, to reuse existing test/unit assertions
+  As an RSpec user
+  I want to define matchers that wrap a statement that raises an error on failure
+
+  Background:
+    Given a file named "example.rb" with:
+      """
+      require 'test/unit/assertions'
+
+      Spec::Matchers.define :be_the_same_as do |expected|
+        extend Test::Unit::Assertions
+        match_unless_raises Test::Unit::AssertionFailedError do |actual|
+          assert_equal expected, actual
+        end
+      end
+      """
+  
+  Scenario: passing examples
+    Given a file named "match_unless_raises_spec.rb" with:
+      """
+      require 'example.rb'
+
+      describe 4 do
+        it "is 4" do
+          4.should be_the_same_as(4)
+        end
+      end
+
+      describe 5 do
+        it "is not 4" do
+          5.should_not be_the_same_as(4)
+        end
+      end
+      """
+    When I run "spec match_unless_raises_spec.rb"
+    Then the stdout should include "2 examples, 0 failures"
+
+  Scenario: failing examples
+    Given a file named "match_unless_raises_spec.rb" with:
+      """
+      require 'example.rb'
+
+      describe 4 do
+        it "is 4" do
+          # intentionally fail
+          4.should_not be_the_same_as(4)
+        end
+      end
+
+      describe 5 do
+        it "is not 4" do
+          # intentionally fail
+          5.should be_the_same_as(4)
+        end
+      end
+      """
+    When I run "spec match_unless_raises_spec.rb"
+    Then the stdout should include "2 examples, 2 failures"

data/features/matchers/match_unless_raises_unexpected_error.feature

@@ -0,0 +1,39 @@
+Feature: match unless raises with an unexpected error
+
+  In order to know when a match_unless_raises block raises an unexpected error
+  As an RSpec user
+  I want the error to bubble up
+
+  Background:
+    Given a file named "example.rb" with:
+      """
+      Spec::Matchers.define :be_the_same_as do |expected|
+        match_unless_raises SyntaxError do |actual|
+          raise "unexpected error"
+        end
+      end
+      """
+  
+  Scenario: failing examples
+    Given a file named "match_unless_raises_spec.rb" with:
+      """
+      require 'example.rb'
+
+      describe 4 do
+        it "is 4" do
+          # intentionally fail
+          4.should_not be_the_same_as(4)
+        end
+      end
+
+      describe 5 do
+        it "is not 4" do
+          # intentionally fail
+          5.should be_the_same_as(4)
+        end
+      end
+      """
+    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"
+