rspec 1.2.8 → 1.2.9

data/features/formatters/custom_formatter.feature

@@ -18,13 +18,13 @@ Feature: custom formatters
       end
       """
     And a file named "simple_example_spec.rb" with:
-    """
+      """
       describe "my group" do
         specify "my example" do
         end
       end
-    """
+      """
 
     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 match "example: my example"
+    And the stdout should include "example: my example"

data/features/interop/examples_and_tests_together.feature

@@ -61,18 +61,22 @@ Feature: Spec and test together
       def test_should_fail_with_before_block_variable
         @from_before.should == 50
       end
+      
+      define_method :"test: should run with strange name" do
+        assert true
+      end
     end
     """
 
     When I run "<Command> spec_and_test_together.rb -fs"
 
     Then the exit code should be 256
-    And the stdout should match "ATest"
-    And the stdout should match "Test::Unit::AssertionFailedError in 'An Example should fail with assert'"
-    And the stdout should match "'An Example should fail with should' FAILED"
-    And the stdout should match "10 examples, 6 failures"
-    And the stdout should match /expected: 40,\s*got: 4/m
-    And the stdout should match /expected: 50,\s*got: 5/m
+    And the stdout should include "ATest"
+    And the stdout should include "Test::Unit::AssertionFailedError in 'An Example should fail with assert'"
+    And the stdout should include "'An Example should fail with should' FAILED"
+    And the stdout should include "11 examples, 6 failures"
+    And the stdout should include /expected: 40,\s*got: 4/m
+    And the stdout should include /expected: 50,\s*got: 5/m
 
   Scenarios: run with ruby and spec
     | Command |

data/features/interop/rspec_output.feature

@@ -17,7 +17,7 @@ Feature: spec output
     When I run "<Command> simple_spec.rb"
     Then the exit code should be 0
     And the stdout should not match /\d+ tests, \d+ assertions, \d+ failures, \d+ errors/m
-    And the stdout should match "1 example, 0 failures"
+    And the stdout should include "1 example, 0 failures"
 
   Scenarios: Run with ruby and CommandLine object
     | Command     |

data/features/interop/test_case_with_should_methods.feature

@@ -38,7 +38,7 @@ Story: Test::Unit::TestCase extended by rspec with should methods
     """
     When I run "<Command> test_case_with_should_methods.rb"
     Then the exit code should be 256
-    And the stdout should match "5 examples, 3 failures"
+    And the stdout should include "5 examples, 3 failures"
 
   Scenarios: Run with ruby and spec
     | Command |

data/features/load_paths/add_lib_to_load_path.feature

@@ -0,0 +1,20 @@
+Feature: add ./lib to load path
+  In order to ...
+  As a spec author
+  I want rspec to add ./lib to the load path
+
+  Scenario: spec helper
+    Given a directory named "spec"
+    And a file named "example.rb" with:
+      """
+      describe $LOAD_PATH do
+        it "begins with 'lib' in the current directory in the load path" do
+          libdir = File.expand_path(File.join(File.dirname(__FILE__), 'lib'))
+          $LOAD_PATH.should include(libdir)
+        end
+      end
+      """
+    When I run "spec example.rb"
+    Then the stdout should include "1 example, 0 failures"
+    And  the exit code should be 0
+

data/features/load_paths/add_spec_to_load_path.feature

@@ -0,0 +1,20 @@
+Feature: add 'spec' to load path
+  In order to ...
+  As a spec author
+  I want rspec to add 'spec to the load path
+
+  Scenario: add 'spec' to load path
+    Given a directory named "spec"
+    And a file named "example.rb" with:
+      """
+      describe $LOAD_PATH do
+        it "includes with 'spec' in the current directory in the load path" do
+          specdir = File.expand_path(File.join(File.dirname(__FILE__), 'spec'))
+          $LOAD_PATH.should include(specdir)
+        end
+      end
+      """
+    When I run "spec example.rb"
+    Then the stdout should include "1 example, 0 failures"
+    And  the exit code should be 0
+

data/features/matchers/define_diffable_matcher.feature

@@ -22,5 +22,5 @@ Feature: define diffable matcher
     When I run "spec diffable_matcher_spec.rb --diff"
     Then the exit code should be 256
 
-    And the stdout should match "should be just like \"that\""
-    And the stdout should match "Diff:\n@@ -1,2 +1,2 @@\n-that\n+this"
+    And the stdout should include "should be just like \"that\""
+    And the stdout should include "Diff:\n@@ -1,2 +1,2 @@\n-that\n+this"

data/features/matchers/define_matcher.feature

@@ -35,14 +35,14 @@ Feature: define matcher
     When I run "spec matcher_with_default_message_spec.rb --format specdoc"
     Then the exit code should be 256
 
-    And the stdout should match "should be a multiple of 3"
-    And the stdout should match "should not be a multiple of 4"
-    And the stdout should match "should be a multiple of 4 (FAILED - 1)"
-    And the stdout should match "should not be a multiple of 3 (FAILED - 2)"
+    And the stdout should include "should be a multiple of 3"
+    And the stdout should include "should not be a multiple of 4"
+    And the stdout should include "should be a multiple of 4 (FAILED - 1)"
+    And the stdout should include "should not be a multiple of 3 (FAILED - 2)"
 
-    And the stdout should match "4 examples, 2 failures"
-    And the stdout should match "expected 9 to be a multiple of 4"
-    And the stdout should match "expected 9 not to be a multiple of 3"
+    And the stdout should include "4 examples, 2 failures"
+    And the stdout should include "expected 9 to be a multiple of 4"
+    And the stdout should include "expected 9 not to be a multiple of 3"
 
   Scenario: overriding the failure_message_for_should
     Given a file named "matcher_with_failure_message_spec.rb" with:
@@ -63,8 +63,8 @@ Feature: define matcher
       """
     When I run "spec matcher_with_failure_message_spec.rb"
     Then the exit code should be 256
-    And the stdout should match "1 example, 1 failure"
-    And the stdout should match "expected that 9 would be a multiple of 4"
+    And the stdout should include "1 example, 1 failure"
+    And the stdout should include "expected that 9 would be a multiple of 4"
 
   Scenario: overriding the failure_message_for_should_not
     Given a file named "matcher_with_failure_for_message_spec.rb" with:
@@ -85,8 +85,8 @@ Feature: define matcher
       """
     When I run "spec matcher_with_failure_for_message_spec.rb"
     Then the exit code should be 256
-    And the stdout should match "1 example, 1 failure"
-    And the stdout should match "expected that 9 would not be a multiple of 3"
+    And the stdout should include "1 example, 1 failure"
+    And the stdout should include "expected that 9 would not be a multiple of 3"
 
   Scenario: overriding the description
     Given a file named "matcher_overriding_description_spec.rb" with:
@@ -110,9 +110,9 @@ Feature: define matcher
       """
     When I run "spec matcher_overriding_description_spec.rb --format specdoc"
     Then the exit code should be 0
-    And the stdout should match "2 examples, 0 failures"
-    And the stdout should match "should be multiple of 3"
-    And the stdout should match "should not be multiple of 4"
+    And the stdout should include "2 examples, 0 failures"
+    And the stdout should include "should be multiple of 3"
+    And the stdout should include "should not be multiple of 4"
 
   Scenario: with no args
     Given a file named "matcher_with_no_args_spec.rb" with:
@@ -133,8 +133,8 @@ Feature: define matcher
       """
     When I run "spec matcher_with_no_args_spec.rb --format specdoc"
     Then the exit code should be 0
-    And the stdout should match "1 example, 0 failures"
-    And the stdout should match "should have 7 fingers"
+    And the stdout should include "1 example, 0 failures"
+    And the stdout should include "should have 7 fingers"
 
   Scenario: with multiple args
     Given a file named "matcher_with_multiple_args_spec.rb" with:
@@ -151,8 +151,8 @@ Feature: define matcher
       """
     When I run "spec matcher_with_multiple_args_spec.rb --format specdoc"
     Then the exit code should be 0
-    And the stdout should match "1 example, 0 failures"
-    And the stdout should match "should be the sum of 1, 2, 3, and 4"
+    And the stdout should include "1 example, 0 failures"
+    And the stdout should include "should be the sum of 1, 2, 3, and 4"
     
   Scenario: with helper methods
     Given a file named "matcher_with_internal_helper_spec.rb" with:
@@ -175,5 +175,5 @@ Feature: define matcher
       """
     When I run "spec matcher_with_internal_helper_spec.rb"
     Then the exit code should be 0
-    And the stdout should match "1 example, 0 failures"
+    And the stdout should include "1 example, 0 failures"
 

data/features/matchers/define_matcher_outside_rspec.feature

@@ -7,7 +7,6 @@ Feature: define matcher outside rspec
   Scenario: define a matcher with default messages
     Given a file named "test_multiples.rb" with:
       """
-      $:.unshift File.join(File.dirname(__FILE__), "/../../lib")
       require 'test/unit'
       require 'spec/expectations'
       
@@ -35,5 +34,5 @@ Feature: define matcher outside rspec
       """
     When I run "ruby test_multiples.rb"
     Then the exit code should be 256
-    And the stdout should match "expected 9 to be a multiple of 4"
-    And the stdout should match "2 tests, 0 assertions, 1 failures, 0 errors"
+    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/define_matcher_with_fluent_interface.feature

@@ -23,5 +23,5 @@ Feature: define matcher
       end
       """
     When I run "spec between_spec.rb --format specdoc"
-    Then the stdout should match "1 example, 0 failures"
-    And  the stdout should match "should be bigger than 4"
+    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

@@ -0,0 +1,29 @@
+Feature: define wrapped matcher
+
+  In order to reuse existing matchers
+  As an RSpec user
+  I want to define matchers that wrap other matchers
+  
+  Scenario: one additional method
+    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 a button" do
+          "<button>Label</button>".should 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/mock_framework_integration/use_flexmock.feature

@@ -24,4 +24,4 @@ Feature: mock with flexmock
       """
     When I run "spec flexmock_example_spec.rb"
     Then the exit code should be 0
-    And the stdout should match "2 examples, 0 failures"
+    And the stdout should include "2 examples, 0 failures"

data/features/mock_framework_integration/use_mocha.feature

@@ -24,4 +24,4 @@ Feature: mock with mocha
       """
     When I run "spec mocha_example_spec.rb"
     Then the exit code should be 0
-    And the stdout should match "2 examples, 0 failures"
+    And the stdout should include "2 examples, 0 failures"

data/features/mock_framework_integration/use_rr.feature

@@ -24,4 +24,4 @@ Feature: mock with rr
       """
     When I run "spec rr_example_spec.rb"
     Then the exit code should be 0
-    And the stdout should match "2 examples, 0 failures"
+    And the stdout should include "2 examples, 0 failures"

data/features/mocks/mix_stubs_and_mocks.feature

@@ -1,4 +1,4 @@
-Feature: Spec and test together
+Feature: stub and mock together
 
   As an RSpec user
   I want to use stubs and mocks together
@@ -19,4 +19,4 @@ Feature: Spec and test together
       end
       """
     When I run "spec stub_and_mocks_spec.rb --format nested"
-    Then the stdout should match "expected :foo with (\"first\") but received it with ([\"second\"], [\"third\"])"
+    Then the stdout should include "received :foo with unexpected arguments\n  expected: (\"first\")\n       got: ([\"second\"], [\"third\"])"

data/features/mocks/stub_implementation.feature

@@ -23,4 +23,4 @@ Feature: stub implementation
       end
       """
     When I run "spec stub_implementation.rb"
-    Then the stdout should match "1 example, 0 failures"
+    Then the stdout should include "1 example, 0 failures"

data/features/pending/pending_examples.feature

@@ -12,9 +12,9 @@ Feature: pending examples
       """
     When I run "spec example_without_block_spec.rb"
     Then the exit code should be 0
-    And the stdout should match "1 example, 0 failures, 1 pending"
-    And the stdout should match "Not Yet Implemented"
-    And the stdout should match "example_without_block_spec.rb:2"
+    And the stdout should include "1 example, 0 failures, 1 pending"
+    And the stdout should include "Not Yet Implemented"
+    And the stdout should include "example_without_block_spec.rb:2"
 
   Scenario: pending implementation with spec/test/unit
     Given a file named "example_without_block_spec.rb" with:
@@ -26,9 +26,9 @@ Feature: pending examples
       """
     When I run "spec example_without_block_spec.rb"
     Then the exit code should be 0
-    And the stdout should match "1 example, 0 failures, 1 pending"
-    And the stdout should match "Not Yet Implemented"
-    And the stdout should match "example_without_block_spec.rb:3"
+    And the stdout should include "1 example, 0 failures, 1 pending"
+    And the stdout should include "Not Yet Implemented"
+    And the stdout should include "example_without_block_spec.rb:3"
 
   Scenario: pending any arbitary reason, with no block
     Given a file named "pending_without_block_spec.rb" with:
@@ -41,9 +41,9 @@ Feature: pending examples
       """
     When I run "spec pending_without_block_spec.rb"
     Then the exit code should be 0
-    And the stdout should match "1 example, 0 failures, 1 pending"
-    And the stdout should match "(something else getting finished)"
-    And the stdout should match "pending_without_block_spec.rb:2"
+    And the stdout should include "1 example, 0 failures, 1 pending"
+    And the stdout should include "(something else getting finished)"
+    And the stdout should include "pending_without_block_spec.rb:2"
 
   Scenario: pending any arbitary reason, with a block that fails
     Given a file named "pending_with_failing_block_spec.rb" with:
@@ -58,9 +58,9 @@ Feature: pending examples
       """
     When I run "spec pending_with_failing_block_spec.rb"
     Then the exit code should be 0
-    And the stdout should match "1 example, 0 failures, 1 pending"
-    And the stdout should match "(something else getting finished)"
-    And the stdout should match "pending_with_failing_block_spec.rb:2"
+    And the stdout should include "1 example, 0 failures, 1 pending"
+    And the stdout should include "(something else getting finished)"
+    And the stdout should include "pending_with_failing_block_spec.rb:2"
 
   Scenario: pending any arbitary reason, with a block that passes
     Given a file named "pending_with_passing_block_spec.rb" with:
@@ -75,7 +75,7 @@ Feature: pending examples
       """
     When I run "spec pending_with_passing_block_spec.rb"
     Then the exit code should be 256
-    And the stdout should match "1 example, 1 failure"
-    And the stdout should match "FIXED"
-    And the stdout should match "Expected pending 'something else getting finished' to fail. No Error was raised."
-    And the stdout should match "pending_with_passing_block_spec.rb:3"
+    And the stdout should include "1 example, 1 failure"
+    And the stdout should include "FIXED"
+    And the stdout should include "Expected pending 'something else getting finished' to fail. No Error was raised."
+    And the stdout should include "pending_with_passing_block_spec.rb:3"

data/features/runner/specify_line_number.feature

@@ -14,8 +14,8 @@ Feature: run specific examples by line number
       end
       """
     When I run "spec example_spec.rb --line 2"
-    Then the stdout should match "1 example, 0 failures, 1 pending"
-    And the stdout should match "example_spec.rb:2"
+    Then the stdout should include "1 example, 0 failures, 1 pending"
+    And the stdout should include "example_spec.rb:2"
 
   Scenario: colon line syntax on single example
     Given a file named "example_spec.rb" with:
@@ -28,5 +28,5 @@ Feature: run specific examples by line number
       end
       """
     When I run "spec example_spec.rb:2"
-    Then the stdout should match "1 example, 0 failures, 1 pending"
-    And the stdout should match "example_spec.rb:2"
+    Then the stdout should include "1 example, 0 failures, 1 pending"
+    And the stdout should include "example_spec.rb:2"

data/features/spec_helper/spec_helper.feature

@@ -0,0 +1,25 @@
+Feature: spec helper
+  In order to centralize code needed across most specs
+  As a spec author
+  I want to require 'spec_helper'
+  
+  Because rspec adds the PROJECT_ROOT/spec directory to the load path, we can
+  just require 'spec_helper' and it will be found.
+
+  Scenario: spec helper
+    Given a directory named "spec"
+    And a file named "spec/spec_helper.rb" with:
+      """
+      SOME_CONSTANT = 'some value'
+      """
+    And a file named "example.rb" with:
+      """
+      require 'spec_helper'
+      describe SOME_CONSTANT do
+        it { should == 'some value' }
+      end
+      """
+    When I run "spec example.rb"
+    And  the stdout should include "1 example, 0 failures"
+    And  the exit code should be 0
+

data/features/step_definitions/running_rspec_steps.rb

@@ -2,6 +2,9 @@ Given %r{^a file named "([^"]+)" with:$} do |file_name, code|
   create_file(file_name, code)
 end
 
+Given /^a directory named "([^\"]*)"$/ do |dirname|
+  create_directory(dirname)
+end
 
 When %r{^I run "spec ([^"]+)"$} do |file_and_args|
   spec(file_and_args)
@@ -15,8 +18,7 @@ When %r{^I run "cmdline.rb ([^"]+)"$} do |file_and_args|
   cmdline(file_and_args)
 end
 
-
-Then /^the (.*) should match (.*)$/ do |stream, string_or_regex|
+Then /^the (.*) should include (.*)$/ do |stream, string_or_regex|
   written = case(stream)
     when 'stdout' then last_stdout
     when 'stderr' then last_stderr

data/features/subject/explicit_subject.feature

@@ -13,7 +13,7 @@ Feature: explicit subject
       end
       """
     When I run "spec top_level_subject_spec.rb"
-    Then the stdout should match "1 example, 0 failures"
+    Then the stdout should include "1 example, 0 failures"
 
   Scenario: subject in a nested group
     Given a file named "nested_subject_spec.rb" with:
@@ -28,4 +28,4 @@ Feature: explicit subject
       end
       """
     When I run "spec nested_subject_spec.rb"
-    Then the stdout should match "1 example, 0 failures"
+    Then the stdout should include "1 example, 0 failures"