rspec-expectations 2.12.1 → 2.13.0

data/spec/rspec/matchers/matchers_spec.rb

@@ -11,17 +11,23 @@ module RSpec
     end
 
     context "once required" do
+      include TestUnitIntegrationSupport
+
       it "includes itself in Test::Unit::TestCase" do
-        test_unit_case = Test::Unit::TestCase.allocate
-        sample_matchers.each do |sample_matcher|
-            test_unit_case.should respond_to(sample_matcher)
+        with_test_unit_loaded do
+          test_unit_case = Test::Unit::TestCase.allocate
+          sample_matchers.each do |sample_matcher|
+              expect(test_unit_case).to respond_to(sample_matcher)
+          end
         end
       end
 
       it "includes itself in MiniTest::Unit::TestCase", :if => defined?(MiniTest) do
-        minitest_case = MiniTest::Unit::TestCase.allocate
-        sample_matchers.each do |sample_matcher|
-            minitest_case.should respond_to(sample_matcher)
+        with_test_unit_loaded do
+          minitest_case = MiniTest::Unit::TestCase.allocate
+          sample_matchers.each do |sample_matcher|
+              expect(minitest_case).to respond_to(sample_matcher)
+          end
         end
       end
 

data/spec/rspec/matchers/method_missing_spec.rb

@@ -1,8 +1,12 @@
 require 'spec_helper'
 
 shared_examples_for "a well-behaved method_missing hook" do
+  include TestUnitIntegrationSupport
+
   it "raises a NoMethodError (and not SystemStackError) for an undefined method" do
-    expect { subject.some_undefined_method }.to raise_error(NoMethodError)
+    with_test_unit_loaded do
+      expect { subject.some_undefined_method }.to raise_error(NoMethodError)
+    end
   end
 end
 

data/spec/rspec/matchers/operator_matcher_spec.rb

@@ -1,244 +1,223 @@
 require 'spec_helper'
 
-describe "should ==" do
-  
-  it "delegates message to target" do
-    subject = "apple"
-    subject.should_receive(:==).with("apple").and_return(true)
-    subject.should == "apple"
+describe "operator matchers", :uses_should do
+  describe "should ==" do
+    it "delegates message to target" do
+      subject = "apple"
+      subject.should_receive(:==).with("apple").and_return(true)
+      subject.should == "apple"
+    end
+
+    it "returns true on success" do
+      subject = "apple"
+      (subject.should == "apple").should be_true
+    end
+
+    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"
+    end
+  end
+
+  describe "unsupported operators", :if => RUBY_VERSION.to_f == 1.9 do
+    it "raises an appropriate error for should != expected" do
+      expect {
+        "apple".should != "pear"
+      }.to raise_error(/does not support `should != expected`.  Use `should_not == expected`/)
+    end
+
+    it "raises an appropriate error for should_not != expected" do
+      expect {
+        "apple".should_not != "pear"
+      }.to raise_error(/does not support `should_not != expected`.  Use `should == expected`/)
+    end
+
+    it "raises an appropriate error for should !~ expected" do
+      expect {
+        "apple".should !~ /regex/
+      }.to raise_error(/does not support `should !~ expected`.  Use `should_not =~ expected`/)
+    end
+
+    it "raises an appropriate error for should_not !~ expected" do
+      expect {
+        "apple".should_not !~ /regex/
+      }.to raise_error(/does not support `should_not !~ expected`.  Use `should =~ expected`/)
+    end
+  end
+
+  describe "should_not ==" do
+    it "delegates message to target" do
+      subject = "orange"
+      subject.should_receive(:==).with("apple").and_return(false)
+      subject.should_not == "apple"
+    end
+
+    it "returns true on success" do
+      subject = "apple"
+      (subject.should_not == "orange").should be_false
+    end
+
+    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"
+    end
+  end
+
+  describe "should ===" do
+    it "delegates message to target" do
+      subject = "apple"
+      subject.should_receive(:===).with("apple").and_return(true)
+      subject.should === "apple"
+    end
+
+    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")
+      subject.should === "orange"
+    end
+  end
+
+  describe "should_not ===" do
+    it "delegates message to target" do
+      subject = "orange"
+      subject.should_receive(:===).with("apple").and_return(false)
+      subject.should_not === "apple"
+    end
+
+    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")
+      subject.should_not === "apple"
+    end
+  end
+
+  describe "should =~" do
+    it "delegates message to target" do
+      subject = "foo"
+      subject.should_receive(:=~).with(/oo/).and_return(true)
+      subject.should =~ /oo/
+    end
+
+    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")
+      subject.should =~ /oo/
+    end
+  end
+
+  describe "should_not =~" do
+    it "delegates message to target" do
+      subject = "fu"
+      subject.should_receive(:=~).with(/oo/).and_return(false)
+      subject.should_not =~ /oo/
+    end
+
+    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")
+      subject.should_not =~ /oo/
+    end
+  end
+
+  describe "should >" do
+    it "passes if > passes" do
+      4.should > 3
+    end
+
+    it "fails if > fails" do
+      RSpec::Expectations.should_receive(:fail_with).with(%[expected: > 5\n     got:   4], 5, 4)
+      4.should > 5
+    end
+  end
+
+  describe "should >=" do
+    it "passes if actual == expected" do
+      4.should >= 4
+    end
+
+    it "passes if actual > expected" do
+      4.should >= 3
+    end
+
+    it "fails if > fails" do
+      RSpec::Expectations.should_receive(:fail_with).with(%[expected: >= 5\n     got:    4], 5, 4)
+      4.should >= 5
+    end
+  end
+
+  describe "should <" do
+    it "passes if < passes" do
+      4.should < 5
+    end
+
+    it "fails if > fails" do
+      RSpec::Expectations.should_receive(:fail_with).with(%[expected: < 3\n     got:   4], 3, 4)
+      4.should < 3
+    end
+  end
+
+  describe "should <=" do
+    it "passes if actual == expected" do
+      4.should <= 4
+    end
+
+    it "passes if actual < expected" do
+      4.should <= 5
+    end
+
+    it "fails if > fails" do
+      RSpec::Expectations.should_receive(:fail_with).with(%[expected: <= 3\n     got:    4], 3, 4)
+      4.should <= 3
+    end
+  end
+
+  describe "OperatorMatcher registry" do
+    let(:custom_klass) { Class.new }
+    let(:custom_subklass) { Class.new(custom_klass) }
+
+    after {
+      RSpec::Matchers::OperatorMatcher.unregister(custom_klass, "=~")
+    }
+
+    it "allows operator matchers to be registered for types" do
+      RSpec::Matchers::OperatorMatcher.register(custom_klass, "=~", RSpec::Matchers::BuiltIn::Match)
+      expect(RSpec::Matchers::OperatorMatcher.get(custom_klass, "=~")).to eq(RSpec::Matchers::BuiltIn::Match)
+    end
+
+    it "considers ancestors when finding an operator matcher" do
+      RSpec::Matchers::OperatorMatcher.register(custom_klass, "=~", RSpec::Matchers::BuiltIn::Match)
+      expect(RSpec::Matchers::OperatorMatcher.get(custom_subklass, "=~")).to eq(RSpec::Matchers::BuiltIn::Match)
+    end
+
+    it "returns nil if there is no matcher registered for a type" do
+      expect(RSpec::Matchers::OperatorMatcher.get(custom_klass, "=~")).to be_nil
+    end
+  end
+
+  describe RSpec::Matchers::BuiltIn::PositiveOperatorMatcher 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
+      expect {
+        o.should == o
+      }.not_to raise_error
+    end
   end
-  
-  it "returns true on success" do
-    subject = "apple"
-    (subject.should == "apple").should be_true
-  end
-  
-  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"
-  end
-  
-end
-
-describe "unsupported operators", :if => RUBY_VERSION.to_f == 1.9 do
-  it "raises an appropriate error for should != expected" do
-    expect {
-      "apple".should != "pear"
-    }.to raise_error(/does not support `should != expected`.  Use `should_not == expected`/)
-  end
-
-  it "raises an appropriate error for should_not != expected" do
-    expect {
-      "apple".should_not != "pear"
-    }.to raise_error(/does not support `should_not != expected`.  Use `should == expected`/)
-  end
-
-  it "raises an appropriate error for should !~ expected" do
-    expect {
-      "apple".should !~ /regex/
-    }.to raise_error(/does not support `should !~ expected`.  Use `should_not =~ expected`/)
-  end
-
-  it "raises an appropriate error for should_not !~ expected" do
-    expect {
-      "apple".should_not !~ /regex/
-    }.to raise_error(/does not support `should_not !~ expected`.  Use `should =~ expected`/)
-  end
-end
-
-describe "should_not ==" do
-  
-  it "delegates message to target" do
-    subject = "orange"
-    subject.should_receive(:==).with("apple").and_return(false)
-    subject.should_not == "apple"
-  end
-  
-  it "returns true on success" do
-    subject = "apple"
-    (subject.should_not == "orange").should be_false
-  end
-
-  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"
-  end
-  
-end
-
-describe "should ===" do
-  
-  it "delegates message to target" do
-    subject = "apple"
-    subject.should_receive(:===).with("apple").and_return(true)
-    subject.should === "apple"
-  end
-  
-  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")
-    subject.should === "orange"
-  end
-  
-end
-
-describe "should_not ===" do
-  
-  it "delegates message to target" do
-    subject = "orange"
-    subject.should_receive(:===).with("apple").and_return(false)
-    subject.should_not === "apple"
-  end
-  
-  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")
-    subject.should_not === "apple"
-  end
-
-end
-
-describe "should =~" do
-  
-  it "delegates message to target" do
-    subject = "foo"
-    subject.should_receive(:=~).with(/oo/).and_return(true)
-    subject.should =~ /oo/
-  end
-  
-  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")
-    subject.should =~ /oo/
-  end
-
-end
-
-describe "should_not =~" do
-  
-  it "delegates message to target" do
-    subject = "fu"
-    subject.should_receive(:=~).with(/oo/).and_return(false)
-    subject.should_not =~ /oo/
-  end
-  
-  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")
-    subject.should_not =~ /oo/
-  end
-
-end
-
-describe "should >" do
-  
-  it "passes if > passes" do
-    4.should > 3
-  end
-
-  it "fails if > fails" do
-    RSpec::Expectations.should_receive(:fail_with).with(%[expected: > 5\n     got:   4], 5, 4)
-    4.should > 5
-  end
-
-end
-
-describe "should >=" do
-  
-  it "passes if actual == expected" do
-    4.should >= 4
-  end
-
-  it "passes if actual > expected" do
-    4.should >= 3
-  end
-
-  it "fails if > fails" do
-    RSpec::Expectations.should_receive(:fail_with).with(%[expected: >= 5\n     got:    4], 5, 4)
-    4.should >= 5
-  end
-
-end
-
-describe "should <" do
-  
-  it "passes if < passes" do
-    4.should < 5
-  end
-
-  it "fails if > fails" do
-    RSpec::Expectations.should_receive(:fail_with).with(%[expected: < 3\n     got:   4], 3, 4)
-    4.should < 3
-  end
-
-end
-
-describe "should <=" do
-  
-  it "passes if actual == expected" do
-    4.should <= 4
-  end
-
-  it "passes if actual < expected" do
-    4.should <= 5
-  end
-
-  it "fails if > fails" do
-    RSpec::Expectations.should_receive(:fail_with).with(%[expected: <= 3\n     got:    4], 3, 4)
-    4.should <= 3
-  end
-
-end
-
-describe "OperatorMatcher registry" do
-  let(:custom_klass) { Class.new }
-  let(:custom_subklass) { Class.new(custom_klass) }
-
-  after {
-    RSpec::Matchers::OperatorMatcher.unregister(custom_klass, "=~")
-  }
-
-  it "allows operator matchers to be registered for types" do
-    RSpec::Matchers::OperatorMatcher.register(custom_klass, "=~", RSpec::Matchers::BuiltIn::Match)
-    expect(RSpec::Matchers::OperatorMatcher.get(custom_klass, "=~")).to eq(RSpec::Matchers::BuiltIn::Match)
-  end
-
-  it "considers ancestors when finding an operator matcher" do
-    RSpec::Matchers::OperatorMatcher.register(custom_klass, "=~", RSpec::Matchers::BuiltIn::Match)
-    expect(RSpec::Matchers::OperatorMatcher.get(custom_subklass, "=~")).to eq(RSpec::Matchers::BuiltIn::Match)
-  end
-
-  it "returns nil if there is no matcher registered for a type" do
-    expect(RSpec::Matchers::OperatorMatcher.get(custom_klass, "=~")).to be_nil
-  end
-end
-
-describe RSpec::Matchers::BuiltIn::PositiveOperatorMatcher 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 {
-      o.should == o
-    }.should_not raise_error
+  describe RSpec::Matchers::BuiltIn::NegativeOperatorMatcher 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
+      expect {
+        o.should_not == :foo
+      }.not_to raise_error
+    end
   end
-
 end
 
-describe RSpec::Matchers::BuiltIn::NegativeOperatorMatcher 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 {
-      o.should_not == :foo
-    }.should_not raise_error
-  end
-
-end