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

data/.gitignore

@@ -7,3 +7,4 @@ doc
 tmp
 rerun.txt
 Gemfile.lock
+.bundle

data/Gemfile

@@ -9,3 +9,4 @@ gem "diff-lcs"
 gem "rspec-expectations", :path => "."
 gem "rspec-core", :path => "../rspec-core"
 gem "rspec-mocks", :path => "../rspec-mocks"
+gem "watchr"

data/Rakefile

@@ -24,13 +24,6 @@ begin
     gem.add_development_dependency('aruba', ">= 0.1.1")
     gem.add_development_dependency('rspec-core', ">= #{RSpec::Expectations::Version::STRING}")
     gem.add_development_dependency('rspec-mocks', ">= #{RSpec::Expectations::Version::STRING}")
-    gem.post_install_message = <<-EOM
-#{"*"*50}
-
-  Thank you for installing #{gem.summary}
-
-#{"*"*50}
-EOM
   end
 rescue LoadError
   puts "Jeweler (or a dependency) not available. Install it with: gem install jeweler"

data/VERSION

@@ -1 +1 @@
-2.0.0.beta.19
+2.0.0.beta.20

data/features/matchers/define_matcher.feature

@@ -191,7 +191,7 @@ Feature: define matcher
     Then the exit status should be 0
     And the stdout should contain "1 example, 0 failures"
 
-  Scenario: scoped
+  Scenario: scoped in a module
     Given a file named "scoped_matcher_spec.rb" with:
       """
       require 'rspec/expectations'
@@ -207,16 +207,52 @@ Feature: define matcher
       describe "group with MyHelpers" do
         include MyHelpers
         it "has access to the defined matcher" do
-          self.should respond_to(:be_just_like)
+          5.should be_just_like(5)
         end
       end
 
       describe "group without MyHelpers" do
         it "does not have access to the defined matcher" do
-          self.should_not respond_to(:be_just_like)
+          expect do
+            5.should be_just_like(5)
+          end.to raise_exception
         end
       end
       """
 
     When I run "rspec ./scoped_matcher_spec.rb"
-    Then the stdout should contain "1 failure"
+    Then the stdout should contain "2 examples, 0 failures"
+
+  Scenario: scoped in an example group
+    Given a file named "scoped_matcher_spec.rb" with:
+      """
+      require 'rspec/expectations'
+
+      describe "group with matcher" do
+        matcher :be_just_like do |expected|
+          match {|actual| actual == expected}
+        end
+
+        it "has access to the defined matcher" do
+          5.should be_just_like(5)
+        end
+
+        describe "nested group" do
+          it "has access to the defined matcher" do
+            5.should be_just_like(5)
+          end
+        end
+
+      end
+
+      describe "group without matcher" do
+        it "does not have access to the defined matcher" do
+          expect do
+            5.should be_just_like(5)
+          end.to raise_exception
+        end
+      end
+      """
+
+    When I run "rspec scoped_matcher_spec.rb"
+    Then the output should contain "3 examples, 0 failures"

data/lib/rspec/expectations/extensions.rb

@@ -1,2 +1,3 @@
 require 'rspec/expectations/extensions/kernel'
+require 'rspec/expectations/extensions/array'
 require 'rspec/expectations/extensions/rspec/core/example_group'

data/lib/rspec/expectations/extensions/array.rb

@@ -0,0 +1,7 @@
+class Array
+  unless public_instance_methods.map {|m| m.to_s}.include?('none?')
+    def none?(&block)
+      !any?(&block)
+    end
+  end
+end

data/lib/rspec/matchers/dsl.rb

@@ -10,6 +10,10 @@ module RSpec
       end
 
       alias_method :matcher, :define
+
+      if RSpec.respond_to?(:configure)
+        RSpec.configure {|c| c.extend self}
+      end
     end
   end
 end

data/lib/rspec/matchers/throw_symbol.rb

@@ -97,8 +97,8 @@ module RSpec
     #   lambda { do_something_risky }.should_not throw_symbol
     #   lambda { do_something_risky }.should_not throw_symbol(:that_was_risky)
     #   lambda { do_something_risky }.should_not throw_symbol(:that_was_risky, culprit)
-    def throw_symbol(sym=nil)
-      Matchers::ThrowSymbol.new(sym)
+    def throw_symbol(expected_symbol = nil, expected_arg=nil)
+      Matchers::ThrowSymbol.new(expected_symbol, expected_arg)
     end
   end
 end

data/rspec-expectations.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{rspec-expectations}
-  s.version = "2.0.0.beta.19"
+  s.version = "2.0.0.beta.20"
 
   s.required_rubygems_version = Gem::Requirement.new("> 1.3.1") if s.respond_to? :required_rubygems_version=
   s.authors = ["David Chelimsky", "Chad Humphries"]
-  s.date = %q{2010-07-25}
+  s.date = %q{2010-08-24}
   s.description = %q{rspec expectations (should[_not] and matchers)}
   s.email = %q{dchelimsky@gmail.com;chad.humphries@gmail.com}
   s.extra_rdoc_files = [
@@ -43,6 +43,7 @@ Gem::Specification.new do |s|
      "lib/rspec/expectations/differ.rb",
      "lib/rspec/expectations/errors.rb",
      "lib/rspec/expectations/extensions.rb",
+     "lib/rspec/expectations/extensions/array.rb",
      "lib/rspec/expectations/extensions/kernel.rb",
      "lib/rspec/expectations/extensions/rspec/core/example_group.rb",
      "lib/rspec/expectations/fail_with.rb",
@@ -111,17 +112,11 @@ Gem::Specification.new do |s|
      "specs.watchr"
   ]
   s.homepage = %q{http://github.com/rspec/expectations}
-  s.post_install_message = %q{**************************************************
-
-  Thank you for installing rspec-expectations-2.0.0.beta.19
-
-**************************************************
-}
   s.rdoc_options = ["--charset=UTF-8"]
   s.require_paths = ["lib"]
   s.rubyforge_project = %q{rspec}
   s.rubygems_version = %q{1.3.7}
-  s.summary = %q{rspec-expectations-2.0.0.beta.19}
+  s.summary = %q{rspec-expectations-2.0.0.beta.20}
   s.test_files = [
     "spec/rspec/expectations/differ_spec.rb",
      "spec/rspec/expectations/extensions/kernel_spec.rb",
@@ -164,21 +159,21 @@ Gem::Specification.new do |s|
       s.add_runtime_dependency(%q<diff-lcs>, [">= 1.1.2"])
       s.add_development_dependency(%q<cucumber>, [">= 0.6.2"])
       s.add_development_dependency(%q<aruba>, [">= 0.1.1"])
-      s.add_development_dependency(%q<rspec-core>, [">= 2.0.0.beta.19"])
-      s.add_development_dependency(%q<rspec-mocks>, [">= 2.0.0.beta.19"])
+      s.add_development_dependency(%q<rspec-core>, [">= 2.0.0.beta.20"])
+      s.add_development_dependency(%q<rspec-mocks>, [">= 2.0.0.beta.20"])
     else
       s.add_dependency(%q<diff-lcs>, [">= 1.1.2"])
       s.add_dependency(%q<cucumber>, [">= 0.6.2"])
       s.add_dependency(%q<aruba>, [">= 0.1.1"])
-      s.add_dependency(%q<rspec-core>, [">= 2.0.0.beta.19"])
-      s.add_dependency(%q<rspec-mocks>, [">= 2.0.0.beta.19"])
+      s.add_dependency(%q<rspec-core>, [">= 2.0.0.beta.20"])
+      s.add_dependency(%q<rspec-mocks>, [">= 2.0.0.beta.20"])
     end
   else
     s.add_dependency(%q<diff-lcs>, [">= 1.1.2"])
     s.add_dependency(%q<cucumber>, [">= 0.6.2"])
     s.add_dependency(%q<aruba>, [">= 0.1.1"])
-    s.add_dependency(%q<rspec-core>, [">= 2.0.0.beta.19"])
-    s.add_dependency(%q<rspec-mocks>, [">= 2.0.0.beta.19"])
+    s.add_dependency(%q<rspec-core>, [">= 2.0.0.beta.20"])
+    s.add_dependency(%q<rspec-mocks>, [">= 2.0.0.beta.20"])
   end
 end
 

data/spec/rspec/expectations/differ_spec.rb

@@ -26,7 +26,7 @@ describe "Diff" do
     @differ = RSpec::Expectations::Differ.new(@options)
   end
 
-  it "should output unified diff of two strings" do
+  it "outputs unified diff of two strings" do
     expected="foo\nbar\nzap\nthis\nis\nsoo\nvery\nvery\nequal\ninsert\na\nline\n"
     actual="foo\nzap\nbar\nthis\nis\nsoo\nvery\nvery\nequal\ninsert\na\nanother\nline\n"
     expected_diff= <<'EOD'
@@ -52,7 +52,7 @@ EOD
     diff.should eql(expected_diff)
   end
 
-  it "should output unified diff message of two arrays" do
+  it "outputs unified diff message of two arrays" do
     expected = [ :foo, 'bar', :baz, 'quux', :metasyntactic, 'variable', :delta, 'charlie', :width, 'quite wide' ]
     actual   = [ :foo, 'bar', :baz, 'quux', :metasyntactic, 'variable', :delta, 'tango'  , :width, 'very wide'  ]
 
@@ -75,7 +75,7 @@ EOD
     diff.should == expected_diff
   end
 
-  it "should output unified diff message of two objects" do
+  it "outputs unified diff message of two objects" do
     expected = RSpec::Fixtures::Animal.new "bob", "giraffe"
     actual   = RSpec::Fixtures::Animal.new "bob", "tortoise"
 

data/spec/rspec/expectations/handler_spec.rb

@@ -184,7 +184,7 @@ module RSpec
     describe PositiveExpectationHandler do
       include ExampleExpectations
       
-      it "should handle submitted args" do
+      it "handles submitted args" do
         5.should arbitrary_matcher(:expected => 5)
         5.should arbitrary_matcher(:expected => "wrong").with(5)
         lambda { 5.should arbitrary_matcher(:expected => 4) }.should fail_with("expected 4, got 5")
@@ -195,7 +195,7 @@ module RSpec
         lambda { 5.should_not arbitrary_matcher(:expected => 4).with(5) }.should fail_with("expected not 5, got 5")
       end
 
-      it "should handle the submitted block" do
+      it "handles the submitted block" do
         5.should arbitrary_matcher { 5 }
         5.should arbitrary_matcher(:expected => 4) { 5 }
         5.should arbitrary_matcher(:expected => 4).with(5) { 3 }

data/spec/rspec/matchers/be_spec.rb

@@ -1,37 +1,37 @@
 require 'spec_helper'
 
 describe "should be_predicate" do  
-  it "should pass when actual returns true for :predicate?" do
+  it "passes when actual returns true for :predicate?" do
     actual = stub("actual", :happy? => true)
     actual.should be_happy
   end
 
-  it "should pass when actual returns true for :predicates? (present tense)" do
+  it "passes when actual returns true for :predicates? (present tense)" do
     actual = stub("actual", :exists? => true, :exist? => true)
     actual.should be_exist
   end
 
-  it "should fail when actual returns false for :predicate?" do
+  it "fails 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
   
-  it "should fail when actual returns false for :predicate?" do
+  it "fails when actual returns false for :predicate?" do
     actual = stub("actual", :happy? => nil)
     lambda {
       actual.should be_happy
     }.should fail_with("expected happy? to return true, got nil")
   end
   
-  it "should fail when actual does not respond to :predicate?" do
+  it "fails when actual does not respond to :predicate?" do
     lambda {
       Object.new.should be_happy
     }.should raise_error(NameError, /happy\?/)
   end
   
-  it "should fail on error other than NameError" do
+  it "fails on error other than NameError" do
     actual = stub("actual")
     actual.should_receive(:foo?).and_raise("aaaah")
     lambda {
@@ -39,7 +39,7 @@ describe "should be_predicate" do
     }.should raise_error(/aaaah/)
   end
   
-  it "should fail on error other than NameError (with the present tense predicate)" do
+  it "fails on error other than NameError (with the present tense predicate)" do
     actual = Object.new
     actual.should_receive(:foos?).and_raise("aaaah")
     lambda {
@@ -49,24 +49,24 @@ describe "should be_predicate" do
 end
 
 describe "should_not be_predicate" do
-  it "should pass when actual returns false for :sym?" do
+  it "passes when actual returns false for :sym?" do
     actual = stub("actual", :happy? => false)
     actual.should_not be_happy
   end
   
-  it "should pass when actual returns nil for :sym?" do
+  it "passes when actual returns nil for :sym?" do
     actual = stub("actual", :happy? => nil)
     actual.should_not be_happy
   end
   
-  it "should fail when actual returns true for :sym?" do
+  it "fails 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
 
-  it "should fail when actual does not respond to :sym?" do
+  it "fails when actual does not respond to :sym?" do
     lambda {
       Object.new.should_not be_happy
     }.should raise_error(NameError)
@@ -74,13 +74,13 @@ describe "should_not be_predicate" do
 end
 
 describe "should be_predicate(*args)" do
-  it "should pass when actual returns true for :predicate?(*args)" do
+  it "passes 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
 
-  it "should fail when actual returns false for :predicate?(*args)" do
+  it "fails when actual returns false for :predicate?(*args)" do
     actual = mock("actual")
     actual.should_receive(:older_than?).with(3).and_return(false)
     lambda {
@@ -88,7 +88,7 @@ describe "should be_predicate(*args)" do
     }.should fail_with("expected older_than?(3) to return true, got false")
   end
   
-  it "should fail when actual does not respond to :predicate?" do
+  it "fails when actual does not respond to :predicate?" do
     lambda {
       Object.new.should be_older_than(3)
     }.should raise_error(NameError)
@@ -96,13 +96,13 @@ describe "should be_predicate(*args)" do
 end
 
 describe "should_not be_predicate(*args)" do
-  it "should pass when actual returns false for :predicate?(*args)" do
+  it "passes 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
   
-  it "should fail when actual returns true for :predicate?(*args)" do
+  it "fails when actual returns true for :predicate?(*args)" do
     actual = mock("actual")
     actual.should_receive(:older_than?).with(3).and_return(true)
     lambda {
@@ -110,7 +110,7 @@ describe "should_not be_predicate(*args)" do
     }.should fail_with("expected older_than?(3) to return false, got true")
   end
 
-  it "should fail when actual does not respond to :predicate?" do
+  it "fails when actual does not respond to :predicate?" do
     lambda {
       Object.new.should_not be_older_than(3)
     }.should raise_error(NameError)
@@ -118,7 +118,7 @@ describe "should_not be_predicate(*args)" do
 end
 
 describe "should be_predicate(&block)" do
-  it "should pass when actual returns true for :predicate?(&block)" do
+  it "passes when actual returns true for :predicate?(&block)" do
     actual = mock("actual")
     delegate = mock("delegate")
     actual.should_receive(:happy?).and_yield
@@ -126,7 +126,7 @@ describe "should be_predicate(&block)" do
     actual.should be_happy { delegate.check_happy }
   end
 
-  it "should fail when actual returns false for :predicate?(&block)" do
+  it "fails when actual returns false for :predicate?(&block)" do
     actual = mock("actual")
     delegate = mock("delegate")
     actual.should_receive(:happy?).and_yield
@@ -136,7 +136,7 @@ describe "should be_predicate(&block)" do
     }.should fail_with("expected happy? to return true, got false")
   end
 
-  it "should fail when actual does not respond to :predicate?" do
+  it "fails when actual does not respond to :predicate?" do
     delegate = mock("delegate", :check_happy => true)
     lambda {
       Object.new.should be_happy { delegate.check_happy }
@@ -145,7 +145,7 @@ describe "should be_predicate(&block)" do
 end
 
 describe "should_not be_predicate(&block)" do
-  it "should pass when actual returns false for :predicate?(&block)" do
+  it "passes when actual returns false for :predicate?(&block)" do
     actual = mock("actual")
     delegate = mock("delegate")
     actual.should_receive(:happy?).and_yield
@@ -153,7 +153,7 @@ describe "should_not be_predicate(&block)" do
     actual.should_not be_happy { delegate.check_happy }
   end
 
-  it "should fail when actual returns true for :predicate?(&block)" do
+  it "fails when actual returns true for :predicate?(&block)" do
     actual = mock("actual")
     delegate = mock("delegate")
     actual.should_receive(:happy?).and_yield
@@ -163,7 +163,7 @@ describe "should_not be_predicate(&block)" do
     }.should fail_with("expected happy? to return false, got true")
   end
 
-  it "should fail when actual does not respond to :predicate?" do
+  it "fails when actual does not respond to :predicate?" do
     delegate = mock("delegate", :check_happy => true)
     lambda {
       Object.new.should_not be_happy { delegate.check_happy }
@@ -172,7 +172,7 @@ describe "should_not be_predicate(&block)" do
 end
 
 describe "should be_predicate(*args, &block)" do
-  it "should pass when actual returns true for :predicate?(*args, &block)" do
+  it "passes when actual returns true for :predicate?(*args, &block)" do
     actual = mock("actual")
     delegate = mock("delegate")
     actual.should_receive(:older_than?).with(3).and_yield(3)
@@ -180,7 +180,7 @@ describe "should be_predicate(*args, &block)" do
     actual.should be_older_than(3) { |age| delegate.check_older_than(age) }
   end
 
-  it "should fail when actual returns false for :predicate?(*args, &block)" do
+  it "fails when actual returns false for :predicate?(*args, &block)" do
     actual = mock("actual")
     delegate = mock("delegate")
     actual.should_receive(:older_than?).with(3).and_yield(3)
@@ -190,7 +190,7 @@ describe "should be_predicate(*args, &block)" do
     }.should fail_with("expected older_than?(3) to return true, got false")
   end
 
-  it "should fail when actual does not respond to :predicate?" do
+  it "fails when actual does not respond to :predicate?" do
     delegate = mock("delegate", :check_older_than => true)
     lambda {
       Object.new.should be_older_than(3) { |age| delegate.check_older_than(age) }
@@ -199,7 +199,7 @@ describe "should be_predicate(*args, &block)" do
 end
 
 describe "should_not be_predicate(*args, &block)" do
-  it "should pass when actual returns false for :predicate?(*args, &block)" do
+  it "passes when actual returns false for :predicate?(*args, &block)" do
     actual = mock("actual")
     delegate = mock("delegate")
     actual.should_receive(:older_than?).with(3).and_yield(3)
@@ -207,7 +207,7 @@ describe "should_not be_predicate(*args, &block)" do
     actual.should_not be_older_than(3) { |age| delegate.check_older_than(age) }
   end
 
-  it "should fail when actual returns true for :predicate?(*args, &block)" do
+  it "fails when actual returns true for :predicate?(*args, &block)" do
     actual = mock("actual")
     delegate = mock("delegate")
     actual.should_receive(:older_than?).with(3).and_yield(3)
@@ -217,7 +217,7 @@ describe "should_not be_predicate(*args, &block)" do
     }.should fail_with("expected older_than?(3) to return false, got true")
   end
 
-  it "should fail when actual does not respond to :predicate?" do
+  it "fails when actual does not respond to :predicate?" do
     delegate = mock("delegate", :check_older_than => true)
     lambda {
       Object.new.should_not be_older_than(3) { |age| delegate.check_older_than(age) }
@@ -226,15 +226,15 @@ describe "should_not be_predicate(*args, &block)" do
 end
 
 describe "should be_true" do
-  it "should pass when actual equal?(true)" do
+  it "passes when actual equal?(true)" do
     true.should be_true
   end
 
-  it "should pass when actual is 1" do
+  it "passes when actual is 1" do
     1.should be_true
   end
 
-  it "should fail when actual equal?(false)" do
+  it "fails when actual equal?(false)" do
     lambda {
       false.should be_true
     }.should fail_with("expected false to be true")
@@ -242,15 +242,15 @@ describe "should be_true" do
 end
 
 describe "should be_false" do
-  it "should pass when actual equal?(false)" do
+  it "passes when actual equal?(false)" do
     false.should be_false
   end
 
-  it "should pass when actual equal?(nil)" do
+  it "passes when actual equal?(nil)" do
     nil.should be_false
   end
 
-  it "should fail when actual equal?(true)" do
+  it "fails when actual equal?(true)" do
     lambda {
       true.should be_false
     }.should fail_with("expected true to be false")
@@ -258,11 +258,11 @@ describe "should be_false" do
 end
 
 describe "should be_nil" do
-  it "should pass when actual is nil" do
+  it "passes when actual is nil" do
     nil.should be_nil
   end
 
-  it "should fail when actual is not nil" do
+  it "fails when actual is not nil" do
     lambda {
       :not_nil.should be_nil
     }.should fail_with("expected nil, got :not_nil")
@@ -270,11 +270,11 @@ describe "should be_nil" do
 end
 
 describe "should_not be_nil" do
-  it "should pass when actual is not nil" do
+  it "passes when actual is not nil" do
     :not_nil.should_not be_nil
   end
 
-  it "should fail when actual is nil" do
+  it "fails when actual is nil" do
     lambda {
       nil.should_not be_nil
     }.should fail_with("expected not nil, got nil")
@@ -282,73 +282,73 @@ describe "should_not be_nil" do
 end
 
 describe "should be <" do
-  it "should pass when < operator returns true" do
+  it "passes when < operator returns true" do
     3.should be < 4
   end
 
-  it "should fail when < operator returns false" do
+  it "fails when < operator returns false" do
     lambda { 3.should be < 3 }.should fail_with("expected < 3, got 3")
   end
 
-  it "should describe itself" do
+  it "describes itself" do
     be.<(4).description.should == "be < 4"
   end
 end
 
 describe "should be <=" do
-  it "should pass when <= operator returns true" do
+  it "passes when <= operator returns true" do
     3.should be <= 4
     4.should be <= 4
   end
 
-  it "should fail when <= operator returns false" do
+  it "fails when <= operator returns false" do
     lambda { 3.should be <= 2 }.should fail_with("expected <= 2, got 3")
   end
 end
 
 describe "should be >=" do
-  it "should pass when >= operator returns true" do
+  it "passes when >= operator returns true" do
     4.should be >= 4
     5.should be >= 4
   end
 
-  it "should fail when >= operator returns false" do
+  it "fails when >= operator returns false" do
     lambda { 3.should be >= 4 }.should fail_with("expected >= 4, got 3")
   end
 end
 
 describe "should be >" do
-  it "should pass when > operator returns true" do
+  it "passes when > operator returns true" do
     5.should be > 4
   end
 
-  it "should fail when > operator returns false" do
+  it "fails when > operator returns false" do
     lambda { 3.should be > 4 }.should fail_with("expected > 4, got 3")
   end
 end
 
 describe "should be ==" do
-  it "should pass when == operator returns true" do
+  it "passes when == operator returns true" do
     5.should be == 5
   end
 
-  it "should fail when == operator returns false" do
+  it "fails when == operator returns false" do
     lambda { 3.should be == 4 }.should fail_with("expected == 4, got 3")
   end
 end
 
 describe "should be ===" do
-  it "should pass when === operator returns true" do
+  it "passes when === operator returns true" do
     Hash.should be === Hash.new
   end
 
-  it "should fail when === operator returns false" do
+  it "fails when === operator returns false" do
     lambda { Hash.should be === "not a hash" }.should fail_with(%[expected === not a hash, got Hash])
   end
 end
 
 describe "should_not with operators" do
-  it "should coach user to stop using operators with should_not" do
+  it "coaches user to stop using operators with should_not" do
     lambda {
       5.should_not be < 6
     }.should raise_error(/not only FAILED,\nit is a bit confusing./m)
@@ -356,60 +356,60 @@ describe "should_not with operators" do
 end
 
 describe "should be" do
-  it "should pass if actual is truthy" do
+  it "passes if actual is truthy" do
     true.should be
     1.should be
   end
 
-  it "should fail if actual is false" do
+  it "fails if actual is false" do
     lambda {false.should be}.should fail_with("expected false to evaluate to true")
   end
 
-  it "should fail if actual is nil" do
+  it "fails if actual is nil" do
     lambda {nil.should be}.should fail_with("expected nil to evaluate to true")
   end
 
-  it "should describe itself" do
+  it "describes itself" do
     be.description.should == "be"
   end
 end
 
 describe "should_not be" do
-  it "should pass if actual is falsy" do
+  it "passes if actual is falsy" do
     false.should_not be
     nil.should_not be
   end
 
-  it "should fail on true" do
+  it "fails on true" do
     lambda {true.should_not be}.should fail_with("expected true to evaluate to false")
   end
 end
 
 describe "should be(value)" do
-  it "should pass if actual.equal?(value)" do
+  it "passes if actual.equal?(value)" do
     5.should be(5)
   end
 
-  it "should fail if !actual.equal?(value)" do
+  it "fails if !actual.equal?(value)" do
     lambda { 5.should be(6) }.should fail_with("expected 6, got 5")
   end
 
-  it "should describe itself" do
+  it "describes itself" do
     be(5).description.should == "be 5"
   end
 end
 
 describe "should_not be(value)" do
-  it "should pass if !actual.equal?(value)" do
+  it "passes if !actual.equal?(value)" do
     5.should_not be(6)
   end
-  it "should fail if !actual.equal?(value)" do
+  it "fails if !actual.equal?(value)" do
     lambda { 5.should_not be(5) }.should fail_with("expected not 5, got 5")
   end
 end
 
 describe "'should be' with operator" do
-  it "should include 'be' in the description" do
+  it "includes 'be' in the description" do
     (be > 6).description.should =~ /be > 6/
     (be >= 6).description.should =~ /be >= 6/
     (be <= 6).description.should =~ /be <= 6/
@@ -419,7 +419,7 @@ end
 
 
 describe "arbitrary predicate with DelegateClass" do
-  it "should access methods defined in the delegating class (LH[#48])" do
+  it "accesses methods defined in the delegating class (LH[#48])" do
     pending("this fails in 1.9.2-preview3") unless RUBY_VERSION.to_s =~ /^1.8/
     require 'delegate'
     class ArrayDelegate < DelegateClass(Array)
@@ -439,12 +439,12 @@ describe "arbitrary predicate with DelegateClass" do
 end
 
 describe "be_a, be_an" do
-  it "should pass when class matches" do
+  it "passes when class matches" do
     "foobar".should be_a(String)
     [1,2,3].should be_an(Array)
   end
 
-  it "should fail when class does not match" do
+  it "fails when class does not match" do
     "foobar".should_not be_a(Hash)
     [1,2,3].should_not be_an(Integer)
   end