rspec-expectations 2.12.1 → 2.13.0

data/spec/rspec/matchers/configuration_spec.rb

@@ -5,8 +5,8 @@ module RSpec
   module Matchers
     describe "RSpec::Matchers.configuration" do
       it 'returns a memoized configuration instance' do
-        RSpec::Matchers.configuration.should be_a(RSpec::Matchers::Configuration)
-        RSpec::Matchers.configuration.should be(RSpec::Matchers.configuration)
+        expect(RSpec::Matchers.configuration).to be_a(RSpec::Matchers::Configuration)
+        expect(RSpec::Matchers.configuration).to be(RSpec::Matchers.configuration)
       end
     end
 
@@ -41,7 +41,7 @@ module RSpec
         end
       end
 
-      context 'on an interpreter that does not provide BasicObject', :unless => defined?(::BasicObject) do
+      context 'on an interpreter that does not provide BasicObject', :uses_should, :unless => defined?(::BasicObject) do
         before { RSpec::Expectations::Syntax.disable_should(Delegator) }
 
         let(:klass) do
@@ -72,23 +72,16 @@ module RSpec
         # it could leave things in a "broken" state where tons of other examples fail.
         if RUBY_PLATFORM == "java"
           def sandboxed
+            orig_syntax = RSpec::Matchers.configuration.syntax
             yield
           ensure
-            configure_syntax([:should, :expect])
+            configure_syntax(orig_syntax)
           end
         else
           include InSubProcess
           alias sandboxed in_sub_process
         end
 
-        it 'is configured to :should and :expect by default' do
-          configured_syntax.should eq([:should, :expect])
-
-          3.should eq(3)
-          3.should_not eq(4)
-          expect(3).to eq(3)
-        end
-
         it 'can limit the syntax to :should' do
           sandboxed do
             configure_syntax :should
@@ -102,9 +95,12 @@ module RSpec
 
         it 'is a no-op when configured to :should twice' do
           sandboxed do
-            ::Kernel.stub(:method_added).and_raise("no methods should be added here")
-
             configure_syntax :should
+
+            Expectations::Syntax.default_should_host.
+                                 stub(:method_added).
+                                 and_raise("no methods should be added here")
+
             configure_syntax :should
           end
         end
@@ -227,8 +223,16 @@ module RSpec
           end
         end
       end
-    end
 
+      it 'enables both syntaxes by default' do
+        # This is kinda a hack, but since we want to enforce use of
+        # the expect syntax within our specs here, we have modified the
+        # config setting, which makes it hard to get at the original
+        # default value. in spec_helper.rb we store the default value
+        # in $default_expectation_syntax so we can use it here.
+        expect($default_expectation_syntax).to match_array([:expect, :should])
+      end
+    end
   end
 end
 

data/spec/rspec/matchers/cover_spec.rb

@@ -1,67 +1,67 @@
 require 'spec_helper'
 
 if (1..2).respond_to?(:cover?)
-  describe "should cover(expected)" do
+  describe "expect(...).to cover(expected)" do
     it_behaves_like "an RSpec matcher", :valid_value => (1..10), :invalid_value => (20..30) do
       let(:matcher) { cover(5) }
     end
 
     context "for a range target" do
       it "passes if target covers expected" do
-        (1..10).should cover(5)
+        expect((1..10)).to cover(5)
       end
 
       it "fails if target does not cover expected" do
-        lambda {
-          (1..10).should cover(11)
-        }.should fail_with("expected 1..10 to cover 11")
+        expect {
+          expect((1..10)).to cover(11)
+        }.to fail_with("expected 1..10 to cover 11")
       end
     end
   end
 
-  describe "should cover(with, multiple, args)" do
+  describe "expect(...).to cover(with, multiple, args)" do
     context "for a range target" do
       it "passes if target covers all items" do
-        (1..10).should cover(4, 6)
+        expect((1..10)).to cover(4, 6)
       end
 
       it "fails if target does not cover any one of the items" do
-        lambda {
-          (1..10).should cover(4, 6, 11)
-        }.should fail_with("expected 1..10 to cover 4, 6, and 11")
+        expect {
+          expect((1..10)).to cover(4, 6, 11)
+        }.to fail_with("expected 1..10 to cover 4, 6, and 11")
       end
     end
   end
 
-  describe "should_not cover(expected)" do
+  describe "expect(...).not_to cover(expected)" do
     context "for a range target" do
       it "passes if target does not cover expected" do
-        (1..10).should_not cover(11)
+        expect((1..10)).not_to cover(11)
       end
 
       it "fails if target covers expected" do
-        lambda {
-          (1..10).should_not cover(5)
-        }.should fail_with("expected 1..10 not to cover 5")
+        expect {
+          expect((1..10)).not_to cover(5)
+        }.to fail_with("expected 1..10 not to cover 5")
       end
     end
   end
 
-  describe "should_not cover(with, multiple, args)" do
+  describe "expect(...).not_to cover(with, multiple, args)" do
     context "for a range target" do
       it "passes if the target does not cover any of the expected" do
-        (1..10).should_not cover(11, 12, 13)
+        expect((1..10)).not_to cover(11, 12, 13)
       end
 
       it "fails if the target covers all of the expected" do
         expect {
-          (1..10).should_not cover(4, 6)
+          expect((1..10)).not_to cover(4, 6)
         }.to fail_with("expected 1..10 not to cover 4 and 6")
       end
 
       it "fails if the target covers some (but not all) of the expected" do
         expect {
-          (1..10).should_not cover(5, 11)
+          expect((1..10)).not_to cover(5, 11)
         }.to fail_with("expected 1..10 not to cover 5 and 11")
       end
     end

data/spec/rspec/matchers/description_generation_spec.rb

@@ -5,151 +5,151 @@ describe "Matchers should be able to generate their own descriptions" do
     RSpec::Matchers.clear_generated_description
   end
 
-  it "should eq expected" do
-    "this".should eq "this"
-    RSpec::Matchers.generated_description.should eq "should eq \"this\""
+  it "expect(...).to eq expected" do
+    expect("this").to eq "this"
+    expect(RSpec::Matchers.generated_description).to eq "should eq \"this\""
   end
 
-  it "should not eq expected" do
-    "this".should_not eq "that"
-    RSpec::Matchers.generated_description.should eq "should not eq \"that\""
+  it "expect(...).to not eq expected" do
+    expect("this").not_to eq "that"
+    expect(RSpec::Matchers.generated_description).to eq "should not eq \"that\""
   end
 
-  it "should be empty (arbitrary predicate)" do
-    [].should be_empty
-    RSpec::Matchers.generated_description.should eq "should be empty"
+  it "expect(...).to be empty (arbitrary predicate)" do
+    expect([]).to be_empty
+    expect(RSpec::Matchers.generated_description).to eq "should be empty"
   end
 
-  it "should not be empty (arbitrary predicate)" do
-    [1].should_not be_empty
-    RSpec::Matchers.generated_description.should eq "should not be empty"
+  it "expect(...).to not be empty (arbitrary predicate)" do
+    expect([1]).not_to be_empty
+    expect(RSpec::Matchers.generated_description).to eq "should not be empty"
   end
 
-  it "should be true" do
-    true.should be_true
-    RSpec::Matchers.generated_description.should eq "should be true"
+  it "expect(...).to be true" do
+    expect(true).to be_true
+    expect(RSpec::Matchers.generated_description).to eq "should be true"
   end
 
-  it "should be false" do
-    false.should be_false
-    RSpec::Matchers.generated_description.should eq "should be false"
+  it "expect(...).to be false" do
+    expect(false).to be_false
+    expect(RSpec::Matchers.generated_description).to eq "should be false"
   end
 
-  it "should be nil" do
-    nil.should be_nil
-    RSpec::Matchers.generated_description.should eq "should be nil"
+  it "expect(...).to be nil" do
+    expect(nil).to be_nil
+    expect(RSpec::Matchers.generated_description).to eq "should be nil"
   end
 
-  it "should be > n" do
-    5.should be > 3
-    RSpec::Matchers.generated_description.should eq "should be > 3"
+  it "expect(...).to be > n" do
+    expect(5).to be > 3
+    expect(RSpec::Matchers.generated_description).to eq "should be > 3"
   end
 
-  it "should be predicate arg1, arg2 and arg3" do
-    5.0.should be_between(0,10)
-    RSpec::Matchers.generated_description.should eq "should be between 0 and 10"
+  it "expect(...).to be predicate arg1, arg2 and arg3" do
+    expect(5.0).to be_between(0,10)
+    expect(RSpec::Matchers.generated_description).to eq "should be between 0 and 10"
   end
 
-  it "should equal" do
+  it "expect(...).to equal" do
     expected = "expected"
-    expected.should equal(expected)
-    RSpec::Matchers.generated_description.should eq "should equal \"expected\""
+    expect(expected).to equal(expected)
+    expect(RSpec::Matchers.generated_description).to eq "should equal \"expected\""
   end
 
-  it "should_not equal" do
-    5.should_not equal(37)
-    RSpec::Matchers.generated_description.should eq "should not equal 37"
+  it "expect(...).not_to equal" do
+    expect(5).not_to equal(37)
+    expect(RSpec::Matchers.generated_description).to eq "should not equal 37"
   end
 
-  it "should eql" do
-    "string".should eql("string")
-    RSpec::Matchers.generated_description.should eq "should eql \"string\""
+  it "expect(...).to eql" do
+    expect("string").to eql("string")
+    expect(RSpec::Matchers.generated_description).to eq "should eql \"string\""
   end
 
-  it "should not eql" do
-    "a".should_not eql(:a)
-    RSpec::Matchers.generated_description.should eq "should not eql :a"
+  it "expect(...).not_to eql" do
+    expect("a").not_to eql(:a)
+    expect(RSpec::Matchers.generated_description).to eq "should not eql :a"
   end
 
-  it "should have_key" do
-    {:a => "a"}.should have_key(:a)
-    RSpec::Matchers.generated_description.should eq "should have key :a"
+  it "expect(...).to have_key" do
+    expect({:a => "a"}).to have_key(:a)
+    expect(RSpec::Matchers.generated_description).to eq "should have key :a"
   end
 
-  it "should have_some_method" do
+  it "expect(...).to have_some_method" do
     object = Object.new
     def object.has_eyes_closed?; true; end
 
-    object.should have_eyes_closed
-    RSpec::Matchers.generated_description.should eq 'should have eyes closed'
+    expect(object).to have_eyes_closed
+    expect(RSpec::Matchers.generated_description).to eq 'should have eyes closed'
   end
 
-  it "should have_some_method(args*)" do
+  it "expect(...).to have_some_method(args*)" do
     object = Object.new
     def object.has_taste_for?(*args); true; end
 
-    object.should have_taste_for("wine", "cheese")
-    RSpec::Matchers.generated_description.should eq 'should have taste for "wine", "cheese"'
+    expect(object).to have_taste_for("wine", "cheese")
+    expect(RSpec::Matchers.generated_description).to eq 'should have taste for "wine", "cheese"'
   end
 
-  it "should have n items" do
-    team.should have(3).players
-    RSpec::Matchers.generated_description.should eq "should have 3 players"
+  it "expect(...).to have n items" do
+    expect(team).to have(3).players
+    expect(RSpec::Matchers.generated_description).to eq "should have 3 players"
   end
 
-  it "should have at least n items" do
-    team.should have_at_least(2).players
-    RSpec::Matchers.generated_description.should eq "should have at least 2 players"
+  it "expect(...).to have at least n items" do
+    expect(team).to have_at_least(2).players
+    expect(RSpec::Matchers.generated_description).to eq "should have at least 2 players"
   end
 
-  it "should have at most n items" do
-    team.should have_at_most(4).players
-    RSpec::Matchers.generated_description.should eq "should have at most 4 players"
+  it "expect(...).to have at most n items" do
+    expect(team).to have_at_most(4).players
+    expect(RSpec::Matchers.generated_description).to eq "should have at most 4 players"
   end
 
-  it "should include" do
-    [1,2,3].should include(3)
-    RSpec::Matchers.generated_description.should eq "should include 3"
+  it "expect(...).to include" do
+    expect([1,2,3]).to include(3)
+    expect(RSpec::Matchers.generated_description).to eq "should include 3"
   end
 
-  it "array.should =~ [1,2,3]" do
-    [1,2,3].should =~ [1,2,3]
-    RSpec::Matchers.generated_description.should eq "should contain exactly 1, 2 and 3"
+  it "expect(array).not_to match_array [1,2,3]" do
+    expect([1,2,3]).to match_array [1,2,3]
+    expect(RSpec::Matchers.generated_description).to eq "should contain exactly 1, 2 and 3"
   end
 
-  it "should match" do
-    "this string".should match(/this string/)
-    RSpec::Matchers.generated_description.should eq "should match /this string/"
+  it "expect(...).to match" do
+    expect("this string").to match(/this string/)
+    expect(RSpec::Matchers.generated_description).to eq "should match /this string/"
   end
 
-  it "should raise_error" do
-    lambda { raise }.should raise_error
-    RSpec::Matchers.generated_description.should eq "should raise Exception"
+  it "expect(...).to raise_error" do
+    expect { raise }.to raise_error
+    expect(RSpec::Matchers.generated_description).to eq "should raise Exception"
   end
 
-  it "should raise_error with type" do
-    lambda { raise }.should raise_error(RuntimeError)
-    RSpec::Matchers.generated_description.should eq "should raise RuntimeError"
+  it "expect(...).to raise_error with type" do
+    expect { raise }.to raise_error(RuntimeError)
+    expect(RSpec::Matchers.generated_description).to eq "should raise RuntimeError"
   end
 
-  it "should raise_error with type and message" do
-    lambda { raise "there was an error" }.should raise_error(RuntimeError, "there was an error")
-    RSpec::Matchers.generated_description.should eq "should raise RuntimeError with \"there was an error\""
+  it "expect(...).to raise_error with type and message" do
+    expect { raise "there was an error" }.to raise_error(RuntimeError, "there was an error")
+    expect(RSpec::Matchers.generated_description).to eq "should raise RuntimeError with \"there was an error\""
   end
 
-  it "should respond_to" do
-    [].should respond_to(:insert)
-    RSpec::Matchers.generated_description.should eq "should respond to #insert"
+  it "expect(...).to respond_to" do
+    expect([]).to respond_to(:insert)
+    expect(RSpec::Matchers.generated_description).to eq "should respond to #insert"
   end
 
-  it "should throw symbol" do
-    lambda { throw :what_a_mess }.should throw_symbol
-    RSpec::Matchers.generated_description.should eq "should throw a Symbol"
+  it "expect(...).to throw symbol" do
+    expect { throw :what_a_mess }.to throw_symbol
+    expect(RSpec::Matchers.generated_description).to eq "should throw a Symbol"
   end
 
-  it "should throw symbol (with named symbol)" do
-    lambda { throw :what_a_mess }.should throw_symbol(:what_a_mess)
-    RSpec::Matchers.generated_description.should eq "should throw :what_a_mess"
+  it "expect(...).to throw symbol (with named symbol)" do
+    expect { throw :what_a_mess }.to throw_symbol(:what_a_mess)
+    expect(RSpec::Matchers.generated_description).to eq "should throw :what_a_mess"
   end
 
   def team
@@ -170,7 +170,7 @@ describe "a Matcher with no description" do
   end
 
   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
+    expect(5).to matcher
+    expect(RSpec::Matchers.generated_description).to match /When you call.*description method/m
   end
 end

data/spec/rspec/matchers/dsl_spec.rb

@@ -15,15 +15,15 @@ describe "a matcher defined using the matcher DSL" do
     end
 
     RSpec::Matchers.define :be_well do
-      match { |actual| actual.should be_ok }
+      match { |actual| expect(actual).to be_ok }
     end
 
-    ok.should be_well
+    expect(ok).to be_well
   end
 
   it "has access to methods available in the scope of the example" do
     RSpec::Matchers::define(:matcher_a) {}
-    matcher_a.question?.should eq(:answer)
+    expect(matcher_a.question?).to eq(:answer)
   end
 
   it "raises when method is missing from local scope as well as matcher" do
@@ -39,19 +39,19 @@ describe "a matcher defined using the matcher DSL" do
       end
     end
 
-    3.should be_just_like(3)
-    4.should be_just_like(4)
+    expect(3).to be_just_like(3)
+    expect(4).to be_just_like(4)
   end
 
   describe "#respond_to?" do
     it "returns true for methods in example scope" do
       RSpec::Matchers::define(:matcher_c) {}
-      matcher_c.should respond_to(:question?)
+      expect(matcher_c).to respond_to(:question?)
     end
 
     it "returns false for methods not defined in matcher or example scope" do
       RSpec::Matchers::define(:matcher_d) {}
-      matcher_d.should_not respond_to(:i_dont_exist)
+      expect(matcher_d).not_to respond_to(:i_dont_exist)
     end
   end
 end