rspec 1.2.2 → 1.2.3

data/History.rdoc

@@ -1,3 +1,33 @@
+=== Version 1.2.3
+
+* deprecations
+
+  * BaseFormatter#add_example_group (use #example_group_started instead)
+  * ExampleGroupProxy#backtrace (use #location instead)
+  * ExampleProxy#backtrace (use #location instead)
+  * BaseFormatter#example_pending now expects two arguments. The third
+    argument is deprecated.
+  * ExampleGroupProxy#filtered_description. This was only used in one place
+    internally, and was a confusing solution to the problem. If you've got a
+    custom formatter that uses it, you can just use
+    ExampleGroupProxy#description and modify it directly.
+  * predicate_matchers (use the new Matcher DSL instead)
+  * Spec::Matchers.create (use Spec::Matchers.define instead)
+
+* enhancements
+
+  * support for specifying single examples with colon syntax. Closes #712.
+    (Ben Mabey)
+    * you can now say "spec some_spec.rb:12" in addition to "spec some_spec.rb
+      --line 12"
+  * run specs locally with --drb if no drb server is running. Closes #780.
+    * still prints "No server running" to stderr
+
+* bug fixes
+
+  * support expectations on DelegateClass (Clifford T. Matthews). Closes #48.
+  * Fixed match_array blows up if elements can't be sorted (Jeff Dean). Closes #779.
+
 === Version 1.2.2 / 2009-03-22
 
 Bug-fix release (fixes regression introduced in 1.2.1)
@@ -14,7 +44,7 @@ rspec-1.2.0.
 
 See Upgrade.rdoc for information about upgrading to rspec-1.2.1
 
-* enhancments
+* enhancements
 
   * matchers, including the new DSL, easily added to your test/unit tests
   * added support for 0 to n args in matcher DSL

data/Manifest.txt

@@ -60,19 +60,22 @@ features/before_and_after_blocks/before_and_after_blocks.feature
 features/example_groups/example_group_with_should_methods.feature
 features/example_groups/implicit_docstrings.feature
 features/example_groups/nested_groups.feature
-features/example_groups/output.feature
+features/extensions/custom_example_group.feature
+features/formatters/custom_formatter.feature
 features/heckle/heckle.feature
 features/interop/examples_and_tests_together.feature
+features/interop/rspec_output.feature
 features/interop/test_but_not_test_unit.feature
 features/interop/test_case_with_should_methods.feature
-features/matchers/create_matcher.feature
-features/matchers/create_matcher_outside_rspec.feature
+features/matchers/define_matcher.feature
+features/matchers/define_matcher_outside_rspec.feature
 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/pending/pending_examples.feature
-features/step_definitions/running_rspec.rb
+features/runner/specify_line_number.feature
+features/step_definitions/running_rspec_steps.rb
 features/subject/explicit_subject.feature
 features/subject/implicit_subject.feature
 features/support/env.rb
@@ -86,9 +89,11 @@ lib/spec/adapters/mock_frameworks/mocha.rb
 lib/spec/adapters/mock_frameworks/rr.rb
 lib/spec/adapters/mock_frameworks/rspec.rb
 lib/spec/autorun.rb
+lib/spec/deprecation.rb
 lib/spec/dsl.rb
 lib/spec/dsl/main.rb
 lib/spec/example.rb
+lib/spec/example/args_and_options.rb
 lib/spec/example/before_and_after_hooks.rb
 lib/spec/example/errors.rb
 lib/spec/example/example_group.rb
@@ -105,11 +110,9 @@ lib/spec/example/predicate_matchers.rb
 lib/spec/example/shared_example_group.rb
 lib/spec/example/subject.rb
 lib/spec/expectations.rb
-lib/spec/expectations/differs/default.rb
-lib/spec/expectations/differs/load-diff-lcs.rb
 lib/spec/expectations/errors.rb
 lib/spec/expectations/extensions.rb
-lib/spec/expectations/extensions/object.rb
+lib/spec/expectations/extensions/kernel.rb
 lib/spec/expectations/handler.rb
 lib/spec/interop/test.rb
 lib/spec/interop/test/unit/autorunner.rb
@@ -169,6 +172,8 @@ lib/spec/runner/backtrace_tweaker.rb
 lib/spec/runner/class_and_arguments_parser.rb
 lib/spec/runner/command_line.rb
 lib/spec/runner/configuration.rb
+lib/spec/runner/differs/default.rb
+lib/spec/runner/differs/load-diff-lcs.rb
 lib/spec/runner/drb_command_line.rb
 lib/spec/runner/example_group_runner.rb
 lib/spec/runner/extensions/kernel.rb
@@ -178,8 +183,10 @@ lib/spec/runner/formatter/failing_example_groups_formatter.rb
 lib/spec/runner/formatter/failing_examples_formatter.rb
 lib/spec/runner/formatter/html_formatter.rb
 lib/spec/runner/formatter/nested_text_formatter.rb
+lib/spec/runner/formatter/no_op_method_missing.rb
 lib/spec/runner/formatter/profile_formatter.rb
 lib/spec/runner/formatter/progress_bar_formatter.rb
+lib/spec/runner/formatter/silent_formatter.rb
 lib/spec/runner/formatter/snippet_extractor.rb
 lib/spec/runner/formatter/specdoc_formatter.rb
 lib/spec/runner/formatter/text_mate_formatter.rb
@@ -196,11 +203,6 @@ resources/rake/examples.rake
 resources/rake/examples_with_rcov.rake
 resources/rake/failing_examples_with_html.rake
 resources/rake/verify_rcov.rake
-resources/spec/example_group_with_should_methods.rb
-resources/spec/simple_spec.rb
-resources/test/spec_and_test_together.rb
-resources/test/spec_including_test_but_not_unit.rb
-resources/test/test_case_with_should_methods.rb
 spec/README.jruby
 spec/autotest/autotest_helper.rb
 spec/autotest/autotest_matchers.rb

data/Rakefile

@@ -13,7 +13,7 @@ Hoe.new('rspec', Spec::VERSION::STRING) do |p|
   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.1.13"]]
+  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'

data/Upgrade.rdoc

@@ -1,4 +1,44 @@
-= Upgrade to rspec-1.2.1
+= Upgrade to rspec-1.2.3
+
+== What's Changed
+
+=== Matcher DSL
+
+Use Spec::Matchers.define instead of Spec::Matchers.create (which is now
+deprecated).
+
+=== Explicit Predicate Matchers are deprecated
+
+With the addition of the new Matcher DSL the old, confusing, and
+almost-nobody-uses-it explicit predicate matcher functionality's days are now
+numbered.
+
+If you're not familiar with this feature, don't worry about it. If you have anything
+that looks like this:
+
+    predicate_matchers[:swim] = :can_swim?
+  
+Or this
+
+    config.predicate_matchers[:swim] = :can_swim?
+  
+Change it to this:
+
+    Spec::Matchers.define :swim do
+      match do |potential_swimmer|
+        potential_swimmer.can_swim?
+      end
+    end
+
+== Custom Formatters
+
+If you have an custom formatter, the <tt>add_example_group</tt> method has
+been changed to <tt>example_group_started</tt>, and kept as an alias so your
+formatters will still work. Though not yet, <tt>add_example_group</tt> will be
+deprecated in a future minor release, and removed in a future major release,
+so we recommend you make this change now.
+
+= Upgrade to rspec-1.2.2
 
 == What's Changed
 
@@ -99,7 +139,7 @@ We'll still support the simple_matcher method, so never fear if you're using
 that, but we recommend that you start developing your new matchers with this
 new syntax.
 
-    Spec::Matchers.create do :be_a_multiple_of |smaller|
+    Spec::Matchers.create :be_a_multiple_of do |smaller|
       match do |bigger|
         bigger % smaller == 0
       end
@@ -107,4 +147,4 @@ new syntax.
 
     9.should be_a_multiple_of(3)
 
-See <tt>features/matchers/create_matcher.feature</tt> for more examples
+See <tt>features/matchers/define_matcher.feature</tt> for more examples

data/examples/failing/failing_implicit_docstrings_example.rb

@@ -3,17 +3,17 @@ require File.dirname(__FILE__) + '/spec_helper'
 # Run spec w/ -fs to see the output of this file
 
 describe "Failing examples with no descriptions" do
-  
+
   # description is auto-generated as "should equal(5)" based on the last #should
   it do
     3.should equal(2)
     5.should equal(5)
   end
-  
+
   it { 3.should be > 5 }
-  
+
   it { ["a"].should include("b") }
-  
+
   it { [1,2,3].should_not respond_to(:size) }
-  
+
 end

data/examples/passing/implicit_docstrings_example.rb

@@ -5,11 +5,11 @@ require File.dirname(__FILE__) + '/spec_helper'
 describe "Examples with no docstrings generate their own:" do
 
   specify { 3.should be < 5 }
-  
+
   specify { ["a"].should include("a") }
-  
+
   specify { [1,2,3].should respond_to(:size) }
-  
+
 end
 
 describe 1 do

data/features/before_and_after_blocks/before_and_after_blocks.feature

@@ -3,10 +3,10 @@ Feature: before and after blocks
   As a developer using RSpec
   I want to execute arbitrary code before and after each example
   So that I can control the environment in which it is run
-  
+
     This is supported by the before and after methods which each take a symbol
     indicating the scope, and a block of code to execute.
-  
+
     before(:each) blocks are run before each example
     before(:all) blocks are run once before all of the examples in a group
     before(:suite) blocks are run once before the entire suite
@@ -22,14 +22,14 @@ Feature: before and after blocks
       after each
       after all
       after suite
-    
+
     Before and after blocks can be defined in the example groups to which they
     apply or in a configuration. When defined in a configuration, they can be
     applied to all groups or subsets of all groups defined by example group
     types.
-  
+
   Scenario: define before(:each) block in example group
-    Given the following spec:
+    Given a file named "before_each_in_example_group_spec.rb" with:
       """
       class Thing
         def widgets
@@ -41,27 +41,27 @@ Feature: before and after blocks
         before(:each) do
           @thing = Thing.new
         end
-        
+
         context "initialized in before(:each)" do
           it "has 0 widgets" do
             @thing.should have(0).widgets
           end
-        
+
           it "can get accept new widgets" do
             @thing.widgets << Object.new
           end
-        
+
           it "does not share state across examples" do
             @thing.should have(0).widgets
           end
         end
       end
       """
-  	When I run it with the spec command
+    When I run "spec before_each_in_example_group_spec.rb"
     Then the stdout should match "3 examples, 0 failures"
-  
+
   Scenario: define before(:all) block in example group
-    Given the following spec:
+    Given a file named "before_all_in_example_group_spec.rb" with:
       """
       class Thing
         def widgets
@@ -73,27 +73,27 @@ Feature: before and after blocks
         before(:all) do
           @thing = Thing.new
         end
-        
+
         context "initialized in before(:all)" do
           it "has 0 widgets" do
             @thing.should have(0).widgets
           end
-        
+
           it "can get accept new widgets" do
             @thing.widgets << Object.new
           end
-        
+
           it "shares state across examples" do
             @thing.should have(1).widgets
           end
         end
       end
       """
-  	When I run it with the spec command
+    When I run "spec before_all_in_example_group_spec.rb"
     Then the stdout should match "3 examples, 0 failures"
-  
+
   Scenario: define before and after blocks in configuration
-    Given the following spec:
+    Given a file named "befores_in_configuration_spec.rb" with:
       """
       Spec::Runner.configure do |config|
         config.before(:suite) do
@@ -125,11 +125,11 @@ Feature: before and after blocks
         end
       end
       """
-    When I run it with the spec command
+    When I run "spec befores_in_configuration_spec.rb"
     Then the stdout should match "3 examples, 0 failures"
 
   Scenario: before/after blocks are run in order
-    Given the following spec:
+    Given a file named "ensure_block_order_spec.rb" with:
       """
       Spec::Runner.configure do |config|
         config.before(:suite) do
@@ -162,7 +162,6 @@ Feature: before and after blocks
         end
       end
       """
-
-    When I run it with the spec command
+    When I run "spec ensure_block_order_spec.rb"
     Then the stdout should match /before suite\nbefore all\nbefore each\nafter each\n\.after all\n.*after suite/m
 

data/features/example_groups/example_group_with_should_methods.feature

@@ -4,14 +4,26 @@ Feature: Spec::ExampleGroup with should methods
   I want to use should_* methods in an ExampleGroup
   So that I use RSpec with classes and methods that look more like RSpec examples
 
-  Scenario: Run with ruby
-    Given the file ../../resources/spec/example_group_with_should_methods.rb
-    When I run it with the ruby interpreter
-    Then the exit code should be 256
-    And the stdout should match "2 examples, 1 failure"
+  Scenario Outline: Example Group class with should methods
+    Given a file named "example_group_with_should_methods.rb" with:
+    """
+    require 'spec/autorun'
 
-  Scenario: Run with spec
-  Given the file ../../resources/spec/example_group_with_should_methods.rb
-    When I run it with the spec command
+    class MySpec < Spec::ExampleGroup
+      def should_pass_with_should
+        1.should == 1
+      end
+
+      def should_fail_with_should
+        1.should == 2
+      end
+    end
+    """
+    When I run "<Command> example_group_with_should_methods.rb"
     Then the exit code should be 256
     And the stdout should match "2 examples, 1 failure"
+
+  Scenarios: Run with ruby and spec
+    | Command |
+    | ruby    |
+    | spec    |

data/features/example_groups/implicit_docstrings.feature

@@ -4,38 +4,54 @@ Feature: implicit docstrings
   I want examples to generate their own names
   So that I can reduce duplication between example names and example code
 
-  Scenario: run passing examples with ruby
-    Given the file ../../examples/passing/implicit_docstrings_example.rb
+  Scenario Outline: run passing examples
+    Given a file named "implicit_docstrings_example.rb" with:
+    """
+    require 'spec/autorun'
+    describe "Examples with no docstrings generate their own:" do
 
-    When I run it with the ruby interpreter -fs
+      specify { 3.should be < 5 }
 
-    And the stdout should match /should be < 5/
+      specify { ["a"].should include("a") }
+
+      specify { [1,2,3].should respond_to(:size) }
+
+    end
+    """
+
+    When I run "<Command> implicit_docstrings_example.rb -fs"
+
+    Then the stdout should match /should be < 5/
     And the stdout should match /should include "a"/
     And the stdout should match /should respond to #size/
 
-  Scenario: run failing examples with ruby
-    Given the file ../../examples/failing/failing_implicit_docstrings_example.rb
+  Scenarios: Run with ruby and spec
+    | Command |
+    | ruby    |
+    | spec    |
 
-    When I run it with the ruby interpreter -fs
+  Scenario Outline: run failing examples
+    Given a file named "failing_implicit_docstrings_example.rb" with:
+    """
+    require 'spec/autorun'
+    describe "Failing examples with no descriptions" do
 
-    Then the stdout should match /should equal 2/
-    And the stdout should match /should be > 5/
-    And the stdout should match /should include "b"/
-    And the stdout should match /should not respond to #size/
+      # description is auto-generated as "should equal(5)" based on the last #should
+      it do
+        3.should equal(2)
+        5.should equal(5)
+      end
 
-  Scenario: run passing examples with spec
-    Given the file ../../examples/passing/implicit_docstrings_example.rb
+      it { 3.should be > 5 }
 
-    When I run it with the spec command -fs
+      it { ["a"].should include("b") }
 
-    And the stdout should match /should be < 5/
-    And the stdout should match /should include "a"/
-    And the stdout should match /should respond to #size/
+      it { [1,2,3].should_not respond_to(:size) }
 
-  Scenario: run failing examples with spec
-    Given the file ../../examples/failing/failing_implicit_docstrings_example.rb
+    end
+    """
 
-    When I run it with the spec command -fs
+    When I run "<Command> failing_implicit_docstrings_example.rb -fs"
 
     Then the stdout should match /should equal 2/
     And the stdout should match /should be > 5/