rspec 1.0.0 → 1.3.1

data/spec/spec/matchers/change_spec.rb

@@ -1,6 +1,6 @@
 #Based on patch from Wilson Bilkovich
 
-require File.dirname(__FILE__) + '/../../spec_helper.rb'
+require 'spec_helper'
 class SomethingExpected
   attr_accessor :some_value
 end
@@ -12,13 +12,17 @@ describe "should change(actual, message)" do
   end
 
   it "should pass when actual is modified by the block" do
-    lambda {@instance.some_value = 6}.should change(@instance, :some_value)
+    expect {@instance.some_value = 6}.to change(@instance, :some_value)
   end
 
   it "should fail when actual is not modified by the block" do
-    lambda do
-      lambda {}.should change(@instance, :some_value)
-    end.should fail_with("some_value should have changed, but is still 5")
+    expect do
+      expect {}.to change(@instance, :some_value)
+    end.to fail_with("some_value should have changed, but is still 5")
+  end
+  
+  it "provides a #description" do
+    change(@instance, :some_value).description.should == "change #some_value"
   end
 end
 
@@ -29,13 +33,13 @@ describe "should_not change(actual, message)" do
   end
 
   it "should pass when actual is not modified by the block" do
-    lambda { }.should_not change(@instance, :some_value)
+    expect { }.to_not change(@instance, :some_value)
   end
 
   it "should fail when actual is not modified by the block" do
-    lambda do
-      lambda {@instance.some_value = 6}.should_not change(@instance, :some_value)
-    end.should fail_with("some_value should not have changed, but did change from 5 to 6")
+    expect do
+      expect {@instance.some_value = 6}.to_not change(@instance, :some_value)
+    end.to fail_with("some_value should not have changed, but did change from 5 to 6")
   end
 end
 
@@ -46,20 +50,23 @@ describe "should change { block }" do
   end
 
   it "should pass when actual is modified by the block" do
-    lambda {@instance.some_value = 6}.should change { @instance.some_value }
+    expect {@instance.some_value = 6}.to change { @instance.some_value }
   end
 
   it "should fail when actual is not modified by the block" do
-    lambda do
-      lambda {}.should change{ @instance.some_value }
-    end.should fail_with("result should have changed, but is still 5")
+    expect do
+      expect {}.to change{ @instance.some_value }
+    end.to fail_with("result should have changed, but is still 5")
+  end
+  
+  it "should warn if passed a block using do/end instead of {}" do
+    expect do
+      expect {}.to change do; end
+    end.to raise_error(Spec::Matchers::MatcherError, /block passed to should or should_not/)
   end
   
-  it "should warn if passed a block using do/end" do
-    lambda do
-      lambda {}.should change do
-      end
-    end.should raise_error(Spec::Matchers::MatcherError, /block passed to should or should_not/)
+  it "provides a #description" do
+    change { @instance.some_value }.description.should == "change #result"
   end
 end
 
@@ -70,20 +77,19 @@ describe "should_not change { block }" do
   end
 
   it "should pass when actual is modified by the block" do
-    lambda {}.should_not change{ @instance.some_value }
+    expect {}.to_not change{ @instance.some_value }
   end
 
   it "should fail when actual is not modified by the block" do
-    lambda do
-      lambda {@instance.some_value = 6}.should_not change { @instance.some_value }
-    end.should fail_with("result should not have changed, but did change from 5 to 6")
+    expect do
+      expect {@instance.some_value = 6}.to_not change { @instance.some_value }
+    end.to fail_with("result should not have changed, but did change from 5 to 6")
   end
   
-  it "should warn if passed a block using do/end" do
-    lambda do
-      lambda {}.should_not change do
-      end
-    end.should raise_error(Spec::Matchers::MatcherError, /block passed to should or should_not/)
+  it "should warn if passed a block using do/end instead of {}" do
+    expect do
+      expect {}.to_not change do; end
+    end.to raise_error(Spec::Matchers::MatcherError, /block passed to should or should_not/)
   end
 end
 
@@ -94,19 +100,19 @@ describe "should change(actual, message).by(expected)" do
   end
 
   it "should pass when attribute is changed by expected amount" do
-    lambda { @instance.some_value += 1 }.should change(@instance, :some_value).by(1)
+    expect { @instance.some_value += 1 }.to change(@instance, :some_value).by(1)
   end
 
   it "should fail when the attribute is changed by unexpected amount" do
-    lambda do
-      lambda { @instance.some_value += 2 }.should change(@instance, :some_value).by(1)
-    end.should fail_with("some_value should have been changed by 1, but was changed by 2")
+    expect do
+      expect { @instance.some_value += 2 }.to change(@instance, :some_value).by(1)
+    end.to fail_with("some_value should have been changed by 1, but was changed by 2")
   end
 
   it "should fail when the attribute is changed by unexpected amount in the opposite direction" do
-    lambda do
-      lambda { @instance.some_value -= 1 }.should change(@instance, :some_value).by(1)
-    end.should fail_with("some_value should have been changed by 1, but was changed by -1")
+    expect do
+      expect { @instance.some_value -= 1 }.to change(@instance, :some_value).by(1)
+    end.to fail_with("some_value should have been changed by 1, but was changed by -1")
   end
 end
 
@@ -117,19 +123,106 @@ describe "should change{ block }.by(expected)" do
   end
 
   it "should pass when attribute is changed by expected amount" do
-    lambda { @instance.some_value += 1 }.should change{@instance.some_value}.by(1)
+    expect { @instance.some_value += 1 }.to change{@instance.some_value}.by(1)
   end
 
   it "should fail when the attribute is changed by unexpected amount" do
-    lambda do
-      lambda { @instance.some_value += 2 }.should change{@instance.some_value}.by(1)
-    end.should fail_with("result should have been changed by 1, but was changed by 2")
+    expect do
+      expect { @instance.some_value += 2 }.to change{@instance.some_value}.by(1)
+    end.to fail_with("result should have been changed by 1, but was changed by 2")
   end
 
   it "should fail when the attribute is changed by unexpected amount in the opposite direction" do
-    lambda do
-      lambda { @instance.some_value -= 1 }.should change{@instance.some_value}.by(1)
-    end.should fail_with("result should have been changed by 1, but was changed by -1")
+    expect do
+      expect { @instance.some_value -= 1 }.to change{@instance.some_value}.by(1)
+    end.to fail_with("result should have been changed by 1, but was changed by -1")
+  end
+end
+
+describe "should change(actual, message).by_at_least(expected)" do
+  before(:each) do
+    @instance = SomethingExpected.new
+    @instance.some_value = 5
+  end
+
+  it "should pass when attribute is changed by greater than the expected amount" do
+    expect { @instance.some_value += 2 }.to change(@instance, :some_value).by_at_least(1)
+  end
+  
+  it "should pass when attribute is changed by the expected amount" do
+    expect { @instance.some_value += 2 }.to change(@instance, :some_value).by_at_least(2)
+  end  
+
+  it "should fail when the attribute is changed by less than the expected amount" do
+    expect do
+      expect { @instance.some_value += 1 }.to change(@instance, :some_value).by_at_least(2)
+    end.to fail_with("some_value should have been changed by at least 2, but was changed by 1")
+  end
+
+end
+
+describe "should change{ block }.by_at_least(expected)" do
+  before(:each) do
+    @instance = SomethingExpected.new
+    @instance.some_value = 5
+  end
+
+  it "should pass when attribute is changed by greater than expected amount" do
+    expect { @instance.some_value += 2 }.to change{@instance.some_value}.by_at_least(1)
+  end
+  
+  it "should pass when attribute is changed by the expected amount" do
+    expect { @instance.some_value += 2 }.to change{@instance.some_value}.by_at_least(2)
+  end  
+
+  it "should fail when the attribute is changed by less than the unexpected amount" do
+    expect do
+      expect { @instance.some_value += 1 }.to change{@instance.some_value}.by_at_least(2)
+    end.to fail_with("result should have been changed by at least 2, but was changed by 1")
+  end
+end
+
+
+describe "should change(actual, message).by_at_most(expected)" do
+  before(:each) do
+    @instance = SomethingExpected.new
+    @instance.some_value = 5
+  end
+
+  it "should pass when attribute is changed by less than the expected amount" do
+    expect { @instance.some_value += 2 }.to change(@instance, :some_value).by_at_most(3)
+  end
+  
+  it "should pass when attribute is changed by the expected amount" do
+    expect { @instance.some_value += 2 }.to change(@instance, :some_value).by_at_most(2)
+  end  
+
+  it "should fail when the attribute is changed by greater than the expected amount" do
+    expect do
+      expect { @instance.some_value += 2 }.to change(@instance, :some_value).by_at_most(1)
+    end.to fail_with("some_value should have been changed by at most 1, but was changed by 2")
+  end
+
+end
+
+describe "should change{ block }.by_at_most(expected)" do
+  before(:each) do
+    @instance = SomethingExpected.new
+    @instance.some_value = 5
+  end
+
+  it "should pass when attribute is changed by less than expected amount" do
+    expect { @instance.some_value += 2 }.to change{@instance.some_value}.by_at_most(3)
+  end
+  
+  it "should pass when attribute is changed by the expected amount" do
+    expect { @instance.some_value += 2 }.to change{@instance.some_value}.by_at_most(2)
+  end  
+
+  it "should fail when the attribute is changed by greater than the unexpected amount" do
+    expect do
+      expect { @instance.some_value += 2 }.to change{@instance.some_value}.by_at_most(1)
+    end.to fail_with("result should have been changed by at most 1, but was changed by 2")
   end
 end
 
@@ -140,13 +233,13 @@ describe "should change(actual, message).from(old)" do
   end
 
   it "should pass when attribute is == to expected value before executing block" do
-    lambda { @instance.some_value = "astring" }.should change(@instance, :some_value).from("string")
+    expect { @instance.some_value = "astring" }.to change(@instance, :some_value).from("string")
   end
 
   it "should fail when attribute is not == to expected value before executing block" do
-    lambda do
-      lambda { @instance.some_value = "knot" }.should change(@instance, :some_value).from("cat")
-    end.should fail_with("some_value should have initially been \"cat\", but was \"string\"")
+    expect do
+      expect { @instance.some_value = "knot" }.to change(@instance, :some_value).from("cat")
+    end.to fail_with("some_value should have initially been \"cat\", but was \"string\"")
   end
 end
 
@@ -157,13 +250,13 @@ describe "should change{ block }.from(old)" do
   end
 
   it "should pass when attribute is == to expected value before executing block" do
-    lambda { @instance.some_value = "astring" }.should change{@instance.some_value}.from("string")
+    expect { @instance.some_value = "astring" }.to change{@instance.some_value}.from("string")
   end
 
   it "should fail when attribute is not == to expected value before executing block" do
-    lambda do
-      lambda { @instance.some_value = "knot" }.should change{@instance.some_value}.from("cat")
-    end.should fail_with("result should have initially been \"cat\", but was \"string\"")
+    expect do
+      expect { @instance.some_value = "knot" }.to change{@instance.some_value}.from("cat")
+    end.to fail_with("result should have initially been \"cat\", but was \"string\"")
   end
 end
 
@@ -174,13 +267,13 @@ describe "should change(actual, message).to(new)" do
   end
   
   it "should pass when attribute is == to expected value after executing block" do
-    lambda { @instance.some_value = "cat" }.should change(@instance, :some_value).to("cat")
+    expect { @instance.some_value = "cat" }.to change(@instance, :some_value).to("cat")
   end
 
   it "should fail when attribute is not == to expected value after executing block" do
-    lambda do
-      lambda { @instance.some_value = "cat" }.should change(@instance, :some_value).from("string").to("dog")
-    end.should fail_with("some_value should have been changed to \"dog\", but is now \"cat\"")
+    expect do
+      expect { @instance.some_value = "cat" }.to change(@instance, :some_value).from("string").to("dog")
+    end.to fail_with("some_value should have been changed to \"dog\", but is now \"cat\"")
   end
 end
 
@@ -191,13 +284,13 @@ describe "should change{ block }.to(new)" do
   end
   
   it "should pass when attribute is == to expected value after executing block" do
-    lambda { @instance.some_value = "cat" }.should change{@instance.some_value}.to("cat")
+    expect { @instance.some_value = "cat" }.to change{@instance.some_value}.to("cat")
   end
 
   it "should fail when attribute is not == to expected value after executing block" do
-    lambda do
-      lambda { @instance.some_value = "cat" }.should change{@instance.some_value}.from("string").to("dog")
-    end.should fail_with("result should have been changed to \"dog\", but is now \"cat\"")
+    expect do
+      expect { @instance.some_value = "cat" }.to change{@instance.some_value}.from("string").to("dog")
+    end.to fail_with("result should have been changed to \"dog\", but is now \"cat\"")
   end
 end
 
@@ -208,11 +301,23 @@ describe "should change(actual, message).from(old).to(new)" do
   end
   
   it "should pass when #to comes before #from" do
-    lambda { @instance.some_value = "cat" }.should change(@instance, :some_value).to("cat").from("string")
+    expect { @instance.some_value = "cat" }.to change(@instance, :some_value).to("cat").from("string")
   end
 
   it "should pass when #from comes before #to" do
-    lambda { @instance.some_value = "cat" }.should change(@instance, :some_value).from("string").to("cat")
+    expect { @instance.some_value = "cat" }.to change(@instance, :some_value).from("string").to("cat")
+  end
+  
+  it "should show the correct messaging when #after and #to are different" do
+    expect do
+      expect { @instance.some_value = "cat" }.to change(@instance, :some_value).from("string").to("dog")
+    end.to fail_with("some_value should have been changed to \"dog\", but is now \"cat\"")
+  end
+  
+  it "should show the correct messaging when #before and #from are different" do
+    expect do
+      expect { @instance.some_value = "cat" }.to change(@instance, :some_value).from("not_string").to("cat")
+    end.to fail_with("some_value should have initially been \"not_string\", but was \"string\"")
   end
 end
 
@@ -223,10 +328,22 @@ describe "should change{ block }.from(old).to(new)" do
   end
   
   it "should pass when #to comes before #from" do
-    lambda { @instance.some_value = "cat" }.should change{@instance.some_value}.to("cat").from("string")
+    expect { @instance.some_value = "cat" }.to change{@instance.some_value}.to("cat").from("string")
   end
 
   it "should pass when #from comes before #to" do
-    lambda { @instance.some_value = "cat" }.should change{@instance.some_value}.from("string").to("cat")
+    expect { @instance.some_value = "cat" }.to change{@instance.some_value}.from("string").to("cat")
+  end
+end
+
+describe Spec::Matchers::Change do
+  it "should work when the receiver has implemented #send" do
+    @instance = SomethingExpected.new
+    @instance.some_value = "string"
+    def @instance.send(*args); raise "DOH! Library developers shouldn't use #send!" end
+    
+    expect {
+      expect { @instance.some_value = "cat" }.to change(@instance, :some_value)
+    }.to_not raise_error
   end
 end

data/spec/spec/matchers/compatibility_spec.rb

@@ -0,0 +1,28 @@
+require 'spec_helper'
+
+Spec::Matchers.define :have_public_instance_method do |method|
+  match do |klass|
+    klass.public_instance_methods.any? {|m| [method, method.to_sym].include?(m)}
+  end
+end
+
+(Spec::Matchers.constants.sort).each do |c|
+  if (Class === (klass = Spec::Matchers.const_get(c)))
+    describe klass do
+      if klass.public_instance_methods.any? {|m| ['failure_message_for_should',:failure_message_for_should].include?(m)}
+        describe "called with should" do
+          subject { klass }
+          it { should have_public_instance_method('failure_message_for_should')}
+          it { should have_public_instance_method('failure_message')}
+        end
+      end
+      if klass.public_instance_methods.any? {|m| ['failure_message_for_should_not',:failure_message_for_should_not].include?(m)}
+        describe "called with should not" do
+          subject { klass }
+          it { should have_public_instance_method('failure_message_for_should_not')}
+          it { should have_public_instance_method('negative_failure_message')}
+        end
+      end
+    end
+  end
+end

data/spec/spec/matchers/description_generation_spec.rb

@@ -1,148 +1,139 @@
-require File.dirname(__FILE__) + '/../../spec_helper.rb'
+require 'spec_helper'
 
 describe "Matchers should be able to generate their own descriptions" do
-  before(:each) do
-    @desc = nil
-    @callback = lambda { |desc| @desc = desc }
-    Spec::Matchers.description_generated(@callback)
+  after(:each) do
+    Spec::Matchers.clear_generated_description
   end
-  
+
   it "should == expected" do
     "this".should == "this"
-    @desc.should == "should == \"this\""
+    Spec::Matchers.generated_description.should == "should == \"this\""
   end
   
   it "should not == expected" do
     "this".should_not == "that"
-    @desc.should == "should not == \"that\""
+    Spec::Matchers.generated_description.should == "should not == \"that\""
   end
   
   it "should be empty (arbitrary predicate)" do
     [].should be_empty
-    @desc.should == "should be empty"
+    Spec::Matchers.generated_description.should == "should be empty"
   end
   
   it "should not be empty (arbitrary predicate)" do
     [1].should_not be_empty
-    @desc.should == "should not be empty"
+    Spec::Matchers.generated_description.should == "should not be empty"
   end
   
   it "should be true" do
     true.should be_true
-    @desc.should == "should be true"
+    Spec::Matchers.generated_description.should == "should be true"
   end
   
   it "should be false" do
     false.should be_false
-    @desc.should == "should be false"
+    Spec::Matchers.generated_description.should == "should be false"
   end
   
   it "should be nil" do
     nil.should be_nil
-    @desc.should == "should be nil"
+    Spec::Matchers.generated_description.should == "should be nil"
   end
   
   it "should be > n" do
     5.should be > 3
-    @desc.should == "should be > 3"
+    Spec::Matchers.generated_description.should == "should be > 3"
   end
   
   it "should be predicate arg1, arg2 and arg3" do
     5.0.should be_between(0,10)
-    @desc.should == "should be between 0 and 10"
+    Spec::Matchers.generated_description.should == "should be between 0 and 10"
   end
 
-  it "should be_few_words predicate should be transformed to 'be few words'" do
-    5.should be_kind_of(Fixnum)
-    @desc.should == "should be kind of Fixnum"
-  end
-
-  it "should preserve a proper prefix for be predicate" do
-    5.should be_a_kind_of(Fixnum)
-    @desc.should == "should be a kind of Fixnum"
-    5.should be_an_instance_of(Fixnum)
-    @desc.should == "should be an instance of Fixnum"
-  end
-  
   it "should equal" do
     expected = "expected"
     expected.should equal(expected)
-    @desc.should == "should equal \"expected\""
+    Spec::Matchers.generated_description.should == "should equal \"expected\""
   end
   
   it "should_not equal" do
     5.should_not equal(37)
-    @desc.should == "should not equal 37"
+    Spec::Matchers.generated_description.should == "should not equal 37"
   end
   
   it "should eql" do
     "string".should eql("string")
-    @desc.should == "should eql \"string\""
+    Spec::Matchers.generated_description.should == "should eql \"string\""
   end
   
   it "should not eql" do
     "a".should_not eql(:a)
-    @desc.should == "should not eql :a"
+    Spec::Matchers.generated_description.should == "should not eql :a"
   end
   
   it "should have_key" do
     {:a => "a"}.should have_key(:a)
-    @desc.should == "should have key :a"
+    Spec::Matchers.generated_description.should == "should have key :a"
   end
   
   it "should have n items" do
     team.should have(3).players
-    @desc.should == "should have 3 players"
+    Spec::Matchers.generated_description.should == "should have 3 players"
   end
   
   it "should have at least n items" do
     team.should have_at_least(2).players
-    @desc.should == "should have at least 2 players"
+    Spec::Matchers.generated_description.should == "should have at least 2 players"
   end
   
   it "should have at most n items" do
     team.should have_at_most(4).players
-    @desc.should == "should have at most 4 players"
+    Spec::Matchers.generated_description.should == "should have at most 4 players"
   end
   
   it "should include" do
     [1,2,3].should include(3)
-    @desc.should == "should include 3"
+    Spec::Matchers.generated_description.should == "should include 3"
+  end
+
+  it "array.should =~ [1,2,3]" do
+    [1,2,3].should =~ [1,2,3]
+    Spec::Matchers.generated_description.should == "should contain exactly 1, 2 and 3"
   end
   
   it "should match" do
     "this string".should match(/this string/)
-    @desc.should == "should match /this string/"
+    Spec::Matchers.generated_description.should == "should match /this string/"
   end
   
   it "should raise_error" do
     lambda { raise }.should raise_error
-    @desc.should == "should raise Exception"
+    Spec::Matchers.generated_description.should == "should raise Exception"
   end
   
   it "should raise_error with type" do
     lambda { raise }.should raise_error(RuntimeError)
-    @desc.should == "should raise RuntimeError"
+    Spec::Matchers.generated_description.should == "should raise RuntimeError"
   end
   
   it "should raise_error with type and message" do
     lambda { raise "there was an error" }.should raise_error(RuntimeError, "there was an error")
-    @desc.should == "should raise RuntimeError with \"there was an error\""
+    Spec::Matchers.generated_description.should == "should raise RuntimeError with \"there was an error\""
   end
   
   it "should respond_to" do
     [].should respond_to(:insert)
-    @desc.should == "should respond to #insert"
+    Spec::Matchers.generated_description.should == "should respond to #insert"
   end
   
   it "should throw symbol" do
     lambda { throw :what_a_mess }.should throw_symbol
-    @desc.should == "should throw a Symbol"
+    Spec::Matchers.generated_description.should == "should throw a Symbol"
   end
   
   it "should throw symbol (with named symbol)" do
     lambda { throw :what_a_mess }.should throw_symbol(:what_a_mess)
-    @desc.should == "should throw :what_a_mess"
+    Spec::Matchers.generated_description.should == "should throw :what_a_mess"
   end
   
   def team
@@ -152,8 +143,18 @@ describe "Matchers should be able to generate their own descriptions" do
       end
     end.new
   end
+end
+
+describe "a Matcher with no description" do
+  def matcher
+     Class.new do
+       def matches?(ignore); true; end
+       def failure_message; ""; end
+     end.new
+  end
   
-  after(:each) do
-    Spec::Matchers.unregister_description_generated(@callback)
+  it "should provide a helpful message when used in a string-less example block" do
+    5.should matcher
+    Spec::Matchers.generated_description.should =~ /When you call.*description method/m
   end
-end
+end

data/spec/spec/matchers/dsl_spec.rb

@@ -0,0 +1,34 @@
+require 'spec_helper'
+
+module Spec
+  module Matchers
+    module DSL
+      describe "#create" do
+        it "is deprecated" do
+          Spec.should_receive(:deprecate)
+          mod = Module.new
+          mod.extend Spec::Matchers::DSL
+          mod.create(:foo)
+        end
+      end
+      
+      describe "#define" do
+        it "creates a method that initializes a new matcher with the submitted name and expected arg" do
+          # FIXME - this expects new to be called, but we need something
+          # more robust - that expects new to be called with a specific
+          # block (lambda, proc, whatever)
+          mod = Module.new
+          mod.extend Spec::Matchers::DSL
+          mod.define(:foo)
+    
+          obj = Object.new
+          obj.extend mod
+    
+          Spec::Matchers::Matcher.should_receive(:new).with(:foo, 3)
+    
+          obj.foo(3)
+        end
+      end
+    end
+  end
+end