rspec 1.1.12 → 1.2.0

data/features/interop/examples_and_tests_together.feature

@@ -20,7 +20,7 @@ Feature: Spec and test together
   Scenario: Run with spec
     Given the file ../../resources/test/spec_and_test_together.rb
 
-    When I run it with the spec script -fs
+    When I run it with the spec command -fs
 
     Then the exit code should be 256
     And the stdout should match "ATest"

data/features/interop/test_but_not_test_unit.feature

@@ -10,5 +10,5 @@ Story: Test is defined, but not Test::Unit
 
   Scenario: Run with spec
     Given the file ../../resources/test/spec_including_test_but_not_unit.rb
-    When I run it with the spec script
+    When I run it with the spec command
     Then the stderr should not match "Test::Unit"

data/features/interop/test_case_with_should_methods.feature

@@ -12,6 +12,6 @@ Story: Test::Unit::TestCase extended by rspec with should methods
 
   Scenario: Run with spec
     Given the file ../../resources/test/test_case_with_should_methods.rb
-    When I run it with the spec script
+    When I run it with the spec command
     Then the exit code should be 256
     And the stdout should match "5 examples, 3 failures"

data/features/matchers/create_matcher.feature

@@ -0,0 +1,115 @@
+Feature: custom matcher shortcut
+
+  In order to express my domain clearly in my code examples
+  As an RSpec user
+  I want a shortcut for create custom matchers
+
+  Scenario: creating a matcher with default messages
+    Given the following spec:
+      """
+      Spec::Matchers.create :be_a_multiple_of do |expected|
+        match do |actual|
+          actual % expected == 0
+        end
+      end
+
+      describe 9 do
+        it {should be_a_multiple_of(3)}
+      end
+
+      describe 9 do
+        it {should_not be_a_multiple_of(4)}
+      end
+
+      # fail intentionally to generate expected output
+      describe 9 do
+        it {should be_a_multiple_of(4)}
+      end
+
+      # fail intentionally to generate expected output
+      describe 9 do
+        it {should_not be_a_multiple_of(3)}
+      end
+
+      """
+    When I run it with the spec command --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 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"
+    
+  Scenario: overriding the failure_message_for_should
+    Given the following spec:
+      """
+      Spec::Matchers.create :be_a_multiple_of do |expected|
+        match do |actual|
+          actual % expected == 0
+        end
+        failure_message_for_should do |actual|
+          "expected that #{actual} would be a multiple of #{expected}"
+        end
+      end
+  
+      # fail intentionally to generate expected output
+      describe 9 do
+        it {should be_a_multiple_of(4)}
+      end
+      """
+    When I run it with the spec command
+    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"
+  
+  Scenario: overriding the failure_message_for_should_not
+    Given the following spec:
+      """
+      Spec::Matchers.create :be_a_multiple_of do |expected|
+        match do |actual|
+          actual % expected == 0
+        end
+        failure_message_for_should_not do |actual|
+          "expected that #{actual} would not be a multiple of #{expected}"
+        end
+      end
+  
+      # fail intentionally to generate expected output
+      describe 9 do
+        it {should_not be_a_multiple_of(3)}
+      end
+      """
+    When I run it with the spec command
+    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"
+  
+  Scenario: overriding the description
+    Given the following spec:
+      """
+      Spec::Matchers.create :be_a_multiple_of do |expected|
+        match do |actual|
+          actual % expected == 0
+        end
+        description do
+          "be multiple of #{expected}"
+        end
+      end
+  
+      describe 9 do
+        it {should be_a_multiple_of(3)}
+      end
+  
+      describe 9 do
+        it {should_not be_a_multiple_of(4)}
+      end
+      """
+    When I run it with the spec command --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"

data/features/mock_framework_integration/use_flexmock.feature

@@ -1,9 +1,27 @@
-Story: Getting correct output with flexmock
+Feature: mock with flexmock
 
   As an RSpec user who prefers flexmock
   I want to be able to use flexmock without rspec mocks interfering
 
   Scenario: Mock with flexmock
-    Given the file ../../resources/spec/spec_with_flexmock.rb
-    When I run it with the ruby interpreter
-    Then the exit code should be 0
+    Given the following spec:
+      """
+      Spec::Runner.configure do |config|
+        config.mock_with :flexmock
+      end
+
+      describe "plugging in flexmock" do
+        it "allows flexmock to be used" do
+          target = Object.new
+          flexmock(target).should_receive(:foo).once
+          target.foo
+        end
+
+        it "does not include rspec mocks" do
+          Spec.const_defined?(:Mocks).should be_false
+        end
+      end
+      """
+    When I run it with the spec command
+    Then the exit code should be 0
+    And the stdout should match "2 examples, 0 failures"

data/features/mock_framework_integration/use_mocha.feature

@@ -0,0 +1,27 @@
+Feature: mock with mocha
+
+  As an RSpec user who prefers mocha
+  I want to be able to use mocha without rspec mocks interfering
+
+  Scenario: Mock with mocha
+    Given the following spec:
+      """
+      Spec::Runner.configure do |config|
+        config.mock_with :mocha
+      end
+
+      describe "plugging in mocha" do
+        it "allows mocha to be used" do
+          target = Object.new
+          target.expects(:foo).once
+          target.foo
+        end
+
+        it "does not include rspec mocks" do
+          Spec.const_defined?(:Mocks).should be_false
+        end
+      end
+      """
+    When I run it with the spec command
+    Then the exit code should be 0
+    And the stdout should match "2 examples, 0 failures"

data/features/mock_framework_integration/use_rr.feature

@@ -0,0 +1,27 @@
+Feature: mock with rr
+
+  As an RSpec user who prefers rr
+  I want to be able to use rr without rspec mocks interfering
+
+  Scenario: Mock with rr
+    Given the following spec:
+      """
+      Spec::Runner.configure do |config|
+        config.mock_with :rr
+      end
+
+      describe "plugging in rr" do
+        it "allows rr to be used" do
+          target = Object.new
+          mock(target).foo
+          target.foo
+        end
+
+        it "does not include rspec mocks" do
+          Spec.const_defined?(:Mocks).should be_false
+        end
+      end
+      """
+    When I run it with the spec command
+    Then the exit code should be 0
+    And the stdout should match "2 examples, 0 failures"

data/features/mocks/mix_stubs_and_mocks.feature

@@ -0,0 +1,22 @@
+Feature: Spec and test together
+
+  As an RSpec user
+  I want to use stubs and mocks together
+
+  Scenario: stub in before
+    Given the following spec:
+      """
+      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')
+          @messenger.foo('third')
+        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\"])"

data/features/pending/pending_examples.feature

@@ -0,0 +1,81 @@
+Feature: pending examples
+
+  RSpec offers three ways to indicate that an example is disabled pending
+  some action.
+  
+  Scenario: pending implementation
+    Given the following spec:
+      """
+      describe "an example" do
+        it "has not yet been implemented"
+      end
+      """
+    When I run it with the spec command
+    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:2"
+    
+  Scenario: pending implementation with spec/test/unit
+    Given the following spec:
+      """
+      require 'spec/test/unit'
+      describe "an example" do
+        it "has not yet been implemented"
+      end
+      """
+    When I run it with the spec command
+    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"
+
+  Scenario: pending any arbitary reason, with no block
+    Given the following spec:
+      """
+      describe "an example" do
+        it "is implemented but waiting" do
+          pending("something else getting finished")
+        end
+      end
+      """
+    When I run it with the spec command
+    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:3"
+
+  Scenario: pending any arbitary reason, with a block
+    Given the following spec:
+      """
+      describe "an example" do
+        it "is implemented but waiting" do
+          pending("something else getting finished") do
+            raise "this is the failure"
+          end
+        end
+      end
+      """
+    When I run it with the spec command
+    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:3"
+
+  Scenario: pending any arbitary reason, with a block that passes
+    Given the following spec:
+      """
+      describe "an example" do
+        it "is implemented but waiting" do
+          pending("something else getting finished") do
+            true.should be(true)
+          end
+        end
+      end
+      """
+    When I run it with the spec command
+    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:3"

data/features/step_definitions/running_rspec.rb

@@ -6,7 +6,9 @@ Given /^the file (.*)$/ do |relative_path|
 end
 
 Given /^the following spec:$/ do |spec|
-  @path = "/tmp/example_spec.rb"
+  dir = File.join(File.dirname(__FILE__), "/../../tmp")
+  FileUtils.mkdir(dir) unless test ?d, dir
+  @path = "#{dir}/current_example.rb"
   File.open(@path, "w") do |f|
     f.write spec
   end
@@ -19,8 +21,8 @@ When /^I run it with the (.*)$/ do |interpreter|
     when /^ruby interpreter/
       args = interpreter.gsub('ruby interpreter','')
       ruby("#{@path}#{args}", stderr_file.path)
-    when /^spec script/
-      args = interpreter.gsub('spec script','')
+    when /^spec command/
+      args = interpreter.gsub('spec command','')
       spec("#{@path}#{args}", stderr_file.path)
     when 'CommandLine object' then cmdline(@path, stderr_file.path)
     else raise "Unknown interpreter: #{interpreter}"

data/features/support/env.rb

@@ -16,7 +16,7 @@ module RspecWorld
   end
 
   def cmdline(args, stderr)
-    ruby("#{File.dirname(__FILE__) + '/helpers/cmdline.rb'} #{args}", stderr)
+    ruby("#{File.dirname(__FILE__) + '/../../resources/helpers/cmdline.rb'} #{args}", stderr)
   end
 end
 

data/features/support/matchers/smart_match.rb

@@ -22,11 +22,11 @@ module Spec
       end
 
       def failure_message
-        "expected #{@actual.inspect} to smart_match #{@expected.inspect}, but it didn't"
+        "expected #{@actual} to smart_match #{@expected}"
       end
 
       def negative_failure_message
-        "expected #{@actual.inspect} not to smart_match #{@expected.inspect}, but it did"
+        "expected #{@actual} not to smart_match #{@expected}"
       end
     end
 

data/lib/autotest/rspec.rb

@@ -38,7 +38,7 @@ class Autotest::Rspec < Autotest
   def make_test_cmd(files_to_test)
     return '' if files_to_test.empty?
     spec_program = File.expand_path(File.join(File.dirname(__FILE__), '..', '..', 'bin', 'spec'))
-    return "#{ruby} #{spec_program} #{files_to_test.keys.flatten.join(' ')} #{add_options_if_present}"
+    return "#{ruby} #{spec_program} --autospec #{files_to_test.keys.flatten.join(' ')} #{add_options_if_present}"
   end
   
   def add_options_if_present # :nodoc:

data/lib/spec.rb

@@ -1,7 +1,7 @@
+require 'spec/ruby'
 require 'spec/matchers'
 require 'spec/expectations'
 require 'spec/example'
 require 'spec/runner'
 require 'spec/version'
 require 'spec/dsl'
-require 'spec/ruby'

data/lib/{adapters → spec/adapters}/mock_frameworks/rspec.rb

@@ -1,4 +1,3 @@
-require File.expand_path(File.join(File.dirname(__FILE__), "..", "..", "spec", "mocks"))
 require 'spec/mocks/framework'
 require 'spec/mocks/extensions'
 

data/lib/spec/autorun.rb

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

data/lib/spec/dsl.rb

@@ -1 +1,3 @@
-require 'spec/dsl/main'
+require 'spec/dsl/main'
+require 'spec/dsl/matchers'
+

data/lib/spec/dsl/matchers.rb

@@ -0,0 +1,13 @@
+module Spec
+  module DSL
+    module Matchers
+      def create(name, &block_passed_to_create)
+        define_method name do |expected|
+          Spec::Matchers::Matcher.new name, expected, &block_passed_to_create
+        end
+      end
+    end
+  end
+end
+
+Spec::Matchers.extend Spec::DSL::Matchers

data/lib/spec/example.rb

@@ -173,9 +173,13 @@ module Spec
 end
 
 require 'timeout'
+require 'spec/example/predicate_matchers'
+require 'spec/example/example_description'
+require 'spec/example/subject'
 require 'spec/example/before_and_after_hooks'
 require 'spec/example/pending'
 require 'spec/example/module_reopening_fix'
+require 'spec/example/example_group_hierarchy'
 require 'spec/example/example_group_methods'
 require 'spec/example/example_methods'
 require 'spec/example/example_group'