rspec-expectations 2.12.1 → 2.13.0

data/spec/rspec/matchers/base_matcher_spec.rb

@@ -1,3 +1,5 @@
+require 'spec_helper'
+
 module RSpec::Matchers::BuiltIn
   describe BaseMatcher do
     describe "#match_unless_raises" do
@@ -6,21 +8,21 @@ module RSpec::Matchers::BuiltIn
       end
 
       it "returns true if there are no errors" do
-        matcher.match_unless_raises {}.should be_true
+        expect(matcher.match_unless_raises {}).to be_true
       end
 
       it "returns false if there is an error" do
-        matcher.match_unless_raises { raise }.should be_false
+        expect(matcher.match_unless_raises { raise }).to be_false
       end
 
       it "returns false if the only submitted error is raised" do
-        matcher.match_unless_raises(RuntimeError){ raise "foo" }.should be_false
+        expect(matcher.match_unless_raises(RuntimeError){ raise "foo" }).to be_false
       end
 
       it "returns false if any of several errors submitted is raised" do
-        matcher.match_unless_raises(RuntimeError, ArgumentError, NameError) { raise "foo" }.should be_false
-        matcher.match_unless_raises(RuntimeError, ArgumentError, NameError) { raise ArgumentError.new('') }.should be_false
-        matcher.match_unless_raises(RuntimeError, ArgumentError, NameError) { raise NameError.new('') }.should be_false
+        expect(matcher.match_unless_raises(RuntimeError, ArgumentError, NameError) { raise "foo" }).to be_false
+        expect(matcher.match_unless_raises(RuntimeError, ArgumentError, NameError) { raise ArgumentError.new('') }).to be_false
+        expect(matcher.match_unless_raises(RuntimeError, ArgumentError, NameError) { raise NameError.new('') }).to be_false
       end
 
       it "re-raises any error other than one of those specified" do
@@ -31,8 +33,8 @@ module RSpec::Matchers::BuiltIn
 
       it "stores the rescued exception for use in messages" do
         matcher.match_unless_raises(RuntimeError){ raise "foo" }
-        matcher.rescued_exception.should be_a(RuntimeError)
-        matcher.rescued_exception.message.should eq("foo")
+        expect(matcher.rescued_exception).to be_a(RuntimeError)
+        expect(matcher.rescued_exception.message).to eq("foo")
       end
 
     end
@@ -49,11 +51,11 @@ module RSpec::Matchers::BuiltIn
           end
         end
 
-        matcher.new(3).matches?(3).should be_true
-        matcher.new(3).should eq(3)
+        expect(matcher.new(3).matches?(3)).to be_true
+        expect(matcher.new(3)).to eq(3)
 
-        matcher.new(3).matches?(4).should be_false
-        matcher.new(3).should_not eq(4)
+        expect(matcher.new(3).matches?(4)).to be_false
+        expect(matcher.new(3)).not_to eq(4)
       end
     end
   end

data/spec/rspec/matchers/be_close_spec.rb

@@ -2,7 +2,7 @@ require 'spec_helper'
 
 module RSpec
   module Matchers
-    describe "[actual.should] be_close(expected, delta)" do
+    describe "expect(actual).to be_close(expected, delta)" do
       before(:each) do
         RSpec.stub(:warn)
       end

data/spec/rspec/matchers/be_instance_of_spec.rb

@@ -3,27 +3,31 @@ require 'spec_helper'
 module RSpec
   module Matchers
     [:be_an_instance_of, :be_instance_of].each do |method|
-      describe "actual.should #{method}(expected)" do
+      describe "expect(actual).to #{method}(expected)" do
         it_behaves_like "an RSpec matcher", :valid_value => 5, :invalid_value => "a" do
           let(:matcher) { send(method, Fixnum) }
         end
 
         it "passes if actual is instance of expected class" do
-          5.should send(method, Fixnum)
+          expect(5).to send(method, Fixnum)
         end
 
         it "fails if actual is instance of subclass of expected class" do
-          lambda { 5.should send(method, Numeric) }.should fail_with(%Q{expected 5 to be an instance of Numeric})
+          expect {
+            expect(5).to send(method, Numeric)
+          }.to fail_with(%Q{expected 5 to be an instance of Numeric})
         end
 
         it "fails with failure message for should unless actual is instance of expected class" do
-          lambda { "foo".should send(method, Array) }.should fail_with(%Q{expected "foo" to be an instance of Array})
+          expect {
+            expect("foo").to send(method, Array)
+          }.to fail_with(%Q{expected "foo" to be an instance of Array})
         end
 
         it "provides a description" do
           matcher = be_an_instance_of(Fixnum)
           matcher.matches?(Numeric)
-          matcher.description.should == "be an instance of Fixnum"
+          expect(matcher.description).to eq "be an instance of Fixnum"
         end
 
         context "when expected provides an expanded inspect, e.g. AR::Base" do
@@ -39,15 +43,17 @@ module RSpec
 
           it "provides a description including only the class name" do
             matcher = be_an_instance_of(User)
-            matcher.description.should == "be an instance of User"
+            expect(matcher.description).to eq "be an instance of User"
           end
         end
       end
 
-      describe "actual.should_not #{method}(expected)" do
+      describe "expect(actual).not_to #{method}(expected)" do
 
         it "fails with failure message for should_not if actual is instance of expected class" do
-          lambda { "foo".should_not send(method, String) }.should fail_with(%Q{expected "foo" not to be an instance of String})
+          expect {
+            expect("foo").not_to send(method, String)
+          }.to fail_with(%Q{expected "foo" not to be an instance of String})
         end
 
       end

data/spec/rspec/matchers/be_kind_of_spec.rb

@@ -3,33 +3,37 @@ require 'spec_helper'
 module RSpec
   module Matchers
     [:be_a_kind_of, :be_kind_of].each do |method|
-      describe "actual.should #{method}(expected)" do
+      describe "expect(actual).to #{method}(expected)" do
         it_behaves_like "an RSpec matcher", :valid_value => 5, :invalid_value => "a" do
           let(:matcher) { send(method, Fixnum) }
         end
 
         it "passes if actual is instance of expected class" do
-          5.should send(method, Fixnum)
+          expect(5).to send(method, Fixnum)
         end
 
         it "passes if actual is instance of subclass of expected class" do
-          5.should send(method, Numeric)
+          expect(5).to send(method, Numeric)
         end
 
         it "fails with failure message for should unless actual is kind of expected class" do
-          lambda { "foo".should send(method, Array) }.should fail_with(%Q{expected "foo" to be a kind of Array})
+          expect {
+            expect("foo").to send(method, Array)
+          }.to fail_with(%Q{expected "foo" to be a kind of Array})
         end
 
         it "provides a description" do
           matcher = be_a_kind_of(String)
           matcher.matches?("this")
-          matcher.description.should == "be a kind of String"
+          expect(matcher.description).to eq "be a kind of String"
         end
       end
-      
-      describe "actual.should_not #{method}(expected)" do
+
+      describe "expect(actual).not_to #{method}(expected)" do
         it "fails with failure message for should_not if actual is kind of expected class" do
-          lambda { "foo".should_not send(method, String) }.should fail_with(%Q{expected "foo" not to be a kind of String})
+          expect {
+            expect("foo").not_to send(method, String)
+          }.to fail_with(%Q{expected "foo" not to be a kind of String})
         end
       end
     end

data/spec/rspec/matchers/be_spec.rb

@@ -1,129 +1,129 @@
 require 'spec_helper'
 
-describe "should be_predicate" do
+describe "expect(...).to be_predicate" do
   it "passes when actual returns true for :predicate?" do
     actual = stub("actual", :happy? => true)
-    actual.should be_happy
+    expect(actual).to be_happy
   end
 
   it "passes when actual returns true for :predicates? (present tense)" do
     actual = stub("actual", :exists? => true, :exist? => true)
-    actual.should be_exist
+    expect(actual).to be_exist
   end
 
   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")
+    expect {
+      expect(actual).to be_happy
+    }.to fail_with("expected happy? to return true, got false")
   end
 
   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")
+    expect {
+      expect(actual).to be_happy
+    }.to fail_with("expected happy? to return true, got nil")
   end
 
   it "fails when actual does not respond to :predicate?" do
-    lambda {
-      Object.new.should be_happy
-    }.should raise_error(NameError, /happy\?/)
+    expect {
+      expect(Object.new).to be_happy
+    }.to raise_error(NameError, /happy\?/)
   end
 
   it "fails on error other than NameError" do
     actual = stub("actual")
     actual.should_receive(:foo?).and_raise("aaaah")
-    lambda {
-      actual.should be_foo
-    }.should raise_error(/aaaah/)
+    expect {
+      expect(actual).to be_foo
+    }.to raise_error(/aaaah/)
   end
 
   it "fails on error other than NameError (with the present tense predicate)" do
     actual = Object.new
     actual.should_receive(:foos?).and_raise("aaaah")
-    lambda {
-      actual.should be_foo
-    }.should raise_error(/aaaah/)
+    expect {
+      expect(actual).to be_foo
+    }.to raise_error(/aaaah/)
   end
 end
 
-describe "should_not be_predicate" do
+describe "expect(...).not_to be_predicate" do
   it "passes when actual returns false for :sym?" do
     actual = stub("actual", :happy? => false)
-    actual.should_not be_happy
+    expect(actual).not_to be_happy
   end
 
   it "passes when actual returns nil for :sym?" do
     actual = stub("actual", :happy? => nil)
-    actual.should_not be_happy
+    expect(actual).not_to be_happy
   end
 
   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")
+    expect {
+      expect(actual).not_to be_happy
+    }.to fail_with("expected happy? to return false, got true")
   end
 
   it "fails when actual does not respond to :sym?" do
-    lambda {
-      Object.new.should_not be_happy
-    }.should raise_error(NameError)
+    expect {
+      expect(Object.new).not_to be_happy
+    }.to raise_error(NameError)
   end
 end
 
-describe "should be_predicate(*args)" do
+describe "expect(...).to be_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)
+    expect(actual).to be_older_than(3)
   end
 
   it "fails when actual returns false for :predicate?(*args)" do
     actual = mock("actual")
     actual.should_receive(:older_than?).with(3).and_return(false)
-    lambda {
-      actual.should be_older_than(3)
-    }.should fail_with("expected older_than?(3) to return true, got false")
+    expect {
+      expect(actual).to be_older_than(3)
+    }.to fail_with("expected older_than?(3) to return true, got false")
   end
 
   it "fails when actual does not respond to :predicate?" do
-    lambda {
-      Object.new.should be_older_than(3)
-    }.should raise_error(NameError)
+    expect {
+      expect(Object.new).to be_older_than(3)
+    }.to raise_error(NameError)
   end
 end
 
-describe "should_not be_predicate(*args)" do
+describe "expect(...).not_to be_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)
+    expect(actual).not_to be_older_than(3)
   end
 
   it "fails when actual returns true for :predicate?(*args)" do
     actual = mock("actual")
     actual.should_receive(:older_than?).with(3).and_return(true)
-    lambda {
-      actual.should_not be_older_than(3)
-    }.should fail_with("expected older_than?(3) to return false, got true")
+    expect {
+      expect(actual).not_to be_older_than(3)
+    }.to fail_with("expected older_than?(3) to return false, got true")
   end
 
   it "fails when actual does not respond to :predicate?" do
-    lambda {
-      Object.new.should_not be_older_than(3)
-    }.should raise_error(NameError)
+    expect {
+      expect(Object.new).not_to be_older_than(3)
+    }.to raise_error(NameError)
   end
 end
 
-describe "should be_predicate(&block)" do
+describe "expect(...).to be_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
     delegate.should_receive(:check_happy).and_return(true)
-    actual.should be_happy { delegate.check_happy }
+    expect(actual).to be_happy { delegate.check_happy }
   end
 
   it "fails when actual returns false for :predicate?(&block)" do
@@ -131,26 +131,26 @@ describe "should be_predicate(&block)" do
     delegate = mock("delegate")
     actual.should_receive(:happy?).and_yield
     delegate.should_receive(:check_happy).and_return(false)
-    lambda {
-      actual.should be_happy { delegate.check_happy }
-    }.should fail_with("expected happy? to return true, got false")
+    expect {
+      expect(actual).to be_happy { delegate.check_happy }
+    }.to fail_with("expected happy? to return true, got false")
   end
 
   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 }
-    }.should raise_error(NameError)
+    expect {
+      expect(Object.new).to be_happy { delegate.check_happy }
+    }.to raise_error(NameError)
   end
 end
 
-describe "should_not be_predicate(&block)" do
+describe "expect(...).not_to be_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
     delegate.should_receive(:check_happy).and_return(false)
-    actual.should_not be_happy { delegate.check_happy }
+    expect(actual).not_to be_happy { delegate.check_happy }
   end
 
   it "fails when actual returns true for :predicate?(&block)" do
@@ -158,26 +158,26 @@ describe "should_not be_predicate(&block)" do
     delegate = mock("delegate")
     actual.should_receive(:happy?).and_yield
     delegate.should_receive(:check_happy).and_return(true)
-    lambda {
-      actual.should_not be_happy { delegate.check_happy }
-    }.should fail_with("expected happy? to return false, got true")
+    expect {
+      expect(actual).not_to be_happy { delegate.check_happy }
+    }.to fail_with("expected happy? to return false, got true")
   end
 
   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 }
-    }.should raise_error(NameError)
+    expect {
+      expect(Object.new).not_to be_happy { delegate.check_happy }
+    }.to raise_error(NameError)
   end
 end
 
-describe "should be_predicate(*args, &block)" do
+describe "expect(...).to be_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)
     delegate.should_receive(:check_older_than).with(3).and_return(true)
-    actual.should be_older_than(3) { |age| delegate.check_older_than(age) }
+    expect(actual).to be_older_than(3) { |age| delegate.check_older_than(age) }
   end
 
   it "fails when actual returns false for :predicate?(*args, &block)" do
@@ -185,26 +185,26 @@ describe "should be_predicate(*args, &block)" do
     delegate = mock("delegate")
     actual.should_receive(:older_than?).with(3).and_yield(3)
     delegate.should_receive(:check_older_than).with(3).and_return(false)
-    lambda {
-      actual.should be_older_than(3) { |age| delegate.check_older_than(age) }
-    }.should fail_with("expected older_than?(3) to return true, got false")
+    expect {
+      expect(actual).to be_older_than(3) { |age| delegate.check_older_than(age) }
+    }.to fail_with("expected older_than?(3) to return true, got false")
   end
 
   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) }
-    }.should raise_error(NameError)
+    expect {
+      expect(Object.new).to be_older_than(3) { |age| delegate.check_older_than(age) }
+    }.to raise_error(NameError)
   end
 end
 
-describe "should_not be_predicate(*args, &block)" do
+describe "expect(...).not_to be_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)
     delegate.should_receive(:check_older_than).with(3).and_return(false)
-    actual.should_not be_older_than(3) { |age| delegate.check_older_than(age) }
+    expect(actual).not_to be_older_than(3) { |age| delegate.check_older_than(age) }
   end
 
   it "fails when actual returns true for :predicate?(*args, &block)" do
@@ -212,199 +212,263 @@ describe "should_not be_predicate(*args, &block)" do
     delegate = mock("delegate")
     actual.should_receive(:older_than?).with(3).and_yield(3)
     delegate.should_receive(:check_older_than).with(3).and_return(true)
-    lambda {
-      actual.should_not be_older_than(3) { |age| delegate.check_older_than(age) }
-    }.should fail_with("expected older_than?(3) to return false, got true")
+    expect {
+      expect(actual).not_to be_older_than(3) { |age| delegate.check_older_than(age) }
+    }.to fail_with("expected older_than?(3) to return false, got true")
   end
 
   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) }
-    }.should raise_error(NameError)
+    expect {
+      expect(Object.new).not_to be_older_than(3) { |age| delegate.check_older_than(age) }
+    }.to raise_error(NameError)
   end
 end
 
-describe "should be_true" do
+describe "expect(...).to be_true" do
   it "passes when actual equal?(true)" do
-    true.should be_true
+    expect(true).to be_true
   end
 
   it "passes when actual is 1" do
-    1.should be_true
+    expect(1).to be_true
   end
 
   it "fails when actual equal?(false)" do
-    lambda {
-      false.should be_true
-    }.should fail_with("expected: true value\n     got: false")
+    expect {
+      expect(false).to be_true
+    }.to fail_with("expected: true value\n     got: false")
   end
 end
 
-describe "should be_false" do
+describe "expect(...).to be_false" do
   it "passes when actual equal?(false)" do
-    false.should be_false
+    expect(false).to be_false
   end
 
   it "passes when actual equal?(nil)" do
-    nil.should be_false
+    expect(nil).to be_false
   end
 
   it "fails when actual equal?(true)" do
-    lambda {
-      true.should be_false
-    }.should fail_with("expected: false value\n     got: true")
+    expect {
+      expect(true).to be_false
+    }.to fail_with("expected: false value\n     got: true")
   end
 end
 
-describe "should be_nil" do
+describe "expect(...).to be_nil" do
   it "passes when actual is nil" do
-    nil.should be_nil
+    expect(nil).to be_nil
   end
 
   it "fails when actual is not nil" do
-    lambda {
-      :not_nil.should be_nil
-    }.should fail_with(/^expected: nil/)
+    expect {
+      expect(:not_nil).to be_nil
+    }.to fail_with(/^expected: nil/)
   end
 end
 
-describe "should_not be_nil" do
+describe "expect(...).not_to be_nil" do
   it "passes when actual is not nil" do
-    :not_nil.should_not be_nil
+    expect(:not_nil).not_to be_nil
   end
 
   it "fails when actual is nil" do
-    lambda {
-      nil.should_not be_nil
-    }.should fail_with(/^expected: not nil/)
+    expect {
+      expect(nil).not_to be_nil
+    }.to fail_with(/^expected: not nil/)
   end
 end
 
-describe "should be <" do
+describe "expect(...).to be <" do
   it "passes when < operator returns true" do
-    3.should be < 4
+    expect(3).to be < 4
   end
 
   it "fails when < operator returns false" do
-    lambda { 3.should be < 3 }.should fail_with("expected: < 3\n     got:   3")
+    expect {
+      expect(3).to be < 3
+    }.to fail_with("expected: < 3\n     got:   3")
   end
 
   it "describes itself" do
-    be.<(4).description.should == "be < 4"
+    expect(be.<(4).description).to eq "be < 4"
   end
 end
 
-describe "should be <=" do
+describe "expect(...).to be <=" do
   it "passes when <= operator returns true" do
-    3.should be <= 4
-    4.should be <= 4
+    expect(3).to be <= 4
+    expect(4).to be <= 4
   end
 
   it "fails when <= operator returns false" do
-    lambda { 3.should be <= 2 }.should fail_with("expected: <= 2\n     got:    3")
+    expect {
+      expect(3).to be <= 2
+    }.to fail_with("expected: <= 2\n     got:    3")
   end
 end
 
-describe "should be >=" do
+describe "expect(...).to be >=" do
   it "passes when >= operator returns true" do
-    4.should be >= 4
-    5.should be >= 4
+    expect(4).to be >= 4
+    expect(5).to be >= 4
   end
 
   it "fails when >= operator returns false" do
-    lambda { 3.should be >= 4 }.should fail_with("expected: >= 4\n     got:    3")
+    expect {
+      expect(3).to be >= 4
+    }.to fail_with("expected: >= 4\n     got:    3")
   end
 end
 
-describe "should be >" do
+describe "expect(...).to be >" do
   it "passes when > operator returns true" do
-    5.should be > 4
+    expect(5).to be > 4
   end
 
   it "fails when > operator returns false" do
-    lambda { 3.should be > 4 }.should fail_with("expected: > 4\n     got:   3")
+    expect {
+      expect(3).to be > 4
+    }.to fail_with("expected: > 4\n     got:   3")
   end
 end
 
-describe "should be ==" do
+describe "expect(...).to be ==" do
   it "passes when == operator returns true" do
-    5.should be == 5
+    expect(5).to be == 5
   end
 
   it "fails when == operator returns false" do
-    lambda { 3.should be == 4 }.should fail_with("expected: == 4\n     got:    3")
+    expect {
+      expect(3).to be == 4
+    }.to fail_with("expected: == 4\n     got:    3")
+  end
+
+  it 'works when the target overrides `#send`' do
+    klass = Struct.new(:message) do
+      def send
+        :message_sent
+      end
+    end
+
+    msg_1 = klass.new("hello")
+    msg_2 = klass.new("hello")
+    expect(msg_1).to be == msg_2
+  end
+end
+
+describe "expect(...).to be =~" do
+  it "passes when =~ operator returns true" do
+    expect("a string").to be =~ /str/
+  end
+
+  it "fails when =~ operator returns false" do
+    expect {
+      expect("a string").to be =~ /blah/
+    }.to fail_with(%Q|expected: =~ /blah/\n     got:    "a string"|)
+  end
+end
+
+describe "should be =~", :uses_should do
+  it "passes when =~ operator returns true" do
+    "a string".should be =~ /str/
+  end
+
+  it "fails when =~ operator returns false" do
+    expect {
+      "a string".should be =~ /blah/
+    }.to fail_with(%Q|expected: =~ /blah/\n     got:    "a string"|)
   end
 end
 
-describe "should be ===" do
+describe "expect(...).to be ===" do
   it "passes when === operator returns true" do
-    Hash.should be === Hash.new
+    expect(Hash).to be === Hash.new
   end
 
   it "fails when === operator returns false" do
-    lambda { Hash.should be === "not a hash" }.should fail_with(%[expected: === "not a hash"\n     got:     Hash])
+    expect {
+      expect(Hash).to be === "not a hash"
+    }.to fail_with(%[expected: === "not a hash"\n     got:     Hash])
+  end
+end
+
+describe "expect(...).not_to with operators" do
+  it "coaches user to stop using operators with expect().not_to" do
+    expect {
+      expect(5).not_to be < 6
+    }.to raise_error(/`expect\(actual\).not_to be < 6` not only FAILED,\nit is a bit confusing./m)
   end
 end
 
-describe "should_not with operators" do
+describe "should_not with operators", :uses_only_should 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)
+    }.should raise_error(/`actual.should_not be < 6` not only FAILED,\nit is a bit confusing./m)
   end
 end
 
-describe "should be" do
+describe "expect(...).to be" do
   it "passes if actual is truthy" do
-    true.should be
-    1.should be
+    expect(true).to be
+    expect(1).to be
   end
 
   it "fails if actual is false" do
-    lambda {false.should be}.should fail_with("expected false to evaluate to true")
+    expect {
+      expect(false).to be
+    }.to fail_with("expected false to evaluate to true")
   end
 
   it "fails if actual is nil" do
-    lambda {nil.should be}.should fail_with("expected nil to evaluate to true")
+    expect {
+      expect(nil).to be
+    }.to fail_with("expected nil to evaluate to true")
   end
 
   it "describes itself" do
-    be.description.should == "be"
+    expect(be.description).to eq "be"
   end
 end
 
-describe "should_not be" do
+describe "expect(...).not_to be" do
   it "passes if actual is falsy" do
-    false.should_not be
-    nil.should_not be
+    expect(false).not_to be
+    expect(nil).not_to be
   end
 
   it "fails on true" do
-    lambda {true.should_not be}.should fail_with("expected true to evaluate to false")
+    expect {
+      expect(true).not_to be
+    }.to fail_with("expected true to evaluate to false")
   end
 end
 
-describe "should be(value)" do
+describe "expect(...).to be(value)" do
   it "delegates to equal" do
-    self.should_receive(:equal).with(5)
-    5.should be(5)
+    matcher = equal(5)
+    self.should_receive(:equal).with(5).and_return(matcher)
+    expect(5).to be(5)
   end
 end
 
-describe "should_not be(value)" do
+describe "expect(...).not_to be(value)" do
   it "delegates to equal" do
-    self.should_receive(:equal).with(4)
-    5.should_not be(4)
+    matcher = equal(4)
+    self.should_receive(:equal).with(4).and_return(matcher)
+    expect(5).not_to be(4)
   end
 end
 
-describe "'should be' with operator" do
+describe "'expect(...).to be' with operator" 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/
-    (be < 6).description.should =~ /be < 6/
+    expect((be > 6).description).to match /be > 6/
+    expect((be >= 6).description).to match /be >= 6/
+    expect((be <= 6).description).to match /be <= 6/
+    expect((be < 6).description).to match /be < 6/
   end
 end
 
@@ -424,29 +488,29 @@ describe "arbitrary predicate with DelegateClass" do
     end
 
     delegate = ArrayDelegate.new([1,2,3,4,5,6])
-    delegate.should be_large
+    expect(delegate).to be_large
   end
 end
 
 describe "be_a, be_an" do
   it "passes when class matches" do
-    "foobar".should be_a(String)
-    [1,2,3].should be_an(Array)
+    expect("foobar").to be_a(String)
+    expect([1,2,3]).to be_an(Array)
   end
 
   it "fails when class does not match" do
-    "foobar".should_not be_a(Hash)
-    [1,2,3].should_not be_an(Integer)
+    expect("foobar").not_to be_a(Hash)
+    expect([1,2,3]).not_to be_an(Integer)
   end
 end
 
 describe "be_an_instance_of" do
   it "passes when direct class matches" do
-    5.should be_an_instance_of(Fixnum)
+    expect(5).to be_an_instance_of(Fixnum)
   end
 
   it "fails when class is higher up hierarchy" do
-    5.should_not be_an_instance_of(Numeric)
+    expect(5).not_to be_an_instance_of(Numeric)
   end
 end