rspec-expectations 2.13.0 → 2.14.0.rc1

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

@@ -1,8 +1,8 @@
 --- !ruby/object:Gem::Specification
 name: rspec-expectations
 version: !ruby/object:Gem::Version
-  prerelease: 
-  version: 2.13.0
+  prerelease: 7
+  version: 2.14.0.rc1
 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-05-27 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,23 +233,20 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 3249637945894736858
+      hash: -3852254251876092451
   none: false
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ! '>'
     - !ruby/object:Gem::Version
-      version: '0'
-      segments:
-      - 0
-      hash: 3249637945894736858
+      version: 1.3.1
   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.rc1
 test_files:
 - features/README.md
 - features/Upgrade.md