rspec 1.2.8 → 1.2.9

data/spec/spec/matchers/equal_spec.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../spec_helper.rb'
+require 'spec_helper'
 module Spec
   module Matchers
     describe "equal" do

data/spec/spec/matchers/exist_spec.rb

@@ -1,11 +1,11 @@
-require File.dirname(__FILE__) + '/../../spec_helper.rb'
+require 'spec_helper'
 
 class Substance
   def initialize exists, description
     @exists = exists
     @description = description
   end
-  def exist?
+  def exist?(arg=nil)
     @exists
   end
   def inspect
@@ -36,6 +36,10 @@ describe "should exist" do
       @real.should exist
     end
   
+    it "passes if target exists with args" do
+      @real.should exist('this arg')
+    end
+  
     it "fails if target does not exist" do
       lambda { @imaginary.should exist }.should fail
     end

data/spec/spec/matchers/has_spec.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../spec_helper.rb'
+require 'spec_helper'
 
 describe "should have_sym(*args)" do
   it "should pass if #has_sym?(*args) returns true" do
@@ -11,6 +11,16 @@ describe "should have_sym(*args)" do
     }.should fail_with("expected #has_key?(:a) to return true, got false")
   end
 
+  it "should fail if #has_sym?(*args) returns nil" do
+    klass = Class.new do
+      def has_foo?
+      end
+    end
+    lambda {
+      klass.new.should have_foo
+    }.should fail_with("expected #has_foo?(nil) to return true, got false")
+  end
+
   it "should fail if target does not respond to #has_sym?" do
     lambda {
       Object.new.should have_key(:a)
@@ -31,6 +41,14 @@ describe "should_not have_sym(*args)" do
     {:a => "A"}.should_not have_key(:b)
   end
 
+  it "should pass if #has_sym?(*args) returns nil" do
+    klass = Class.new do
+      def has_foo?
+      end
+    end
+    klass.new.should_not have_foo
+  end
+
   it "should fail if #has_sym?(*args) returns true" do
     lambda {
       {:a => "A"}.should_not have_key(:a)

data/spec/spec/matchers/have_spec.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../spec_helper.rb'
+require 'spec_helper'
 
 share_as :HaveSpecHelper do
   def create_collection_owner_with(n)

data/spec/spec/matchers/include_spec.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../spec_helper.rb'
+require 'spec_helper'
 
 describe "should include(expected)" do
   it "should pass if target includes expected" do

data/spec/spec/matchers/match_array_spec.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../spec_helper.rb'
+require 'spec_helper'
 
 class UnsortableObject
   def initialize(id)

data/spec/spec/matchers/match_spec.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../spec_helper.rb'
+require 'spec_helper'
 
 describe "should match(expected)" do
   it "should pass when target (String) matches expected (Regexp)" do

data/spec/spec/matchers/matcher_methods_spec.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../spec_helper.rb'
+require 'spec_helper'
 
 module Spec
   module Matchers

data/spec/spec/matchers/matcher_spec.rb

@@ -1,8 +1,8 @@
-require File.dirname(__FILE__) + '/../../spec_helper'
+require 'spec_helper'
 
 module Spec
   module Matchers
-    describe Spec::Matchers::Matcher do
+    describe Matcher do
       context "without overrides" do
         before(:each) do
           @matcher = Spec::Matchers::Matcher.new(:be_a_multiple_of, 3) do |multiple|
@@ -11,7 +11,7 @@ module Spec
             end
           end
         end
-        
+
         it "provides a default description" do
           @matcher.description.should == "be a multiple of 3"
         end
@@ -26,32 +26,32 @@ module Spec
           @matcher.failure_message_for_should_not.should == "expected 9 not to be a multiple of 3"
         end
       end
-      
+
       it "is not diffable by default" do
         matcher = Spec::Matchers::Matcher.new(:name) {}
         matcher.should_not be_diffable
       end
-      
+
       it "is diffable when told to be" do
         matcher = Spec::Matchers::Matcher.new(:name) { diffable }
         matcher.should be_diffable
       end
-      
+
       it "provides expected" do
         matcher = Spec::Matchers::Matcher.new(:name, 'expected string') {}
         matcher.expected.should == ['expected string']
       end
-      
+
       it "provides actual" do
         matcher = Spec::Matchers::Matcher.new(:name, 'expected string') do
           match {|actual|}
         end
-        
+
         matcher.matches?('actual string')
-        
+
         matcher.actual.should == 'actual string'
       end
-      
+
       context "with overrides" do
         before(:each) do
           @matcher = Spec::Matchers::Matcher.new(:be_boolean, true) do |boolean|
@@ -86,16 +86,16 @@ module Spec
           @matcher.matches?(false)
           @matcher.failure_message_for_should.should == "expected false to be the boolean true"
         end
-        
+
         it "overrides the failure message for #should_not" do
           @matcher.matches?(true)
           @matcher.failure_message_for_should_not.should == "expected true not to be the boolean true"
         end
       end
-      
+
       context "#new" do
         it "passes matches? arg to match block" do
-          matcher = Spec::Matchers::Matcher.new(:ignore) do 
+          matcher = Spec::Matchers::Matcher.new(:ignore) do
             match do |actual|
               actual == 5
             end
@@ -115,22 +115,22 @@ module Spec
 
       context "with no args" do
         before(:each) do
-          @matcher = Spec::Matchers::Matcher.new(:matcher_name) do 
+          @matcher = Spec::Matchers::Matcher.new(:matcher_name) do
             match do |actual|
               actual == 5
             end
-          end 
+          end
         end
-        
+
         it "matches" do
           @matcher.matches?(5).should be_true
         end
-        
+
         it "describes" do
           @matcher.description.should == "matcher name"
         end
       end
-      
+
       context "with 1 arg" do
         before(:each) do
           @matcher = Spec::Matchers::Matcher.new(:matcher_name, 1) do |expected|
@@ -139,16 +139,16 @@ module Spec
             end
           end
         end
-        
+
         it "matches" do
           @matcher.matches?(5).should be_true
         end
-        
+
         it "describes" do
           @matcher.description.should == "matcher name 1"
         end
       end
-      
+
       context "with multiple args" do
         before(:each) do
           @matcher = Spec::Matchers::Matcher.new(:matcher_name, 1, 2, 3, 4) do |a,b,c,d|
@@ -157,16 +157,16 @@ module Spec
             end
           end
         end
-        
+
         it "matches" do
           @matcher.matches?(10).should be_true
         end
-        
+
         it "describes" do
           @matcher.description.should == "matcher name 1, 2, 3, and 4"
         end
       end
-      
+
       it "supports helper methods" do
         matcher = Spec::Matchers::Matcher.new(:be_similar_to, [1,2,3]) do |sample|
           match do |actual|
@@ -177,25 +177,52 @@ module Spec
             a.sort == b.sort
           end
         end
-        
+
         matcher.matches?([2,3,1]).should be_true
       end
-      
+
       it "supports fluent interface" do
         matcher = Spec::Matchers::Matcher.new(:first_word) do
           def second_word
             self
           end
         end
-        
+
         matcher.second_word.should == matcher
       end
-      
+
       it "treats method missing normally for undeclared methods" do
         matcher = Spec::Matchers::Matcher.new(:ignore) { }
         expect { matcher.non_existent_method }.to raise_error(NoMethodError)
       end
 
+      it "has access to other matchers" do
+        matcher = Spec::Matchers::Matcher.new(:ignore, 3) do |expected|
+          match do |actual|
+            extend Spec::Matchers
+            actual.should eql(5 + expected)
+          end
+        end
+
+        matcher.matches?(8).should be_true
+      end
+
+      it "lets you override the actual() in messages" do
+        matcher = Spec::Matchers::Matcher.new(:be_foo) do
+          match do |actual|
+            @submitted = actual
+            false
+          end
+
+          def actual
+            "replaced"
+          end
+        end
+
+        matcher.matches?("foo")
+        matcher.failure_message_for_should.should =~ /replaced/
+      end
+
     end
   end
 end

data/spec/spec/matchers/matchers_spec.rb

@@ -1,2 +1,2 @@
-require File.dirname(__FILE__) + '/../../spec_helper'
+require 'spec_helper'
 

data/spec/spec/matchers/operator_matcher_spec.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../spec_helper.rb'
+require 'spec_helper'
 
 require 'spec/runner/differs/default'
 

data/spec/spec/matchers/raise_error_spec.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../spec_helper.rb'
+require 'spec_helper'
 
 describe "should raise_error" do
   it "should pass if anything is raised" do

data/spec/spec/matchers/respond_to_spec.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../spec_helper.rb'
+require 'spec_helper'
 
 describe "should respond_to(:sym)" do
   

data/spec/spec/matchers/satisfy_spec.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../spec_helper.rb'
+require 'spec_helper'
 
 describe "should satisfy { block }" do
   it "should pass if block returns true" do

data/spec/spec/matchers/simple_matcher_spec.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../spec_helper'
+require 'spec_helper'
 
 module Spec
   module Matchers

data/spec/spec/matchers/throw_symbol_spec.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../spec_helper.rb'
+require 'spec_helper'
 
 module Spec
   module Matchers

data/spec/spec/mocks/any_number_of_times_spec.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../spec_helper.rb'
+require 'spec_helper'
 
 module Spec
   module Mocks

data/spec/spec/mocks/argument_expectation_spec.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../spec_helper.rb'
+require 'spec_helper'
 
 module Spec
   module Mocks

data/spec/spec/mocks/argument_matchers_spec.rb

@@ -0,0 +1,19 @@
+require 'spec_helper'
+
+module Spec
+  module Mocks
+    module ArgumentMatchers
+      describe AnyArgsMatcher do
+        it "represents itself nicely for failure messages" do
+          AnyArgsMatcher.new.description.should == "any args"
+        end
+      end
+
+      describe AnyArgMatcher do
+        it "represents itself nicely for failure messages" do
+          AnyArgMatcher.new(nil).description.should == "anything"
+        end
+      end
+    end
+  end
+end

data/spec/spec/mocks/at_least_spec.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../spec_helper.rb'
+require 'spec_helper'
 
 module Spec
   module Mocks

data/spec/spec/mocks/at_most_spec.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../spec_helper.rb'
+require 'spec_helper'
 
 module Spec
   module Mocks

data/spec/spec/mocks/bug_report_10260_spec.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../spec_helper.rb'
+require 'spec_helper'
 
 describe "An RSpec Mock" do
   it "should hide internals in its inspect representation" do

data/spec/spec/mocks/bug_report_10263_spec.rb

@@ -20,7 +20,7 @@ describe "Mock" do
     begin
       @mock.foobar
     rescue Exception => e
-      e.message.should == "Mock 'test mock' received unexpected message :foobar with (no args)"
+      e.message.should == "Mock \"test mock\" received unexpected message :foobar with (no args)"
     end
   end 
 end

data/spec/spec/mocks/bug_report_11545_spec.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../spec_helper.rb'
+require 'spec_helper'
 
 class LiarLiarPantsOnFire
   def respond_to?(sym, incl_private=false)

data/spec/spec/mocks/bug_report_15719_spec.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../spec_helper.rb'
+require 'spec_helper'
 
 module Spec
   module Mocks
@@ -9,7 +9,7 @@ module Spec
         m.should_receive(:bar).with("message")
         lambda {
           m.bar("different message")
-        }.should raise_error(Spec::Mocks::MockExpectationError, %Q{Mock 'foo' expected :bar with ("message") but received it with ("different message")})
+        }.should raise_error(Spec::Mocks::MockExpectationError, %Q{Mock "foo" received :bar with unexpected arguments\n  expected: ("message")\n       got: ("different message")})
         m.bar("message") # allows the spec to pass
       end
 
@@ -22,7 +22,7 @@ module Spec
         m.should_receive(:bar).with("message")
         lambda {
           m.bar("different message")
-        }.should raise_error(Spec::Mocks::MockExpectationError, %Q{Mock 'foo' expected :bar with ("message") but received it with ("different message")})
+        }.should raise_error(Spec::Mocks::MockExpectationError, %Q{Mock "foo" received :bar with unexpected arguments\n  expected: ("message")\n       got: ("different message")})
         m.bar("message") # allows the spec to pass
       end
     end