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

data/spec/rspec/matchers/match_spec.rb

@@ -1,27 +1,27 @@
 require 'spec_helper'
 
 describe "should match(expected)" do
-  it "should pass when target (String) matches expected (Regexp)" do
+  it "passes when target (String) matches expected (Regexp)" do
     "string".should match(/tri/)
   end
 
-  it "should pass when target (String) matches expected (String)" do
+  it "passes when target (String) matches expected (String)" do
     "string".should match("tri")
   end
 
-  it "should fail when target (String) does not match expected (Regexp)" do
+  it "fails when target (String) does not match expected (Regexp)" do
     lambda {
       "string".should match(/rings/)
     }.should fail
   end
 
-  it "should fail when target (String) does not match expected (String)" do
+  it "fails when target (String) does not match expected (String)" do
     lambda {
       "string".should match("rings")
     }.should fail
   end
   
-  it "should provide message, expected and actual on failure" do
+  it "provides message, expected and actual on failure" do
     matcher = match(/rings/)
     matcher.matches?("string")
     matcher.failure_message_for_should.should == "expected \"string\" to match /rings/"
@@ -29,27 +29,27 @@ describe "should match(expected)" do
 end
 
 describe "should_not match(expected)" do
-  it "should pass when target (String) matches does not match (Regexp)" do
+  it "passes when target (String) matches does not match (Regexp)" do
     "string".should_not match(/rings/)
   end
 
-  it "should pass when target (String) matches does not match (String)" do
+  it "passes when target (String) matches does not match (String)" do
     "string".should_not match("rings")
   end
 
-  it "should fail when target (String) matches expected (Regexp)" do
+  it "fails when target (String) matches expected (Regexp)" do
     lambda {
       "string".should_not match(/tri/)
     }.should fail
   end
 
-  it "should fail when target (String) matches expected (String)" do
+  it "fails when target (String) matches expected (String)" do
     lambda {
       "string".should_not match("tri")
     }.should fail
   end
 
-  it "should provide message, expected and actual on failure" do
+  it "provides message, expected and actual on failure" do
     matcher = match(/tri/)
     matcher.matches?("string")
     matcher.failure_message_for_should_not.should == "expected \"string\" not to match /tri/"

data/spec/rspec/matchers/operator_matcher_spec.rb

@@ -2,18 +2,18 @@ require 'spec_helper'
 
 describe "should ==" do
   
-  it "should delegate message to target" do
+  it "delegates message to target" do
     subject = "apple"
     subject.should_receive(:==).with("apple").and_return(true)
     subject.should == "apple"
   end
   
-  it "should return true on success" do
+  it "returns true on success" do
     subject = "apple"
     (subject.should == "apple").should be_true
   end
   
-  it "should fail when target.==(actual) returns false" do
+  it "fails when target.==(actual) returns false" do
     subject = "apple"
     RSpec::Expectations.should_receive(:fail_with).with(%[expected: "orange",\n     got: "apple" (using ==)], "orange", "apple")
     subject.should == "orange"
@@ -23,18 +23,18 @@ end
 
 describe "should_not ==" do
   
-  it "should delegate message to target" do
+  it "delegates message to target" do
     subject = "orange"
     subject.should_receive(:==).with("apple").and_return(false)
     subject.should_not == "apple"
   end
   
-  it "should return true on success" do
+  it "returns true on success" do
     subject = "apple"
     (subject.should_not == "orange").should be_false
   end
 
-  it "should fail when target.==(actual) returns false" do
+  it "fails when target.==(actual) returns false" do
     subject = "apple"
     RSpec::Expectations.should_receive(:fail_with).with(%[expected not: == "apple",\n         got:    "apple"], "apple", "apple")
     subject.should_not == "apple"
@@ -44,13 +44,13 @@ end
 
 describe "should ===" do
   
-  it "should delegate message to target" do
+  it "delegates message to target" do
     subject = "apple"
     subject.should_receive(:===).with("apple").and_return(true)
     subject.should === "apple"
   end
   
-  it "should fail when target.===(actual) returns false" do
+  it "fails when target.===(actual) returns false" do
     subject = "apple"
     subject.should_receive(:===).with("orange").and_return(false)
     RSpec::Expectations.should_receive(:fail_with).with(%[expected: "orange",\n     got: "apple" (using ===)], "orange", "apple")
@@ -61,13 +61,13 @@ end
 
 describe "should_not ===" do
   
-  it "should delegate message to target" do
+  it "delegates message to target" do
     subject = "orange"
     subject.should_receive(:===).with("apple").and_return(false)
     subject.should_not === "apple"
   end
   
-  it "should fail when target.===(actual) returns false" do
+  it "fails when target.===(actual) returns false" do
     subject = "apple"
     subject.should_receive(:===).with("apple").and_return(true)
     RSpec::Expectations.should_receive(:fail_with).with(%[expected not: === "apple",\n         got:     "apple"], "apple", "apple")
@@ -78,13 +78,13 @@ end
 
 describe "should =~" do
   
-  it "should delegate message to target" do
+  it "delegates message to target" do
     subject = "foo"
     subject.should_receive(:=~).with(/oo/).and_return(true)
     subject.should =~ /oo/
   end
   
-  it "should fail when target.=~(actual) returns false" do
+  it "fails when target.=~(actual) returns false" do
     subject = "fu"
     subject.should_receive(:=~).with(/oo/).and_return(false)
     RSpec::Expectations.should_receive(:fail_with).with(%[expected: /oo/,\n     got: "fu" (using =~)], /oo/, "fu")
@@ -95,13 +95,13 @@ end
 
 describe "should_not =~" do
   
-  it "should delegate message to target" do
+  it "delegates message to target" do
     subject = "fu"
     subject.should_receive(:=~).with(/oo/).and_return(false)
     subject.should_not =~ /oo/
   end
   
-  it "should fail when target.=~(actual) returns false" do
+  it "fails when target.=~(actual) returns false" do
     subject = "foo"
     subject.should_receive(:=~).with(/oo/).and_return(true)
     RSpec::Expectations.should_receive(:fail_with).with(%[expected not: =~ /oo/,\n         got:    "foo"], /oo/, "foo")
@@ -112,11 +112,11 @@ end
 
 describe "should >" do
   
-  it "should pass if > passes" do
+  it "passes if > passes" do
     4.should > 3
   end
 
-  it "should fail if > fails" do
+  it "fails if > fails" do
     RSpec::Expectations.should_receive(:fail_with).with(%[expected: > 5,\n     got:   4], 5, 4)
     4.should > 5
   end
@@ -125,12 +125,12 @@ end
 
 describe "should >=" do
   
-  it "should pass if >= passes" do
+  it "passes if >= passes" do
     4.should > 3
     4.should >= 4
   end
 
-  it "should fail if > fails" do
+  it "fails if > fails" do
     RSpec::Expectations.should_receive(:fail_with).with(%[expected: >= 5,\n     got:    4], 5, 4)
     4.should >= 5
   end
@@ -139,11 +139,11 @@ end
 
 describe "should <" do
   
-  it "should pass if < passes" do
+  it "passes if < passes" do
     4.should < 5
   end
 
-  it "should fail if > fails" do
+  it "fails if > fails" do
     RSpec::Expectations.should_receive(:fail_with).with(%[expected: < 3,\n     got:   4], 3, 4)
     4.should < 3
   end
@@ -152,12 +152,12 @@ end
 
 describe "should <=" do
   
-  it "should pass if <= passes" do
+  it "passes if <= passes" do
     4.should <= 5
     4.should <= 4
   end
 
-  it "should fail if > fails" do
+  it "fails if > fails" do
     RSpec::Expectations.should_receive(:fail_with).with(%[expected: <= 3,\n     got:    4], 3, 4)
     4.should <= 3
   end
@@ -166,7 +166,7 @@ end
 
 describe RSpec::Matchers::PositiveOperatorMatcher do
 
-  it "should work when the target has implemented #send" do
+  it "works when the target has implemented #send" do
     o = Object.new
     def o.send(*args); raise "DOH! Library developers shouldn't use #send!" end
     lambda {
@@ -178,7 +178,7 @@ end
 
 describe RSpec::Matchers::NegativeOperatorMatcher do
 
-  it "should work when the target has implemented #send" do
+  it "works when the target has implemented #send" do
     o = Object.new
     def o.send(*args); raise "DOH! Library developers shouldn't use #send!" end
     lambda {

data/spec/rspec/matchers/raise_error_spec.rb

@@ -1,11 +1,11 @@
 require 'spec_helper'
 
 describe "should raise_error" do
-  it "should pass if anything is raised" do
+  it "passes if anything is raised" do
     lambda {raise}.should raise_error
   end
   
-  it "should fail if nothing is raised" do
+  it "fails if nothing is raised" do
     lambda {
       lambda {}.should raise_error
     }.should fail_with("expected Exception but nothing was raised")
@@ -13,7 +13,7 @@ describe "should raise_error" do
 end
 
 describe "raise_exception aliased to raise_error" do
-  it "should pass if anything is raised" do
+  it "passes if anything is raised" do
     lambda {raise}.should raise_exception
   end
 end
@@ -37,11 +37,11 @@ describe "should raise_error {|err| ... }" do
 end
 
 describe "should_not raise_error" do
-  it "should pass if nothing is raised" do
+  it "passes if nothing is raised" do
     lambda {}.should_not raise_error
   end
   
-  it "should fail if anything is raised" do
+  it "fails if anything is raised" do
     lambda {
       lambda {raise}.should_not raise_error
     }.should fail_with("expected no Exception, got RuntimeError")
@@ -49,21 +49,21 @@ describe "should_not raise_error" do
 end
 
 describe "should raise_error(message)" do
-  it "should pass if RuntimeError is raised with the right message" do
+  it "passes if RuntimeError is raised with the right message" do
     lambda {raise 'blah'}.should raise_error('blah')
   end
-  it "should pass if RuntimeError is raised with a matching message" do
+  it "passes if RuntimeError is raised with a matching message" do
     lambda {raise 'blah'}.should raise_error(/blah/)
   end
-  it "should pass if any other error is raised with the right message" do
+  it "passes if any other error is raised with the right message" do
     lambda {raise NameError.new('blah')}.should raise_error('blah')
   end
-  it "should fail if RuntimeError error is raised with the wrong message" do
+  it "fails if RuntimeError error is raised with the wrong message" do
     lambda do
       lambda {raise 'blarg'}.should raise_error('blah')
     end.should fail_with("expected Exception with \"blah\", got #<RuntimeError: blarg>")
   end
-  it "should fail if any other error is raised with the wrong message" do
+  it "fails if any other error is raised with the wrong message" do
     lambda do
       lambda {raise NameError.new('blarg')}.should raise_error('blah')
     end.should fail_with("expected Exception with \"blah\", got #<NameError: blarg>")
@@ -71,18 +71,18 @@ describe "should raise_error(message)" do
 end
 
 describe "should_not raise_error(message)" do
-  it "should pass if RuntimeError error is raised with the different message" do
+  it "passes if RuntimeError error is raised with the different message" do
     lambda {raise 'blarg'}.should_not raise_error('blah')
   end
-  it "should pass if any other error is raised with the wrong message" do
+  it "passes if any other error is raised with the wrong message" do
     lambda {raise NameError.new('blarg')}.should_not raise_error('blah')
   end
-  it "should fail if RuntimeError is raised with message" do
+  it "fails if RuntimeError is raised with message" do
     lambda do
       lambda {raise 'blah'}.should_not raise_error('blah')
     end.should fail_with(%Q|expected no Exception with "blah", got #<RuntimeError: blah>|)
   end
-  it "should fail if any other error is raised with message" do
+  it "fails if any other error is raised with message" do
     lambda do
       lambda {raise NameError.new('blah')}.should_not raise_error('blah')
     end.should fail_with(%Q|expected no Exception with "blah", got #<NameError: blah>|)
@@ -90,23 +90,23 @@ describe "should_not raise_error(message)" do
 end
 
 describe "should raise_error(NamedError)" do
-  it "should pass if named error is raised" do
+  it "passes if named error is raised" do
     lambda { non_existent_method }.should raise_error(NameError)
   end
   
-  it "should fail if nothing is raised" do
+  it "fails if nothing is raised" do
     lambda {
       lambda { }.should raise_error(NameError)
     }.should fail_with("expected NameError but nothing was raised")
   end
   
-  it "should fail if another error is raised (NameError)" do
+  it "fails if another error is raised (NameError)" do
     lambda {
       lambda { raise }.should raise_error(NameError)
     }.should fail_with("expected NameError, got RuntimeError")
   end
   
-  it "should fail if another error is raised (NameError)" do
+  it "fails if another error is raised (NameError)" do
     lambda {
       lambda { load "non/existent/file" }.should raise_error(NameError)
     }.should fail_with(/expected NameError, got #<LoadError/)
@@ -114,15 +114,15 @@ describe "should raise_error(NamedError)" do
 end
 
 describe "should_not raise_error(NamedError)" do
-  it "should pass if nothing is raised" do
+  it "passes if nothing is raised" do
     lambda { }.should_not raise_error(NameError)
   end
   
-  it "should pass if another error is raised" do
+  it "passes if another error is raised" do
     lambda { raise }.should_not raise_error(NameError)
   end
   
-  it "should fail if named error is raised" do
+  it "fails if named error is raised" do
     lambda {
       lambda { 1 + 'b' }.should_not raise_error(TypeError)
     }.should fail_with(/expected no TypeError, got #<TypeError: String can't be/)
@@ -130,23 +130,23 @@ describe "should_not raise_error(NamedError)" do
 end
 
 describe "should raise_error(NamedError, error_message) with String" do
-  it "should pass if named error is raised with same message" do
+  it "passes if named error is raised with same message" do
     lambda { raise "example message" }.should raise_error(RuntimeError, "example message")
   end
   
-  it "should fail if nothing is raised" do
+  it "fails if nothing is raised" do
     lambda {
       lambda {}.should raise_error(RuntimeError, "example message")
     }.should fail_with("expected RuntimeError with \"example message\" but nothing was raised")
   end
   
-  it "should fail if incorrect error is raised" do
+  it "fails if incorrect error is raised" do
     lambda {
       lambda { raise }.should raise_error(NameError, "example message")
     }.should fail_with("expected NameError with \"example message\", got RuntimeError")
   end
   
-  it "should fail if correct error is raised with incorrect message" do
+  it "fails if correct error is raised with incorrect message" do
     lambda {
       lambda { raise RuntimeError.new("not the example message") }.should raise_error(RuntimeError, "example message")
     }.should fail_with(/expected RuntimeError with \"example message\", got #<RuntimeError: not the example message/)
@@ -154,7 +154,7 @@ describe "should raise_error(NamedError, error_message) with String" do
 end
 
 describe "should raise_error(NamedError, error_message) { |err| ... }" do
-  it "should yield exception if named error is raised with same message" do
+  it "yields exception if named error is raised with same message" do
     ran = false
 
     lambda {
@@ -168,7 +168,7 @@ describe "should raise_error(NamedError, error_message) { |err| ... }" do
     ran.should == true
   end
 
-  it "yielded block should be able to fail on it's own right" do
+  it "yielded block fails on it's own right" do
     ran, passed = false, false
 
     lambda {
@@ -185,7 +185,7 @@ describe "should raise_error(NamedError, error_message) { |err| ... }" do
     passed.should == false
   end
 
-  it "should NOT yield exception if no error was thrown" do
+  it "does NOT yield exception if no error was thrown" do
     ran = false
 
     lambda {
@@ -197,7 +197,7 @@ describe "should raise_error(NamedError, error_message) { |err| ... }" do
     ran.should == false
   end
 
-  it "should not yield exception if error class is not matched" do
+  it "does not yield exception if error class is not matched" do
     ran = false
 
     lambda {
@@ -211,7 +211,7 @@ describe "should raise_error(NamedError, error_message) { |err| ... }" do
     ran.should == false
   end
 
-  it "should NOT yield exception if error message is not matched" do
+  it "does NOT yield exception if error message is not matched" do
     ran = false
 
     lambda {
@@ -227,7 +227,7 @@ describe "should raise_error(NamedError, error_message) { |err| ... }" do
 end
 
 describe "should_not raise_error(NamedError, error_message) { |err| ... }" do
-  it "should pass if nothing is raised" do
+  it "passes if nothing is raised" do
     ran = false
 
     lambda {}.should_not raise_error(RuntimeError, "example message") { |err|
@@ -237,7 +237,7 @@ describe "should_not raise_error(NamedError, error_message) { |err| ... }" do
     ran.should == false
   end
 
-  it "should pass if a different error is raised" do
+  it "passes if a different error is raised" do
     ran = false
 
     lambda { raise }.should_not raise_error(NameError, "example message") { |err|
@@ -247,7 +247,7 @@ describe "should_not raise_error(NamedError, error_message) { |err| ... }" do
     ran.should == false
   end
 
-  it "should pass if same error is raised with different message" do
+  it "passes if same error is raised with different message" do
     ran = false
 
     lambda {
@@ -259,7 +259,7 @@ describe "should_not raise_error(NamedError, error_message) { |err| ... }" do
     ran.should == false
   end
 
-  it "should fail if named error is raised with same message" do
+  it "fails if named error is raised with same message" do
     ran = false
 
     lambda {
@@ -275,19 +275,19 @@ describe "should_not raise_error(NamedError, error_message) { |err| ... }" do
 end
 
 describe "should_not raise_error(NamedError, error_message) with String" do
-  it "should pass if nothing is raised" do
+  it "passes if nothing is raised" do
     lambda {}.should_not raise_error(RuntimeError, "example message")
   end
   
-  it "should pass if a different error is raised" do
+  it "passes if a different error is raised" do
     lambda { raise }.should_not raise_error(NameError, "example message")
   end
   
-  it "should pass if same error is raised with different message" do
+  it "passes if same error is raised with different message" do
     lambda { raise RuntimeError.new("not the example message") }.should_not raise_error(RuntimeError, "example message")
   end
   
-  it "should fail if named error is raised with same message" do
+  it "fails if named error is raised with same message" do
     lambda {
       lambda { raise "example message" }.should_not raise_error(RuntimeError, "example message")
     }.should fail_with("expected no RuntimeError with \"example message\", got #<RuntimeError: example message>")
@@ -295,23 +295,23 @@ describe "should_not raise_error(NamedError, error_message) with String" do
 end
 
 describe "should raise_error(NamedError, error_message) with Regexp" do
-  it "should pass if named error is raised with matching message" do
+  it "passes if named error is raised with matching message" do
     lambda { raise "example message" }.should raise_error(RuntimeError, /ample mess/)
   end
   
-  it "should fail if nothing is raised" do
+  it "fails if nothing is raised" do
     lambda {
       lambda {}.should raise_error(RuntimeError, /ample mess/)
     }.should fail_with("expected RuntimeError with message matching /ample mess/ but nothing was raised")
   end
   
-  it "should fail if incorrect error is raised" do
+  it "fails if incorrect error is raised" do
     lambda {
       lambda { raise }.should raise_error(NameError, /ample mess/)
     }.should fail_with("expected NameError with message matching /ample mess/, got RuntimeError")
   end
   
-  it "should fail if correct error is raised with incorrect message" do
+  it "fails if correct error is raised with incorrect message" do
     lambda {
       lambda { raise RuntimeError.new("not the example message") }.should raise_error(RuntimeError, /less than ample mess/)
     }.should fail_with("expected RuntimeError with message matching /less than ample mess/, got #<RuntimeError: not the example message>")
@@ -319,19 +319,19 @@ describe "should raise_error(NamedError, error_message) with Regexp" do
 end
 
 describe "should_not raise_error(NamedError, error_message) with Regexp" do
-  it "should pass if nothing is raised" do
+  it "passes if nothing is raised" do
     lambda {}.should_not raise_error(RuntimeError, /ample mess/)
   end
   
-  it "should pass if a different error is raised" do
+  it "passes if a different error is raised" do
     lambda { raise }.should_not raise_error(NameError, /ample mess/)
   end
   
-  it "should pass if same error is raised with non-matching message" do
+  it "passes if same error is raised with non-matching message" do
     lambda { raise RuntimeError.new("non matching message") }.should_not raise_error(RuntimeError, /ample mess/)
   end
   
-  it "should fail if named error is raised with matching message" do
+  it "fails if named error is raised with matching message" do
     lambda {
       lambda { raise "example message" }.should_not raise_error(RuntimeError, /ample mess/)
     }.should fail_with("expected no RuntimeError with message matching /ample mess/, got #<RuntimeError: example message>")