rspec-expectations 2.13.0 → 2.14.0

data/spec/rspec/matchers/raise_error_spec.rb

@@ -10,6 +10,25 @@ describe "expect { ... }.to raise_error" do
     expect {raise}.to raise_error
   end
 
+  it "passes if an error instance is expected" do
+    s = StandardError.new
+    expect {raise s}.to raise_error(s)
+  end
+
+  it "fails if a different error instance is thrown from the one that is expected" do
+    s = StandardError.new :bees
+    to_raise = StandardError.new(:faces)
+    expect do
+      expect {raise to_raise}.to raise_error(s)
+    end.to fail_with(Regexp.new("expected #{s.inspect}, got #{to_raise.inspect} with backtrace"))
+  end
+
+  it "passes if an error class is expected and an instance of that class is thrown" do
+    s = StandardError.new :bees
+
+    expect { raise s }.to raise_error(StandardError)
+  end
+
   it "fails if nothing is raised" do
     expect {
       expect {}.to raise_error
@@ -41,36 +60,53 @@ describe "expect { ... }.to raise_error {|err| ... }" do
   end
 end
 
-describe "expect { ... }.to_not raise_error" do
-  it "passes if nothing is raised" do
-    expect {}.to_not raise_error
-  end
+describe "expect { ... }.not_to raise_error" do
 
-  it "fails if anything is raised" do
-    expect {
-      expect { raise RuntimeError, "example message" }.to_not raise_error
-    }.to fail_with(/expected no Exception, got #<RuntimeError: example message>/)
+  context "with a specific error class" do
+    it "is deprecated" do
+      RSpec.should_receive :deprecate
+      expect {"bees"}.not_to raise_error(RuntimeError)
+    end
   end
 
-  it 'includes the backtrace of the error that was raised in the error message' do
-    expect {
-      expect { raise "boom" }.not_to raise_error
-    }.to raise_error { |e|
-      backtrace_line = "#{File.basename(__FILE__)}:#{__LINE__ - 2}"
-      expect(e.message).to include("with backtrace", backtrace_line)
-    }
-  end
+  context "with no specific error class" do
+    it "is not deprecated" do
+      run = nil
+      allow(RSpec).to receive(:deprecate) { run = true }
+      expect {"bees"}.not_to raise_error
+      expect(run).to be_nil
+    end
 
-  it 'formats the backtrace using the configured backtrace formatter' do
-    RSpec::Matchers.configuration.backtrace_formatter.
-                    stub(:format_backtrace).
-                    and_return("formatted-backtrace")
+    it "passes if nothing is raised" do
+      expect {}.not_to raise_error
+    end
 
-    expect {
-      expect { raise "boom" }.not_to raise_error
-    }.to raise_error { |e|
-      expect(e.message).to include("with backtrace", "formatted-backtrace")
-    }
+    it "fails if anything is raised" do
+      expect {
+        expect { raise RuntimeError, "example message" }.not_to raise_error
+      }.to fail_with(/expected no Exception, got #<RuntimeError: example message>/)
+    end
+
+    it 'includes the backtrace of the error that was raised in the error message' do
+      expect {
+        expect { raise "boom" }.not_to raise_error
+      }.to raise_error { |e|
+        backtrace_line = "#{File.basename(__FILE__)}:#{__LINE__ - 2}"
+        expect(e.message).to include("with backtrace", backtrace_line)
+      }
+    end
+
+    it 'formats the backtrace using the configured backtrace formatter' do
+      RSpec::Matchers.configuration.backtrace_formatter.
+        stub(:format_backtrace).
+        and_return("formatted-backtrace")
+
+      expect {
+        expect { raise "boom" }.not_to raise_error
+      }.to raise_error { |e|
+        expect(e.message).to include("with backtrace", "formatted-backtrace")
+      }
+    end
   end
 end
 
@@ -109,24 +145,33 @@ describe "expect { ... }.to raise_error(message)" do
   end
 end
 
-describe "expect { ... }.to_not raise_error(message)" do
+describe "expect { ... }.not_to raise_error(message)" do
+  before do
+    allow(RSpec).to receive(:deprecate)
+  end
+
+  it "is deprecated" do
+    expect(RSpec).to receive(:deprecate).with(/not_to raise_error\(message\)/, :replacement =>"`expect { }.not_to raise_error()`")
+    expect {raise 'blarg'}.not_to raise_error('blah')
+  end
+
   it "passes if RuntimeError error is raised with the different message" do
-    expect {raise 'blarg'}.to_not raise_error('blah')
+    expect {raise 'blarg'}.not_to raise_error('blah')
   end
 
   it "passes if any other error is raised with the wrong message" do
-    expect {raise NameError.new('blarg')}.to_not raise_error('blah')
+    expect {raise NameError.new('blarg')}.not_to raise_error('blah')
   end
 
   it "fails if RuntimeError is raised with message" do
     expect do
-      expect {raise 'blah'}.to_not raise_error('blah')
+      expect {raise 'blah'}.not_to raise_error('blah')
     end.to fail_with(/expected no Exception with "blah", got #<RuntimeError: blah>/)
   end
 
   it "fails if any other error is raised with message" do
     expect do
-      expect {raise NameError.new('blah')}.to_not raise_error('blah')
+      expect {raise NameError.new('blah')}.not_to raise_error('blah')
     end.to fail_with(/expected no Exception with "blah", got #<NameError: blah>/)
   end
 end
@@ -155,18 +200,27 @@ describe "expect { ... }.to raise_error(NamedError)" do
   end
 end
 
-describe "expect { ... }.to_not raise_error(NamedError)" do
+describe "expect { ... }.not_to raise_error(NamedError)" do
+  before do
+    allow(RSpec).to receive(:deprecate)
+  end
+
+  it "is deprecated" do
+    expect(RSpec).to receive(:deprecate).with(/not_to raise_error\(SpecificErrorClass\)/, :replacement => "`expect { }.not_to raise_error()`")
+    expect { }.not_to raise_error(NameError)
+  end
+
   it "passes if nothing is raised" do
-    expect { }.to_not raise_error(NameError)
+    expect { }.not_to raise_error(NameError)
   end
 
   it "passes if another error is raised" do
-    expect { raise }.to_not raise_error(NameError)
+    expect { raise }.not_to raise_error(NameError)
   end
 
   it "fails if named error is raised" do
     expect {
-      expect { 1 + 'b' }.to_not raise_error(TypeError)
+      expect { 1 + 'b' }.not_to raise_error(TypeError)
     }.to fail_with(/expected no TypeError, got #<TypeError: String can't be/)
   end
 end
@@ -195,6 +249,88 @@ describe "expect { ... }.to raise_error(NamedError, error_message) with String"
   end
 end
 
+describe "expect { ... }.not_to raise_error(NamedError, error_message) with String" do
+  before do
+    allow(RSpec).to receive(:deprecate)
+  end
+
+  it "is deprecated" do
+    expect(RSpec).to receive(:deprecate).with(/not_to raise_error\(SpecificErrorClass, message\)/, :replacement =>"`expect { }.not_to raise_error()`")
+    expect {}.not_to raise_error(RuntimeError, "example message")
+  end
+
+  it "passes if nothing is raised" do
+    expect {}.not_to raise_error(RuntimeError, "example message")
+  end
+
+  it "passes if a different error is raised" do
+    expect { raise }.not_to raise_error(NameError, "example message")
+  end
+
+  it "passes if same error is raised with different message" do
+    expect { raise RuntimeError.new("not the example message") }.not_to raise_error(RuntimeError, "example message")
+  end
+
+  it "fails if named error is raised with same message" do
+    expect {
+      expect { raise "example message" }.not_to raise_error(RuntimeError, "example message")
+    }.to fail_with(/expected no RuntimeError with \"example message\", got #<RuntimeError: example message>/)
+  end
+end
+
+describe "expect { ... }.to raise_error(NamedError, error_message) with Regexp" do
+  it "passes if named error is raised with matching message" do
+    expect { raise "example message" }.to raise_error(RuntimeError, /ample mess/)
+  end
+
+  it "fails if nothing is raised" do
+    expect {
+      expect {}.to raise_error(RuntimeError, /ample mess/)
+    }.to fail_with(/expected RuntimeError with message matching \/ample mess\/ but nothing was raised/)
+  end
+
+  it "fails if incorrect error is raised" do
+    expect {
+      expect { raise RuntimeError, "example message" }.to raise_error(NameError, /ample mess/)
+    }.to fail_with(/expected NameError with message matching \/ample mess\/, got #<RuntimeError: example message>/)
+  end
+
+  it "fails if correct error is raised with incorrect message" do
+    expect {
+      expect { raise RuntimeError.new("not the example message") }.to raise_error(RuntimeError, /less than ample mess/)
+    }.to fail_with(/expected RuntimeError with message matching \/less than ample mess\/, got #<RuntimeError: not the example message>/)
+  end
+end
+
+describe "expect { ... }.not_to raise_error(NamedError, error_message) with Regexp" do
+  before do
+    allow(RSpec).to receive(:deprecate)
+  end
+
+  it "is deprecated" do
+    expect(RSpec).to receive(:deprecate)
+    expect {}.not_to raise_error(RuntimeError, /ample mess/)
+  end
+
+  it "passes if nothing is raised" do
+    expect {}.not_to raise_error(RuntimeError, /ample mess/)
+  end
+
+  it "passes if a different error is raised" do
+    expect { raise }.not_to raise_error(NameError, /ample mess/)
+  end
+
+  it "passes if same error is raised with non-matching message" do
+    expect { raise RuntimeError.new("non matching message") }.not_to raise_error(RuntimeError, /ample mess/)
+  end
+
+  it "fails if named error is raised with matching message" do
+    expect {
+      expect { raise "example message" }.not_to raise_error(RuntimeError, /ample mess/)
+    }.to fail_with(/expected no RuntimeError with message matching \/ample mess\/, got #<RuntimeError: example message>/)
+  end
+end
+
 describe "expect { ... }.to raise_error(NamedError, error_message) { |err| ... }" do
   it "yields exception if named error is raised with same message" do
     ran = false
@@ -268,11 +404,20 @@ describe "expect { ... }.to raise_error(NamedError, error_message) { |err| ... }
   end
 end
 
-describe "expect { ... }.to_not raise_error(NamedError, error_message) { |err| ... }" do
+describe "expect { ... }.not_to raise_error(NamedError, error_message) { |err| ... }" do
+  before do
+    allow(RSpec).to receive(:deprecate)
+  end
+
+  it "is deprecated" do
+    expect(RSpec).to receive(:deprecate)
+    expect {}.not_to raise_error(RuntimeError, "example message") { |err| }
+  end
+
   it "passes if nothing is raised" do
     ran = false
 
-    expect {}.to_not raise_error(RuntimeError, "example message") { |err|
+    expect {}.not_to raise_error(RuntimeError, "example message") { |err|
       ran = true
     }
 
@@ -282,7 +427,7 @@ describe "expect { ... }.to_not raise_error(NamedError, error_message) { |err| .
   it "passes if a different error is raised" do
     ran = false
 
-    expect { raise }.to_not raise_error(NameError, "example message") { |err|
+    expect { raise }.not_to raise_error(NameError, "example message") { |err|
       ran = true
     }
 
@@ -294,7 +439,7 @@ describe "expect { ... }.to_not raise_error(NamedError, error_message) { |err| .
 
     expect {
       raise RuntimeError.new("not the example message")
-    }.to_not raise_error(RuntimeError, "example message") { |err|
+    }.not_to raise_error(RuntimeError, "example message") { |err|
       ran = true
     }
 
@@ -307,7 +452,7 @@ describe "expect { ... }.to_not raise_error(NamedError, error_message) { |err| .
     expect {
       expect {
         raise "example message"
-      }.to_not raise_error(RuntimeError, "example message") { |err|
+      }.not_to raise_error(RuntimeError, "example message") { |err|
         ran = true
       }
     }.to fail_with(/expected no RuntimeError with \"example message\", got #<RuntimeError: example message>/)
@@ -330,66 +475,11 @@ describe "expect { ... }.to_not raise_error(NamedError, error_message) { |err| .
   end
 end
 
-describe "expect { ... }.to_not raise_error(NamedError, error_message) with String" do
-  it "passes if nothing is raised" do
-    expect {}.to_not raise_error(RuntimeError, "example message")
-  end
-
-  it "passes if a different error is raised" do
-    expect { raise }.to_not raise_error(NameError, "example message")
-  end
-
-  it "passes if same error is raised with different message" do
-    expect { raise RuntimeError.new("not the example message") }.to_not raise_error(RuntimeError, "example message")
-  end
-
-  it "fails if named error is raised with same message" do
-    expect {
-      expect { raise "example message" }.to_not raise_error(RuntimeError, "example message")
-    }.to fail_with(/expected no RuntimeError with \"example message\", got #<RuntimeError: example message>/)
-  end
-end
-
-describe "expect { ... }.to raise_error(NamedError, error_message) with Regexp" do
-  it "passes if named error is raised with matching message" do
-    expect { raise "example message" }.to raise_error(RuntimeError, /ample mess/)
-  end
-
-  it "fails if nothing is raised" do
-    expect {
-      expect {}.to raise_error(RuntimeError, /ample mess/)
-    }.to fail_with(/expected RuntimeError with message matching \/ample mess\/ but nothing was raised/)
-  end
-
-  it "fails if incorrect error is raised" do
-    expect {
-      expect { raise RuntimeError, "example message" }.to raise_error(NameError, /ample mess/)
-    }.to fail_with(/expected NameError with message matching \/ample mess\/, got #<RuntimeError: example message>/)
-  end
-
-  it "fails if correct error is raised with incorrect message" do
-    expect {
-      expect { raise RuntimeError.new("not the example message") }.to raise_error(RuntimeError, /less than ample mess/)
-    }.to fail_with(/expected RuntimeError with message matching \/less than ample mess\/, got #<RuntimeError: not the example message>/)
-  end
-end
-
-describe "expect { ... }.to_not raise_error(NamedError, error_message) with Regexp" do
-  it "passes if nothing is raised" do
-    expect {}.to_not raise_error(RuntimeError, /ample mess/)
-  end
-
-  it "passes if a different error is raised" do
-    expect { raise }.to_not raise_error(NameError, /ample mess/)
-  end
-
-  it "passes if same error is raised with non-matching message" do
-    expect { raise RuntimeError.new("non matching message") }.to_not raise_error(RuntimeError, /ample mess/)
-  end
-
-  it "fails if named error is raised with matching message" do
+describe "misuse of raise_error, with (), not {}" do
+  it "fails with warning" do
+    ::Kernel.should_receive(:warn).with(/`raise_error` was called with non-proc object 1\.7/)
     expect {
-      expect { raise "example message" }.to_not raise_error(RuntimeError, /ample mess/)
-    }.to fail_with(/expected no RuntimeError with message matching \/ample mess\/, got #<RuntimeError: example message>/)
+      expect(Math.sqrt(3)).to raise_error
+    }.to fail_with(/nothing was raised/)
   end
 end

data/spec/rspec/matchers/respond_to_spec.rb

@@ -148,7 +148,7 @@ describe "expect(...).to respond_to(:sym).with(2).arguments" do
   end
 end
 
-describe "expect(...).to_not respond_to(:sym)" do
+describe "expect(...).not_to respond_to(:sym)" do
   it "passes if target does not respond to :sym" do
     expect(Object.new).not_to respond_to(:some_method)
   end
@@ -160,7 +160,7 @@ describe "expect(...).to_not respond_to(:sym)" do
   end
 end
 
-describe "expect(...).to_not respond_to(:sym).with(1).argument" do
+describe "expect(...).not_to respond_to(:sym).with(1).argument" do
   it "fails if target responds to :sym with 1 arg" do
     obj = Object.new
     def obj.foo(arg); end
@@ -209,7 +209,7 @@ describe "expect(...).to_not respond_to(:sym).with(1).argument" do
   end
 end
 
-describe "expect(...).to_not respond_to(message1, message2)" do
+describe "expect(...).not_to respond_to(message1, message2)" do
   it "passes if target does not respond to either message1 or message2" do
     expect(Object.new).not_to respond_to(:some_method, :some_other_method)
   end
@@ -233,7 +233,7 @@ describe "expect(...).to_not respond_to(message1, message2)" do
   end
 end
 
-describe "expect(...).to_not respond_to(:sym).with(2).arguments" do
+describe "expect(...).not_to respond_to(:sym).with(2).arguments" do
   it "fails if target responds to :sym with 2 args" do
     obj = Object.new
     def obj.foo(a1, a2); end

data/spec/rspec/matchers/satisfy_spec.rb

@@ -28,7 +28,7 @@ describe "expect(...).to satisfy { block }" do
   end
 end
 
-describe "expect(...).to_not satisfy { block }" do
+describe "expect(...).not_to satisfy { block }" do
   it "passes if block returns false" do
     expect(false).not_to satisfy { |val| val }
     expect(false).not_to satisfy do |val|

data/spec/rspec/matchers/start_with_end_with_spec.rb

@@ -56,7 +56,7 @@ describe "expect(...).to start_with" do
   end
 end
 
-describe "expect(...).to_not start_with" do
+describe "expect(...).not_to start_with" do
   context "with a string" do
     it "passes if it does not match the start of the actual string" do
       expect("this string").not_to start_with "that str"
@@ -149,7 +149,7 @@ describe "expect(...).to end_with" do
 
 end
 
-describe "expect(...).to_not end_with" do
+describe "expect(...).not_to end_with" do
   context "with a sting" do
     it "passes if it does not match the end of the actual string" do
       expect("this string").not_to end_with "stringy"

data/spec/rspec/matchers/yield_spec.rb

@@ -63,10 +63,87 @@ describe "yield_control matcher" do
       }.to fail_with(/expected given block to yield control/)
     end
 
-    it 'raises an error if it yields multiple times' do
-      expect {
-        expect { |b| [1, 2].each(&b) }.to yield_control
-      }.to raise_error(/not designed.*yields multiple times/)
+    context "with exact count" do
+      it 'fails if the block yields wrong number of times' do
+        expect {
+          expect { |b| [1, 2, 3].each(&b) }.to yield_control.twice
+        }.to fail_with(/expected given block to yield control twice/)
+
+        expect {
+          expect { |b| [1, 2].each(&b) }.to yield_control.exactly(3).times
+        }.to fail_with(/expected given block to yield control 3 times/)
+      end
+
+      it 'passes if the block yields the specified number of times' do
+        expect { |b| [1].each(&b) }.to yield_control.once
+        expect { |b| [1, 2].each(&b) }.to yield_control.twice
+        expect { |b| [1, 2, 3].each(&b) }.to yield_control.exactly(3).times
+      end
+    end
+
+    context "with at_least count" do
+      it 'passes if the block yields the given number of times' do
+        expect { |b| [1, 2].each(&b) }.to yield_control.at_least(2).times
+        expect { |b| [1, 2, 3].each(&b) }.to yield_control.at_least(3).times
+      end
+
+      it 'passes if the block yields more times' do
+        expect { |b| [1, 2, 3].each(&b) }.to yield_control.at_least(2).times
+        expect { |b| [1, 2, 3, 4].each(&b) }.to yield_control.at_least(3).times
+      end
+
+      it 'allows :once and :twice to be passed as counts' do
+        expect { |b| [1].each(&b) }.to yield_control.at_least(:once)
+        expect { |b| [1, 2].each(&b) }.to yield_control.at_least(:once)
+
+        expect {
+          expect { |b| [].each(&b) }.to yield_control.at_least(:once)
+        }.to fail_with(/at least once/)
+
+        expect { |b| [1, 2].each(&b) }.to yield_control.at_least(:twice)
+        expect { |b| [1, 2, 3].each(&b) }.to yield_control.at_least(:twice)
+
+        expect {
+          expect { |b| [1].each(&b) }.to yield_control.at_least(:twice)
+        }.to fail_with(/at least twice/)
+      end
+
+      it 'fails if the block yields too few times' do
+        expect {
+          expect { |b| _yield_with_no_args(&b) }.to yield_control.at_least(2).times
+        }.to fail_with(/expected given block to yield control at least twice/)
+      end
+    end
+
+    context "with at_most count" do
+      it 'passes if the block yields the given number of times' do
+        expect { |b| [1, 2].each(&b) }.to yield_control.at_most(2).times
+        expect { |b| [1, 2, 3].each(&b) }.to yield_control.at_most(3).times
+      end
+
+      it 'passes if the block yields fewer times' do
+        expect { |b| [1, 2].each(&b) }.to yield_control.at_most(3).times
+      end
+
+      it 'allows :once and :twice to be passed as counts' do
+        expect { |b| [1].each(&b) }.to yield_control.at_most(:once)
+
+        expect {
+          expect { |b| [1, 2].each(&b) }.to yield_control.at_most(:once)
+        }.to fail_with(/expected given block to yield control at most once/)
+
+        expect { |b| [1, 2].each(&b) }.to yield_control.at_most(:twice)
+
+        expect {
+          expect { |b| [1, 2, 3].each(&b) }.to yield_control.at_most(:twice)
+        }.to fail_with(/expected given block to yield control at most twice/)
+      end
+
+      it 'fails if the block yields too many times' do
+        expect {
+          expect { |b| [1, 2, 3].each(&b) }.to yield_control.at_most(2).times
+        }.to fail_with(/expected given block to yield control at most twice/)
+      end
     end
   end
 

data/spec/spec_helper.rb

@@ -46,7 +46,7 @@ module TestUnitIntegrationSupport
   def with_test_unit_loaded
     in_sub_process do
       require 'test/unit'
-      load 'rspec/matchers.rb'
+      load 'rspec/matchers/test_unit_integration.rb'
       yield
     end
   end

metadata

@@ -2,7 +2,7 @@
 name: rspec-expectations
 version: !ruby/object:Gem::Version
   prerelease: 
-  version: 2.13.0
+  version: 2.14.0
 platform: ruby
 authors:
 - Steven Baker
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-02-23 00:00:00.000000000 Z
+date: 2013-07-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   version_requirements: !ruby/object:Gem::Requirement
@@ -71,7 +71,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.4.11
+        version: '0.5'
     none: false
   prerelease: false
   name: aruba
@@ -79,7 +79,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.4.11
+        version: '0.5'
     none: false
   type: :development
 description: rspec expectations (should[_not] and matchers)
@@ -135,6 +135,7 @@ files:
 - lib/rspec/matchers/method_missing.rb
 - lib/rspec/matchers/operator_matcher.rb
 - lib/rspec/matchers/pretty.rb
+- lib/rspec/matchers/test_unit_integration.rb
 - README.md
 - License.txt
 - Changelog.md
@@ -232,7 +233,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 3249637945894736858
+      hash: -2919541554530046896
   none: false
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
@@ -241,14 +242,14 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 3249637945894736858
+      hash: -2919541554530046896
   none: false
 requirements: []
 rubyforge_project: rspec
 rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
-summary: rspec-expectations-2.13.0
+summary: rspec-expectations-2.14.0
 test_files:
 - features/README.md
 - features/Upgrade.md