rspec-expectations 2.0.0.beta.19 → 2.0.0.beta.20

data/spec/rspec/matchers/change_spec.rb

@@ -11,11 +11,11 @@ describe "should change(actual, message)" do
     @instance.some_value = 5
   end
 
-  it "should pass when actual is modified by the block" do
+  it "passes when actual is modified by the block" do
     expect {@instance.some_value = 6}.to change(@instance, :some_value)
   end
 
-  it "should fail when actual is not modified by the block" do
+  it "fails when actual is not modified by the block" do
     expect do
       expect {}.to change(@instance, :some_value)
     end.to fail_with("some_value should have changed, but is still 5")
@@ -32,11 +32,11 @@ describe "should_not change(actual, message)" do
     @instance.some_value = 5
   end
 
-  it "should pass when actual is not modified by the block" do
+  it "passes when actual is not modified by the block" do
     expect { }.to_not change(@instance, :some_value)
   end
 
-  it "should fail when actual is not modified by the block" do
+  it "fails when actual is not modified by the block" do
     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")
@@ -49,17 +49,17 @@ describe "should change { block }" do
     @instance.some_value = 5
   end
 
-  it "should pass when actual is modified by the block" do
+  it "passes when actual is modified by the block" do
     expect {@instance.some_value = 6}.to change { @instance.some_value }
   end
 
-  it "should fail when actual is not modified by the block" do
+  it "fails when actual is not modified by the block" do
     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
+  it "warns if passed a block using do/end instead of {}" do
     expect do
       expect {}.to change do; end
     end.to raise_error(RSpec::Matchers::MatcherError, /block passed to should or should_not/)
@@ -76,17 +76,17 @@ describe "should_not change { block }" do
     @instance.some_value = 5
   end
 
-  it "should pass when actual is modified by the block" do
+  it "passes when actual is modified by the block" do
     expect {}.to_not change{ @instance.some_value }
   end
 
-  it "should fail when actual is not modified by the block" do
+  it "fails when actual is not modified by the block" do
     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 instead of {}" do
+  it "warns if passed a block using do/end instead of {}" do
     expect do
       expect {}.to_not change do; end
     end.to raise_error(RSpec::Matchers::MatcherError, /block passed to should or should_not/)
@@ -99,17 +99,17 @@ describe "should change(actual, message).by(expected)" do
     @instance.some_value = 5
   end
 
-  it "should pass when attribute is changed by expected amount" do
+  it "passes when attribute is changed by expected amount" do
     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
+  it "fails when the attribute is changed by unexpected amount" do
     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
+  it "fails when the attribute is changed by unexpected amount in the opposite direction" do
     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")
@@ -122,17 +122,17 @@ describe "should change{ block }.by(expected)" do
     @instance.some_value = 5
   end
 
-  it "should pass when attribute is changed by expected amount" do
+  it "passes when attribute is changed by expected amount" do
     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
+  it "fails when the attribute is changed by unexpected amount" do
     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
+  it "fails when the attribute is changed by unexpected amount in the opposite direction" do
     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")
@@ -145,15 +145,15 @@ describe "should change(actual, message).by_at_least(expected)" do
     @instance.some_value = 5
   end
 
-  it "should pass when attribute is changed by greater than the expected amount" do
+  it "passes 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
+  it "passes 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
+  it "fails 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")
@@ -167,15 +167,15 @@ describe "should change{ block }.by_at_least(expected)" do
     @instance.some_value = 5
   end
 
-  it "should pass when attribute is changed by greater than expected amount" do
+  it "passes 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
+  it "passes 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
+  it "fails 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")
@@ -189,15 +189,15 @@ describe "should change(actual, message).by_at_most(expected)" do
     @instance.some_value = 5
   end
 
-  it "should pass when attribute is changed by less than the expected amount" do
+  it "passes 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
+  it "passes 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
+  it "fails 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")
@@ -211,15 +211,15 @@ describe "should change{ block }.by_at_most(expected)" do
     @instance.some_value = 5
   end
 
-  it "should pass when attribute is changed by less than expected amount" do
+  it "passes 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
+  it "passes 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
+  it "fails 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")
@@ -232,11 +232,11 @@ describe "should change(actual, message).from(old)" do
     @instance.some_value = 'string'
   end
 
-  it "should pass when attribute is == to expected value before executing block" do
+  it "passes when attribute is == to expected value before executing block" do
     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
+  it "fails when attribute is not == to expected value before executing block" do
     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\"")
@@ -249,11 +249,11 @@ describe "should change{ block }.from(old)" do
     @instance.some_value = 'string'
   end
 
-  it "should pass when attribute is == to expected value before executing block" do
+  it "passes when attribute is == to expected value before executing block" do
     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
+  it "fails when attribute is not == to expected value before executing block" do
     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\"")
@@ -266,11 +266,11 @@ describe "should change(actual, message).to(new)" do
     @instance.some_value = 'string'
   end
   
-  it "should pass when attribute is == to expected value after executing block" do
+  it "passes when attribute is == to expected value after executing block" do
     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
+  it "fails when attribute is not == to expected value after executing block" 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\"")
@@ -283,11 +283,11 @@ describe "should change{ block }.to(new)" do
     @instance.some_value = 'string'
   end
   
-  it "should pass when attribute is == to expected value after executing block" do
+  it "passes when attribute is == to expected value after executing block" do
     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
+  it "fails when attribute is not == to expected value after executing block" do
     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\"")
@@ -300,21 +300,21 @@ describe "should change(actual, message).from(old).to(new)" do
     @instance.some_value = 'string'
   end
   
-  it "should pass when #to comes before #from" do
+  it "passes when #to comes before #from" do
     expect { @instance.some_value = "cat" }.to change(@instance, :some_value).to("cat").from("string")
   end
 
-  it "should pass when #from comes before #to" do
+  it "passes when #from comes before #to" do
     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
+  it "shows 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
+  it "shows 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\"")
@@ -327,17 +327,17 @@ describe "should change{ block }.from(old).to(new)" do
     @instance.some_value = 'string'
   end
   
-  it "should pass when #to comes before #from" do
+  it "passes when #to comes before #from" do
     expect { @instance.some_value = "cat" }.to change{@instance.some_value}.to("cat").from("string")
   end
 
-  it "should pass when #from comes before #to" do
+  it "passes when #from comes before #to" do
     expect { @instance.some_value = "cat" }.to change{@instance.some_value}.from("string").to("cat")
   end
 end
 
 describe RSpec::Matchers::Change do
-  it "should work when the receiver has implemented #send" do
+  it "works 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

data/spec/rspec/matchers/description_generation_spec.rb

@@ -153,7 +153,7 @@ describe "a Matcher with no description" do
      end.new
   end
   
-  it "should provide a helpful message when used in a string-less example block" do
+  it "provides a helpful message when used in a string-less example block" do
     5.should matcher
     RSpec::Matchers.generated_description.should =~ /When you call.*description method/m
   end

data/spec/rspec/matchers/eql_spec.rb

@@ -3,27 +3,27 @@ require 'spec_helper'
 module RSpec
   module Matchers
     describe "eql" do
-      it "should match when actual.eql?(expected)" do
+      it "matches when actual.eql?(expected)" do
         1.should eql(1)
       end
       
-      it "should not match when !actual.eql?(expected)" do
+      it "does not match when !actual.eql?(expected)" do
         1.should_not eql(2)
       end
       
-      it "should describe itself" do
+      it "describes itself" do
         matcher = eql(1)
         matcher.matches?(1)
         matcher.description.should == "eql 1"
       end
       
-      it "should provide message, expected and actual on #failure_message" do
+      it "provides message, expected and actual on #failure_message" do
         matcher = eql("1")
         matcher.matches?(1)
         matcher.failure_message_for_should.should == "\nexpected \"1\"\n     got 1\n\n(compared using eql?)\n"
       end
       
-      it "should provide message, expected and actual on #negative_failure_message" do
+      it "provides message, expected and actual on #negative_failure_message" do
         matcher = eql(1)
         matcher.matches?(1)
         matcher.failure_message_for_should_not.should == "\nexpected 1 not to equal 1\n\n(compared using eql?)\n"

data/spec/rspec/matchers/equal_spec.rb

@@ -7,21 +7,21 @@ module RSpec
         "#<#{o.class}:#{o.object_id}> => #{o.inspect}"
       end
       
-      it "should match when actual.equal?(expected)" do
+      it "matches when actual.equal?(expected)" do
         1.should equal(1)
       end
 
-      it "should not match when !actual.equal?(expected)" do
+      it "does not match when !actual.equal?(expected)" do
         1.should_not equal("1")
       end
       
-      it "should describe itself" do
+      it "describes itself" do
         matcher = equal(1)
         matcher.matches?(1)
         matcher.description.should == "equal 1"
       end
       
-      it "should provide message on #failure_message" do
+      it "provides message on #failure_message" do
         expected, actual = "1", "1"
         matcher = equal(expected)
         matcher.matches?(actual)
@@ -39,7 +39,7 @@ object identity in this example.
 MESSAGE
       end
       
-      it "should provide message on #negative_failure_message" do
+      it "provides message on #negative_failure_message" do
         expected = actual = "1"
         matcher = equal(expected)
         matcher.matches?(actual)

data/spec/rspec/matchers/exist_spec.rb

@@ -55,7 +55,7 @@ describe "should exist" do
 
   describe "outside of an example group" do
 
-    it "should pass if target exists" do
+    it "passes if target exists" do
       real_tester = SubstanceTester.new @real
       real_tester.should_exist
     end

data/spec/rspec/matchers/has_spec.rb

@@ -1,17 +1,17 @@
 require 'spec_helper'
 
 describe "should have_sym(*args)" do
-  it "should pass if #has_sym?(*args) returns true" do
+  it "passes if #has_sym?(*args) returns true" do
     {:a => "A"}.should have_key(:a)
   end
 
-  it "should fail if #has_sym?(*args) returns false" do
+  it "fails if #has_sym?(*args) returns false" do
     lambda {
       {:b => "B"}.should have_key(:a)
     }.should fail_with("expected #has_key?(:a) to return true, got false")
   end
 
-  it "should fail if #has_sym?(*args) returns nil" do
+  it "fails if #has_sym?(*args) returns nil" do
     klass = Class.new do
       def has_foo?
       end
@@ -21,13 +21,13 @@ describe "should have_sym(*args)" do
     }.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
+  it "fails if target does not respond to #has_sym?" do
     lambda {
       Object.new.should have_key(:a)
     }.should raise_error(NoMethodError)
   end
   
-  it "should reraise an exception thrown in #has_sym?(*args)" do
+  it "reraises an exception thrown in #has_sym?(*args)" do
     o = Object.new
     def o.has_sym?(*args)
       raise "Funky exception"
@@ -37,11 +37,11 @@ describe "should have_sym(*args)" do
 end
 
 describe "should_not have_sym(*args)" do
-  it "should pass if #has_sym?(*args) returns false" do
+  it "passes if #has_sym?(*args) returns false" do
     {:a => "A"}.should_not have_key(:b)
   end
 
-  it "should pass if #has_sym?(*args) returns nil" do
+  it "passes if #has_sym?(*args) returns nil" do
     klass = Class.new do
       def has_foo?
       end
@@ -49,19 +49,19 @@ describe "should_not have_sym(*args)" do
     klass.new.should_not have_foo
   end
 
-  it "should fail if #has_sym?(*args) returns true" do
+  it "fails if #has_sym?(*args) returns true" do
     lambda {
       {:a => "A"}.should_not have_key(:a)
     }.should fail_with("expected #has_key?(:a) to return false, got true")
   end
 
-  it "should fail if target does not respond to #has_sym?" do
+  it "fails if target does not respond to #has_sym?" do
     lambda {
       Object.new.should have_key(:a)
     }.should raise_error(NoMethodError)
   end
   
-  it "should reraise an exception thrown in #has_sym?(*args)" do
+  it "reraises an exception thrown in #has_sym?(*args)" do
     o = Object.new
     def o.has_sym?(*args)
       raise "Funky exception"
@@ -71,7 +71,7 @@ describe "should_not have_sym(*args)" do
 end
 
 describe "has" do
-  it "should work when the target implements #send" do
+  it "works when the target implements #send" do
     o = {:a => "A"}
     def o.send(*args); raise "DOH! Library developers shouldn't use #send!" end
     lambda {