rspec 0.8.2 → 0.9.0

data/spec/spec/matchers/be_spec.rb

@@ -1,58 +1,58 @@
 require File.dirname(__FILE__) + '/../../spec_helper.rb'
 
-context "should be_predicate" do  
-  specify "should pass when actual returns true for :predicate?" do
+describe "should be_predicate" do  
+  it "should pass when actual returns true for :predicate?" do
     actual = stub("actual", :happy? => true)
     actual.should be_happy
   end
 
-  specify "should pass when actual returns true for :predicates? (present tense)" do
+  it "should pass when actual returns true for :predicates? (present tense)" do
     actual = stub("actual", :exists? => true)
     actual.should be_exist
   end
 
-  specify "should fail when actual returns false for :predicate?" do
+  it "should fail when actual returns false for :predicate?" do
     actual = stub("actual", :happy? => false)
     lambda {
       actual.should be_happy
     }.should fail_with("expected happy? to return true, got false")
   end
   
-  specify "should fail when actual does not respond to :predicate?" do
+  it "should fail when actual does not respond to :predicate?" do
     lambda {
       Object.new.should be_happy
     }.should raise_error(NameError)
   end
 end
 
-context "should_not be_predicate" do
-  specify "should pass when actual returns false for :sym?" do
+describe "should_not be_predicate" do
+  it "should pass when actual returns false for :sym?" do
     actual = stub("actual", :happy? => false)
     actual.should_not be_happy
   end
   
-  specify "should fail when actual returns true for :sym?" do
+  it "should fail when actual returns true for :sym?" do
     actual = stub("actual", :happy? => true)
     lambda {
       actual.should_not be_happy
     }.should fail_with("expected happy? to return false, got true")
   end
 
-  specify "should fail when actual does not respond to :sym?" do
+  it "should fail when actual does not respond to :sym?" do
     lambda {
       Object.new.should_not be_happy
     }.should raise_error(NameError)
   end
 end
 
-context "should be_predicate(*args)" do
-  specify "should pass when actual returns true for :predicate?(*args)" do
+describe "should be_predicate(*args)" do
+  it "should pass when actual returns true for :predicate?(*args)" do
     actual = mock("actual")
     actual.should_receive(:older_than?).with(3).and_return(true)
     actual.should be_older_than(3)
   end
 
-  specify "should fail when actual returns false for :predicate?(*args)" do
+  it "should fail when actual returns false for :predicate?(*args)" do
     actual = mock("actual")
     actual.should_receive(:older_than?).with(3).and_return(false)
     lambda {
@@ -60,21 +60,21 @@ context "should be_predicate(*args)" do
     }.should fail_with("expected older_than?(3) to return true, got false")
   end
   
-  specify "should fail when actual does not respond to :predicate?" do
+  it "should fail when actual does not respond to :predicate?" do
     lambda {
       Object.new.should be_older_than(3)
     }.should raise_error(NameError)
   end
 end
 
-context "should_not be_predicate(*args)" do
-  specify "should pass when actual returns false for :predicate?(*args)" do
+describe "should_not be_predicate(*args)" do
+  it "should pass when actual returns false for :predicate?(*args)" do
     actual = mock("actual")
     actual.should_receive(:older_than?).with(3).and_return(false)
     actual.should_not be_older_than(3)
   end
   
-  specify "should fail when actual returns true for :predicate?(*args)" do
+  it "should fail when actual returns true for :predicate?(*args)" do
     actual = mock("actual")
     actual.should_receive(:older_than?).with(3).and_return(true)
     lambda {
@@ -82,101 +82,110 @@ context "should_not be_predicate(*args)" do
     }.should fail_with("expected older_than?(3) to return false, got true")
   end
 
-  specify "should fail when actual does not respond to :predicate?" do
+  it "should fail when actual does not respond to :predicate?" do
     lambda {
       Object.new.should_not be_older_than(3)
     }.should raise_error(NameError)
   end
 end
 
-context "should be_true" do
-  specify "should pass when actual equal(true)" do
+describe "should be_true" do
+  it "should pass when actual equal(true)" do
     true.should be_true
   end
 
-  specify "should fail when actual equal(false)" do
+  it "should fail when actual equal(false)" do
     lambda {
       false.should be_true
     }.should fail_with("expected true, got false")
   end
 end
 
-context "should be_false" do
-  specify "should pass when actual equal(false)" do
+describe "should be_false" do
+  it "should pass when actual equal(false)" do
     false.should be_false
   end
 
-  specify "should fail when actual equal(true)" do
+  it "should fail when actual equal(true)" do
     lambda {
       true.should be_false
     }.should fail_with("expected false, got true")
   end
 end
 
-context "should be_nil" do
-  specify "should pass when actual is nil" do
+describe "should be_nil" do
+  it "should pass when actual is nil" do
     nil.should be_nil
   end
 
-  specify "should fail when actual is not nil" do
+  it "should fail when actual is not nil" do
     lambda {
       :not_nil.should be_nil
     }.should fail_with("expected nil, got :not_nil")
   end
 end
 
-context "should_not be_nil" do
-  specify "should pass when actual is not nil" do
+describe "should_not be_nil" do
+  it "should pass when actual is not nil" do
     :not_nil.should_not be_nil
   end
 
-  specify "should fail when actual is nil" do
+  it "should fail when actual is nil" do
     lambda {
       nil.should_not be_nil
     }.should fail_with("expected not nil, got nil")
   end
 end
 
-context "should be <" do
-  specify "should pass when < operator returns true" do
+describe "should be <" do
+  it "should pass when < operator returns true" do
     3.should be < 4
   end
 
-  specify "should fail when < operator returns false" do
+  it "should fail when < operator returns false" do
     lambda { 3.should be < 3 }.should fail_with("expected < 3, got 3")
   end
 end
 
-context "should be <=" do
-  specify "should pass when <= operator returns true" do
+describe "should be <=" do
+  it "should pass when <= operator returns true" do
     3.should be <= 4
     4.should be <= 4
   end
 
-  specify "should fail when <= operator returns false" do
+  it "should fail when <= operator returns false" do
     lambda { 3.should be <= 2 }.should fail_with("expected <= 2, got 3")
   end
 end
 
-context "should be >=" do
-  specify "should pass when >= operator returns true" do
+describe "should be >=" do
+  it "should pass when >= operator returns true" do
     4.should be >= 4
     5.should be >= 4
   end
 
-  specify "should fail when >= operator returns false" do
+  it "should fail when >= operator returns false" do
     lambda { 3.should be >= 4 }.should fail_with("expected >= 4, got 3")
   end
 end
 
-context "should be >" do
-  specify "should pass when > operator returns true" do
+describe "should be >" do
+  it "should pass when > operator returns true" do
     5.should be > 4
   end
 
-  specify "should fail when > operator returns false" do
+  it "should fail when > operator returns false" do
     lambda { 3.should be > 4 }.should fail_with("expected > 4, got 3")
   end
 end
 
+describe "should be(value)" do
+  it "should pass if actual.equal?(value)" do
+    5.should be(5)
+  end
+  it "should fail if !actual.equal?(value)" do
+    lambda { 5.should be(6) }.should fail_with("expected 6, got 5")
+  end
+end
+
 

data/spec/spec/matchers/change_spec.rb

@@ -5,228 +5,228 @@ class SomethingExpected
   attr_accessor :some_value
 end
 
-context "should change(actual, message)" do
-  setup do
+describe "should change(actual, message)" do
+  before(:each) do
     @instance = SomethingExpected.new
     @instance.some_value = 5
   end
 
-  specify "should pass when actual is modified by the block" do
+  it "should pass when actual is modified by the block" do
     lambda {@instance.some_value = 6}.should change(@instance, :some_value)
   end
 
-  specify "should fail when actual is not modified by the block" do
+  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")
   end
 end
 
-context "should_not change(actual, message)" do
-  setup do
+describe "should_not change(actual, message)" do
+  before(:each) do
     @instance = SomethingExpected.new
     @instance.some_value = 5
   end
 
-  specify "should pass when actual is not modified by the block" do
+  it "should pass when actual is not modified by the block" do
     lambda { }.should_not change(@instance, :some_value)
   end
 
-  specify "should fail when actual is not modified by the block" do
+  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")
   end
 end
 
-context "should change { block }" do
-  setup do
+describe "should change { block }" do
+  before(:each) do
     @instance = SomethingExpected.new
     @instance.some_value = 5
   end
 
-  specify "should pass when actual is modified by the block" do
+  it "should pass when actual is modified by the block" do
     lambda {@instance.some_value = 6}.should change { @instance.some_value }
   end
 
-  specify "should fail when actual is not modified by the block" do
+  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")
   end
   
-  specify "should warn if passed a block using do/end" do
+  it "should warn if passed a block using do/end" do
     lambda do
       lambda {}.should change do
       end
-    end.should_raise(Spec::Matchers::MatcherError, /block passed to should or should_not/)
+    end.should raise_error(Spec::Matchers::MatcherError, /block passed to should or should_not/)
   end
 end
 
-context "should_not change { block }" do
-  setup do
+describe "should_not change { block }" do
+  before(:each) do
     @instance = SomethingExpected.new
     @instance.some_value = 5
   end
 
-  specify "should pass when actual is modified by the block" do
+  it "should pass when actual is modified by the block" do
     lambda {}.should_not change{ @instance.some_value }
   end
 
-  specify "should fail when actual is not modified by the block" do
+  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")
   end
   
-  specify "should warn if passed a block using do/end" do
+  it "should warn if passed a block using do/end" do
     lambda do
       lambda {}.should_not change do
       end
-    end.should_raise(Spec::Matchers::MatcherError, /block passed to should or should_not/)
+    end.should raise_error(Spec::Matchers::MatcherError, /block passed to should or should_not/)
   end
 end
 
-context "should change(actual, message).by(expected)" do
-  setup do
+describe "should change(actual, message).by(expected)" do
+  before(:each) do
     @instance = SomethingExpected.new
     @instance.some_value = 5
   end
 
-  specify "should pass when attribute is changed by expected amount" do
+  it "should pass when attribute is changed by expected amount" do
     lambda { @instance.some_value += 1 }.should change(@instance, :some_value).by(1)
   end
 
-  specify "should fail when the attribute is changed by unexpected amount" do
+  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")
   end
 
-  specify "should fail when the attribute is changed by unexpected amount in the opposite direction" do
+  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")
   end
 end
 
-context "should change{ block }.by(expected)" do
-  setup do
+describe "should change{ block }.by(expected)" do
+  before(:each) do
     @instance = SomethingExpected.new
     @instance.some_value = 5
   end
 
-  specify "should pass when attribute is changed by expected amount" do
+  it "should pass when attribute is changed by expected amount" do
     lambda { @instance.some_value += 1 }.should change{@instance.some_value}.by(1)
   end
 
-  specify "should fail when the attribute is changed by unexpected amount" do
+  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")
   end
 
-  specify "should fail when the attribute is changed by unexpected amount in the opposite direction" do
+  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")
   end
 end
 
-context "should change(actual, message).from(old)" do
-  setup do
+describe "should change(actual, message).from(old)" do
+  before(:each) do
     @instance = SomethingExpected.new
     @instance.some_value = 'string'
   end
 
-  specify "should pass when attribute is == to expected value before executing block" do
+  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")
   end
 
-  specify "should fail when attribute is not == to expected value before executing block" do
+  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\"")
   end
 end
 
-context "should change{ block }.from(old)" do
-  setup do
+describe "should change{ block }.from(old)" do
+  before(:each) do
     @instance = SomethingExpected.new
     @instance.some_value = 'string'
   end
 
-  specify "should pass when attribute is == to expected value before executing block" do
+  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")
   end
 
-  specify "should fail when attribute is not == to expected value before executing block" do
+  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\"")
   end
 end
 
-context "should change(actual, message).to(new)" do
-  setup do
+describe "should change(actual, message).to(new)" do
+  before(:each) do
     @instance = SomethingExpected.new
     @instance.some_value = 'string'
   end
   
-  specify "should pass when attribute is == to expected value after executing block" do
+  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")
   end
 
-  specify "should fail when attribute is not == to expected value after executing block" do
+  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\"")
   end
 end
 
-context "should change{ block }.to(new)" do
-  setup do
+describe "should change{ block }.to(new)" do
+  before(:each) do
     @instance = SomethingExpected.new
     @instance.some_value = 'string'
   end
   
-  specify "should pass when attribute is == to expected value after executing block" do
+  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")
   end
 
-  specify "should fail when attribute is not == to expected value after executing block" do
+  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\"")
   end
 end
 
-context "should change(actual, message).from(old).to(new)" do
-  setup do
+describe "should change(actual, message).from(old).to(new)" do
+  before(:each) do
     @instance = SomethingExpected.new
     @instance.some_value = 'string'
   end
   
-  specify "should pass when #to comes before #from" do
+  it "should pass when #to comes before #from" do
     lambda { @instance.some_value = "cat" }.should change(@instance, :some_value).to("cat").from("string")
   end
 
-  specify "should pass when #from comes before #to" do
+  it "should pass when #from comes before #to" do
     lambda { @instance.some_value = "cat" }.should change(@instance, :some_value).from("string").to("cat")
   end
 end
 
-context "should change{ block }.from(old).to(new)" do
-  setup do
+describe "should change{ block }.from(old).to(new)" do
+  before(:each) do
     @instance = SomethingExpected.new
     @instance.some_value = 'string'
   end
   
-  specify "should pass when #to comes before #from" do
+  it "should pass when #to comes before #from" do
     lambda { @instance.some_value = "cat" }.should change{@instance.some_value}.to("cat").from("string")
   end
 
-  specify "should pass when #from comes before #to" do
+  it "should pass when #from comes before #to" do
     lambda { @instance.some_value = "cat" }.should change{@instance.some_value}.from("string").to("cat")
   end
 end