rspec 1.2.2 → 1.2.3

data/features/matchers/{create_matcher_outside_rspec.feature → define_matcher_outside_rspec.feature}

@@ -1,17 +1,17 @@
-Feature: custom matcher shortcut
+Feature: define matcher outside rspec
 
   In order to express my domain clearly in my code examples
   As a non-rspec user
-  I want a shortcut for create custom matchers
+  I want a shortcut to define custom matchers
 
-  Scenario: creating a matcher with default messages
-    Given a file named test_multiples.rb with:
+  Scenario: define a matcher with default messages
+    Given a file named "test_multiples.rb" with:
       """
-      $:.unshift File.join(File.dirname(__FILE__), "/../lib")
+      $:.unshift File.join(File.dirname(__FILE__), "/../../lib")
       require 'test/unit'
       require 'spec/expectations'
       
-      Spec::Matchers.create :be_a_multiple_of do |expected|
+      Spec::Matchers.define :be_a_multiple_of do |expected|
         match do |actual|
           actual % expected == 0
         end
@@ -33,7 +33,7 @@ Feature: custom matcher shortcut
         
       end
       """
-    When I run it with the ruby interpreter
+    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"

data/features/mock_framework_integration/use_flexmock.feature

@@ -4,7 +4,7 @@ Feature: mock with flexmock
   I want to be able to use flexmock without rspec mocks interfering
 
   Scenario: Mock with flexmock
-    Given the following spec:
+    Given a file named "flexmock_example_spec.rb" with:
       """
       Spec::Runner.configure do |config|
         config.mock_with :flexmock
@@ -22,6 +22,6 @@ Feature: mock with flexmock
         end
       end
       """
-    When I run it with the spec command
+    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 match "2 examples, 0 failures"

data/features/mock_framework_integration/use_mocha.feature

@@ -4,7 +4,7 @@ Feature: mock with mocha
   I want to be able to use mocha without rspec mocks interfering
 
   Scenario: Mock with mocha
-    Given the following spec:
+    Given a file named "mocha_example_spec.rb" with:
       """
       Spec::Runner.configure do |config|
         config.mock_with :mocha
@@ -22,6 +22,6 @@ Feature: mock with mocha
         end
       end
       """
-    When I run it with the spec command
+    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 match "2 examples, 0 failures"

data/features/mock_framework_integration/use_rr.feature

@@ -4,7 +4,7 @@ Feature: mock with rr
   I want to be able to use rr without rspec mocks interfering
 
   Scenario: Mock with rr
-    Given the following spec:
+    Given a file named "rr_example_spec.rb" with:
       """
       Spec::Runner.configure do |config|
         config.mock_with :rr
@@ -22,6 +22,6 @@ Feature: mock with rr
         end
       end
       """
-    When I run it with the spec command
+    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 match "2 examples, 0 failures"

data/features/mocks/mix_stubs_and_mocks.feature

@@ -4,13 +4,13 @@ Feature: Spec and test together
   I want to use stubs and mocks together
 
   Scenario: stub in before
-    Given the following spec:
+    Given a file named "stub_and_mocks_spec.rb" with:
       """
       describe "a stub in before" do
         before(:each) do
           @messenger = mock('messenger').as_null_object
         end
-      
+
         it "a" do
           @messenger.should_receive(:foo).with('first')
           @messenger.foo('second')
@@ -18,5 +18,5 @@ Feature: Spec and test together
         end
       end
       """
-    When I run it with the spec command --format nested
-    Then the stdout should match "expected :foo with (\"first\") but received it with ([\"second\"], [\"third\"])"
+    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\"])"

data/features/pending/pending_examples.feature

@@ -2,36 +2,36 @@ Feature: pending examples
 
   RSpec offers three ways to indicate that an example is disabled pending
   some action.
-  
+
   Scenario: pending implementation
-    Given the following spec:
+    Given a file named "example_without_block_spec.rb" with:
       """
       describe "an example" do
         it "has not yet been implemented"
       end
       """
-    When I run it with the spec command
+    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 "current_example.rb:3"
-    
+    And the stdout should match "example_without_block_spec.rb:2"
+
   Scenario: pending implementation with spec/test/unit
-    Given the following spec:
+    Given a file named "example_without_block_spec.rb" with:
       """
       require 'spec/test/unit'
       describe "an example" do
         it "has not yet been implemented"
       end
       """
-    When I run it with the spec command
+    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 "current_example.rb:4"
+    And the stdout should match "example_without_block_spec.rb:3"
 
   Scenario: pending any arbitary reason, with no block
-    Given the following spec:
+    Given a file named "pending_without_block_spec.rb" with:
       """
       describe "an example" do
         it "is implemented but waiting" do
@@ -39,14 +39,14 @@ Feature: pending examples
         end
       end
       """
-    When I run it with the spec command
+    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 "current_example.rb:4"
+    And the stdout should match "pending_without_block_spec.rb:2"
 
-  Scenario: pending any arbitary reason, with a block
-    Given the following spec:
+  Scenario: pending any arbitary reason, with a block that fails
+    Given a file named "pending_with_failing_block_spec.rb" with:
       """
       describe "an example" do
         it "is implemented but waiting" do
@@ -56,14 +56,14 @@ Feature: pending examples
         end
       end
       """
-    When I run it with the spec command
+    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 "current_example.rb:4"
+    And the stdout should match "pending_with_failing_block_spec.rb:2"
 
   Scenario: pending any arbitary reason, with a block that passes
-    Given the following spec:
+    Given a file named "pending_with_passing_block_spec.rb" with:
       """
       describe "an example" do
         it "is implemented but waiting" do
@@ -73,9 +73,9 @@ Feature: pending examples
         end
       end
       """
-    When I run it with the spec command
+    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 "current_example.rb:4"
+    And the stdout should match "pending_with_passing_block_spec.rb:3"

data/features/runner/specify_line_number.feature

@@ -0,0 +1,32 @@
+Feature: run specific examples by line number
+
+  In order to run a single example from command line
+  RSpec allows you to specify the line number of the example(s) to run
+
+  Scenario: --line syntax on single example
+    Given a file named "example_spec.rb" with:
+      """
+      describe "an example" do
+        it "has not yet been implemented"
+        it "has been implemented" do
+          true
+        end
+      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"
+
+  Scenario: colon line syntax on single example
+    Given a file named "example_spec.rb" with:
+      """
+      describe "an example" do
+        it "has not yet been implemented"
+        it "has been implemented" do
+          true
+        end
+      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"

data/features/step_definitions/running_rspec_steps.rb

@@ -0,0 +1,41 @@
+Given %r{^a file named "([^"]+)" with:$} do |file_name, code|
+  create_file(file_name, code)
+end
+
+
+When %r{^I run "spec ([^"]+)"$} do |file_and_args|
+  spec(file_and_args)
+end
+
+When %r{^I run "ruby ([^"]+)"$} do |file_and_args|
+  ruby(file_and_args)
+end
+
+When %r{^I run "cmdline.rb ([^"]+)"$} do |file_and_args|
+  cmdline(file_and_args)
+end
+
+
+Then /^the (.*) should match (.*)$/ do |stream, string_or_regex|
+  written = case(stream)
+    when 'stdout' then last_stdout
+    when 'stderr' then last_stderr
+    else raise "Unknown stream: #{stream}"
+  end
+  written.should smart_match(string_or_regex)
+end
+
+Then /^the (.*) should not match (.*)$/ do |stream, string_or_regex|
+  written = case(stream)
+    when 'stdout' then last_stdout
+    when 'stderr' then last_stderr
+    else raise "Unknown stream: #{stream}"
+  end
+  written.should_not smart_match(string_or_regex)
+end
+
+Then /^the exit code should be (\d+)$/ do |exit_code|
+  if last_exit_code != exit_code.to_i
+    raise "Did not exit with #{exit_code}, but with #{last_exit_code}. Standard error:\n#{last_stderr}"
+  end
+end

data/features/subject/explicit_subject.feature

@@ -3,7 +3,7 @@ Feature: explicit subject
   You can override the implicit subject using the subject() method.
   
   Scenario: subject in top level group
-    Given the following spec:
+    Given a file named "top_level_subject_spec.rb" with:
       """
       describe Array, "with some elements" do
         subject { [1,2,3] }
@@ -12,11 +12,11 @@ Feature: explicit subject
         end
       end
       """
-    When I run it with the spec command
+    When I run "spec top_level_subject_spec.rb"
     Then the stdout should match "1 example, 0 failures"
 
   Scenario: subject in a nested group
-    Given the following spec:
+    Given a file named "nested_subject_spec.rb" with:
       """
       describe Array do
         subject { [1,2,3] }
@@ -27,5 +27,5 @@ Feature: explicit subject
         end
       end
       """
-    When I run it with the spec command
+    When I run "spec nested_subject_spec.rb"
     Then the stdout should match "1 example, 0 failures"

data/features/subject/implicit_subject.feature

@@ -5,7 +5,7 @@ Feature: implicit subject
   that example.
   
   Scenario: subject in top level group
-    Given the following spec:
+    Given a file named "top_level_subject_spec.rb" with:
       """
       describe Array, "when first created" do
         it "should be empty" do
@@ -13,11 +13,11 @@ Feature: implicit subject
         end
       end
       """
-    When I run it with the spec command
+    When I run "spec top_level_subject_spec.rb"
     Then the stdout should match "1 example, 0 failures"
 
   Scenario: subject in a nested group
-    Given the following spec:
+    Given a file named "nested_subject_spec.rb" with:
       """
       describe Array do
         describe "when first created" do
@@ -27,5 +27,5 @@ Feature: implicit subject
         end
       end
       """
-    When I run it with the spec command
+    When I run "spec nested_subject_spec.rb"
     Then the stdout should match "1 example, 0 failures"

data/features/support/env.rb

@@ -1,26 +1,79 @@
+$:.unshift File.join(File.dirname(__FILE__), "/../../lib")
+
+require 'spec/expectations'
+require 'forwardable'
 require 'tempfile'
 require File.dirname(__FILE__) + '/../../spec/ruby_forker'
 require File.dirname(__FILE__) + '/matchers/smart_match'
 
-$:.push File.join(File.dirname(__FILE__), "/../../lib")
-require 'spec/expectations'
-require 'spec/matchers'
 
-module RspecWorld
+class RspecWorld
   include Spec::Expectations
   include Spec::Matchers
   include RubyForker
 
-  def spec(args, stderr)
-    ruby("#{File.dirname(__FILE__) + '/../../bin/spec'} #{args}", stderr)
+  extend Forwardable
+  def_delegators RspecWorld, :working_dir, :spec_command, :cmdline_file, :rspec_lib
+
+  def self.working_dir
+    @working_dir ||= File.expand_path(File.join(File.dirname(__FILE__), "/../../tmp/cucumber-generated-files"))
   end
 
-  def cmdline(args, stderr)
-    ruby("#{File.dirname(__FILE__) + '/../../resources/helpers/cmdline.rb'} #{args}", stderr)
+  def self.spec_command
+    @spec_command ||= File.expand_path(File.join(File.dirname(__FILE__), "/../../bin/spec"))
   end
+
+  def self.cmdline_file
+    @cmdline_file ||= File.expand_path(File.join(File.dirname(__FILE__), "/../../resources/helpers/cmdline.rb"))
+  end
+
+  def self.rspec_lib
+    @rspec_lib ||= File.join(working_dir, "/../../lib")
+  end
+
+  def spec(args)
+    ruby("#{spec_command} #{args}")
+  end
+
+  def cmdline(args)
+    ruby("#{cmdline_file} #{args}")
+  end
+
+  def create_file(file_name, contents)
+    file_path = File.join(working_dir, file_name)
+    File.open(file_path, "w") { |f| f << contents }
+  end
+
+  def last_stdout
+    @stdout
+  end
+
+  def last_stderr
+    @stderr
+  end
+
+  def last_exit_code
+    @exit_code
+  end
+
+  # it seems like this, and the last_* methods, could be moved into RubyForker-- is that being used anywhere but the features?
+  def ruby(args)
+    stderr_file = Tempfile.new('rspec')
+    stderr_file.close
+    Dir.chdir(working_dir) do
+      @stdout = super("-I #{rspec_lib} #{args}", stderr_file.path)
+    end
+    @stderr = IO.read(stderr_file.path)
+    @exit_code = $?.to_i
+  end
+
+end
+
+Before do
+  FileUtils.rm_rf   RspecWorld.working_dir if test ?d, RspecWorld.working_dir
+  FileUtils.mkdir_p RspecWorld.working_dir
 end
 
-World do |world|
-  world.extend(RspecWorld)
-  world
+World do
+  RspecWorld.new
 end

data/features/support/matchers/smart_match.rb

@@ -1,37 +1,12 @@
-module Spec
-  module Matchers
-    class SmartMatch
-      def initialize(expected)
-        @expected = expected
-      end
-
-      def matches?(actual)
-        @actual = actual
-        # Satisfy expectation here. Return false or raise an error if it's not met.
-
-        if @expected =~ /^\/.*\/?$/ || @expected =~ /^".*"$/
-          regex_or_string = eval(@expected)
-          if Regexp === regex_or_string
-            (@actual =~ regex_or_string) ? true : false
-          else
-            @actual.index(regex_or_string) != nil
-          end
-        else
-          false
-        end
-      end
-
-      def failure_message
-        "expected #{@actual} to smart_match #{@expected}"
-      end
-
-      def negative_failure_message
-        "expected #{@actual} not to smart_match #{@expected}"
-      end
-    end
-
-    def smart_match(expected)
-      SmartMatch.new(expected)
+Spec::Matchers.define :smart_match do |expected|
+  match do |actual|
+    case expected
+    when /^\/.*\/?$/
+      actual =~ eval(expected)
+    when /^".*"$/
+      actual.index(eval(expected))
+    else
+      false
     end
   end
-end
+end