rspec-expectations 2.9.1 → 2.10.0

data/spec/rspec/matchers/yield_spec.rb

@@ -0,0 +1,374 @@
+require 'spec_helper'
+
+module YieldHelpers
+  # these helpers are prefixed with an underscore to prevent
+  # collisions with the matchers (some of which have the same names)
+  def _dont_yield
+  end
+
+  def _yield_with_no_args
+    yield
+  end
+
+  def _yield_with_args(*args)
+    yield(*args)
+  end
+end
+
+class InstanceEvaler
+  include RSpec::Matchers::Extensions::InstanceEvalWithArgs
+
+  def yield_with_no_args(&block)
+    instance_eval_with_args(&block)
+  end
+
+  def yield_with_args(*args, &block)
+    instance_eval_with_args(*args, &block)
+  end
+
+  def each_arg(*args, &block)
+    args.each do |arg|
+      instance_eval_with_args(arg, &block)
+    end
+  end
+end
+
+describe "yield_control matcher" do
+  include YieldHelpers
+
+  it 'has a description' do
+    yield_control.description.should eq("yield control")
+  end
+
+  describe "expect {...}.to yield_control" do
+    it 'passes if the block yields, regardless of the number of yielded arguments' do
+      expect { |b| _yield_with_no_args(&b) }.to yield_control
+      expect { |b| _yield_with_args(1, 2, &b) }.to yield_control
+    end
+
+    it 'passes if the block yields using instance_eval' do
+      expect { |b| InstanceEvaler.new.yield_with_no_args(&b) }.to yield_control
+    end
+
+    it 'fails if the block does not yield' do
+      expect {
+        expect { |b| _dont_yield(&b) }.to yield_control
+      }.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/)
+    end
+  end
+
+  describe "expect {...}.not_to yield_control" do
+    it 'passes if the block does not yield' do
+      expect { |b| _dont_yield(&b) }.not_to yield_control
+    end
+
+    it 'fails if the block does yield' do
+      expect {
+        expect { |b| _yield_with_no_args(&b) }.not_to yield_control
+      }.to fail_with(/expected given block not to yield control/)
+    end
+
+    it 'fails if the expect block does not accept an argument' do
+      expect {
+        expect { }.not_to yield_control
+      }.to raise_error(/expect block must accept an argument/)
+    end
+
+    it 'raises an error if the expect block arg is not passed to a method as a block' do
+      expect {
+        expect { |b| }.not_to yield_control
+      }.to raise_error(/must pass the argument.*as a block/)
+    end
+  end
+end
+
+describe "yield_with_no_args matcher" do
+  include YieldHelpers
+
+  it 'has a description' do
+    yield_with_no_args.description.should eq("yield with no args")
+  end
+
+  describe "expect {...}.to yield_with_no_args" do
+    it 'passes if the block yields with no args' do
+      expect { |b| _yield_with_no_args(&b) }.to yield_with_no_args
+    end
+
+    it 'passes if the block yields with no args using instance_eval' do
+      expect { |b| InstanceEvaler.new.yield_with_no_args(&b) }.to yield_with_no_args
+    end
+
+    it 'fails if the block does not yield' do
+      expect {
+        expect { |b| _dont_yield(&b) }.to yield_with_no_args
+      }.to fail_with(/expected given block to yield with no arguments, but did not yield/)
+    end
+
+    it 'fails if the block yields with args' do
+      expect {
+        expect { |b| _yield_with_args(1, &b) }.to yield_with_no_args
+      }.to fail_with(/expected given block to yield with no arguments, but yielded with arguments/)
+    end
+
+    it 'raises an error if it yields multiple times' do
+      expect {
+        expect { |b| [1, 2].each(&b) }.to yield_with_no_args
+      }.to raise_error(/not designed.*yields multiple times/)
+    end
+  end
+
+  describe "expect {...}.not_to yield_with_no_args" do
+    it "passes if the block does not yield" do
+      expect { |b| _dont_yield(&b) }.not_to yield_with_no_args
+    end
+
+    it "passes if the block yields with args" do
+      expect { |b| _yield_with_args(1, &b) }.not_to yield_with_no_args
+    end
+
+    it "fails if the block yields with no args" do
+      expect {
+        expect { |b| _yield_with_no_args(&b) }.not_to yield_with_no_args
+      }.to fail_with(/expected given block not to yield with no arguments, but did/)
+    end
+
+    it 'fails if the expect block does not accept an argument' do
+      expect {
+        expect { }.not_to yield_with_no_args
+      }.to raise_error(/expect block must accept an argument/)
+    end
+
+    it 'raises an error if the expect block arg is not passed to a method as a block' do
+      expect {
+        expect { |b| }.not_to yield_with_no_args
+      }.to raise_error(/must pass the argument.*as a block/)
+    end
+  end
+end
+
+describe "yield_with_args matcher" do
+  include YieldHelpers
+
+  it 'has a description' do
+    yield_with_args.description.should eq("yield with args")
+    yield_with_args(1, 3).description.should eq("yield with args(1, 3)")
+  end
+
+  describe "expect {...}.to yield_with_args" do
+    it 'passes if the block yields with arguments' do
+      expect { |b| _yield_with_args(1, &b) }.to yield_with_args
+    end
+
+    it 'fails if the block does not yield' do
+      expect {
+        expect { |b| _dont_yield(&b) }.to yield_with_args
+      }.to fail_with(/expected given block to yield with arguments, but did not yield/)
+    end
+
+    it 'fails if the block yields with no arguments' do
+      expect {
+        expect { |b| _yield_with_no_args(&b) }.to yield_with_args
+      }.to fail_with(/expected given block to yield with arguments, but yielded with no arguments/)
+    end
+
+    it 'raises an error if it yields multiple times' do
+      expect {
+        expect { |b| [1, 2].each(&b) }.to yield_with_args
+      }.to raise_error(/not designed.*yields multiple times/)
+    end
+  end
+
+  describe "expect {...}.not_to yield_with_args" do
+    it 'fails if the block yields with arguments' do
+      expect {
+        expect { |b| _yield_with_args(1, &b) }.not_to yield_with_args
+      }.to fail_with(/expected given block not to yield with arguments, but did/)
+    end
+
+    it 'passes if the block does not yield' do
+      expect { |b| _dont_yield(&b) }.not_to yield_with_args
+    end
+
+    it 'passes if the block yields with no arguments' do
+      expect { |b| _yield_with_no_args(&b) }.not_to yield_with_args
+    end
+
+    it 'fails if the expect block does not accept an argument' do
+      expect {
+        expect { }.not_to yield_with_args
+      }.to raise_error(/expect block must accept an argument/)
+    end
+
+    it 'raises an error if the expect block arg is not passed to a method as a block' do
+      expect {
+        expect { |b| }.not_to yield_with_args
+      }.to raise_error(/must pass the argument.*as a block/)
+    end
+  end
+
+  describe "expect {...}.to yield_with_args(3, 17)" do
+    it 'passes if the block yields with the given arguments' do
+      expect { |b| _yield_with_args(3, 17, &b) }.to yield_with_args(3, 17)
+    end
+
+    it 'passes if the block yields with the given arguments using instance_eval' do
+      expect { |b| InstanceEvaler.new.yield_with_args(3, 17, &b) }.to yield_with_args(3, 17)
+    end
+
+    it 'fails if the block does not yield' do
+      expect {
+        expect { |b| _dont_yield(&b) }.to yield_with_args(3, 17)
+      }.to fail_with(/expected given block to yield with arguments, but did not yield/)
+    end
+
+    it 'fails if the block yields with no arguments' do
+      expect {
+        expect { |b| _yield_with_no_args(&b) }.to yield_with_args(3, 17)
+      }.to fail_with(/expected given block to yield with arguments, but yielded with unexpected arguments/)
+    end
+
+    it 'fails if the block yields with different arguments' do
+      expect {
+        expect { |b| _yield_with_args("a", "b", &b) }.to yield_with_args("a", "c")
+      }.to fail_with(/expected given block to yield with arguments, but yielded with unexpected arguments/)
+    end
+  end
+
+  describe "expect {...}.not_to yield_with_args(3, 17)" do
+    it 'passes if the block yields with different arguments' do
+      expect { |b| _yield_with_args("a", "b", &b) }.not_to yield_with_args("a", "c")
+    end
+
+    it 'fails if the block yields with the given arguments' do
+      expect {
+        expect { |b| _yield_with_args("a", "b", &b) }.not_to yield_with_args("a", "b")
+      }.to fail_with(/expected given block not to yield with arguments, but yielded with expected arguments/)
+    end
+  end
+
+  describe "expect {...}.to yield_with_args(/reg/, /ex/)" do
+    it "passes if the block yields strings matching the regexes" do
+      expect { |b| _yield_with_args("regular", "expression", &b) }.to yield_with_args(/reg/, /ex/)
+    end
+
+    it "fails if the block yields strings that do not match the regexes" do
+      expect {
+        expect { |b| _yield_with_args("no", "match", &b) }.to yield_with_args(/reg/, /ex/)
+      }.to fail_with(/expected given block to yield with arguments, but yielded with unexpected arguments/)
+    end
+  end
+
+  describe "expect {...}.to yield_with_args(String, Fixnum)" do
+    it "passes if the block yields objects of the given types" do
+      expect { |b| _yield_with_args("string", 15, &b) }.to yield_with_args(String, Fixnum)
+    end
+
+    it "passes if the block yields the given types" do
+      expect { |b| _yield_with_args(String, Fixnum, &b) }.to yield_with_args(String, Fixnum)
+    end
+
+    it "fails if the block yields objects of different types" do
+      expect {
+        expect { |b| _yield_with_args(15, "string", &b) }.to yield_with_args(String, Fixnum)
+      }.to fail_with(/expected given block to yield with arguments, but yielded with unexpected arguments/)
+    end
+  end
+end
+
+describe "yield_successive_args matcher" do
+  include YieldHelpers
+
+  it 'has a description' do
+    yield_successive_args(1, 3).description.should eq("yield successive args(1, 3)")
+    yield_successive_args([:a, 1], [:b, 2]).description.should eq("yield successive args([:a, 1], [:b, 2])")
+  end
+
+  describe "expect {...}.to yield_successive_args([:a, 1], [:b, 2])" do
+    it 'passes when the block successively yields the given args' do
+      expect { |b| { :a => 1, :b => 2 }.each(&b) }.to yield_successive_args([:a, 1], [:b, 2])
+    end
+
+    it 'fails when the block does not yield that many times' do
+      expect {
+        expect { |b| { :a => 1 }.each(&b) }.to yield_successive_args([:a, 1], [:b, 2])
+      }.to fail_with(/but yielded with unexpected arguments/)
+    end
+
+    it 'fails when the block yields the right number of times but with different arguments' do
+      expect {
+        expect { |b| { :a => 1, :b => 3 }.each(&b) }.to yield_successive_args([:a, 1], [:b, 2])
+      }.to fail_with(/but yielded with unexpected arguments/)
+    end
+  end
+
+  describe "expect {...}.to yield_successive_args(1, 2, 3)" do
+    it 'passes when the block successively yields the given args' do
+      expect { |b| [1, 2, 3].each(&b) }.to yield_successive_args(1, 2, 3)
+    end
+
+    it 'passes when the block successively yields the given args using instance_eval' do
+      expect { |b| InstanceEvaler.new.each_arg(1, 2, 3, &b) }.to yield_successive_args(1, 2, 3)
+    end
+
+    it 'fails when the block does not yield the expected args' do
+      expect {
+        expect { |b| [1, 2, 4].each(&b) }.to yield_successive_args([:a, 1], [:b, 2])
+      }.to fail_with(/but yielded with unexpected arguments/)
+    end
+  end
+
+  describe "expect {...}.not_to yield_successive_args(1, 2, 3)" do
+    it 'passes when the block does not yield' do
+      expect { |b| _dont_yield(&b) }.not_to yield_successive_args(1, 2, 3)
+    end
+
+    it 'passes when the block yields the wrong number of times' do
+      expect { |b| [1, 2].each(&b) }.not_to yield_successive_args(1, 2, 3)
+    end
+
+    it 'passes when the block yields the wrong arguments' do
+      expect { |b| [1, 2, 4].each(&b) }.not_to yield_successive_args(1, 2, 3)
+    end
+
+    it 'fails when the block yields the given arguments' do
+      expect {
+        expect { |b| [1, 2, 3].each(&b) }.not_to yield_successive_args(1, 2, 3)
+      }.to fail_with(/expected given block not to yield successively/)
+    end
+
+    it 'fails if the expect block does not accept an argument' do
+      expect {
+        expect { }.not_to yield_successive_args(1, 2, 3)
+      }.to raise_error(/expect block must accept an argument/)
+    end
+
+    it 'raises an error if the expect block arg is not passed to a method as a block' do
+      expect {
+        expect { |b| }.not_to yield_successive_args(1, 2, 3)
+      }.to raise_error(/must pass the argument.*as a block/)
+    end
+  end
+
+  describe "expect {...}.to yield_successive_args(String, Fixnum)" do
+    it "passes if the block successively yields objects of the given types" do
+      expect { |b| ["string", 15].each(&b) }.to yield_successive_args(String, Fixnum)
+    end
+
+    it "passes if the block yields the given types" do
+      expect { |b| [String, Fixnum].each(&b) }.to yield_successive_args(String, Fixnum)
+    end
+
+    it "fails if the block yields objects of different types" do
+      expect {
+        expect { |b| [15, "string"].each(&b) }.to yield_successive_args(String, Fixnum)
+      }.to fail_with(/expected given block to yield successively with arguments/)
+    end
+  end
+end
+

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rspec-expectations
 version: !ruby/object:Gem::Version
-  version: 2.9.1
+  version: 2.10.0
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-04-03 00:00:00.000000000 Z
+date: 2012-05-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: diff-lcs
@@ -117,7 +117,9 @@ files:
 - lib/rspec/matchers/built_in/raise_error.rb
 - lib/rspec/matchers/built_in/respond_to.rb
 - lib/rspec/matchers/built_in/satisfy.rb
+- lib/rspec/matchers/built_in/start_and_end_with.rb
 - lib/rspec/matchers/built_in/throw_symbol.rb
+- lib/rspec/matchers/built_in/yield.rb
 - lib/rspec/matchers/compatibility.rb
 - lib/rspec/matchers/dsl.rb
 - lib/rspec/matchers/extensions/instance_eval_with_args.rb
@@ -131,12 +133,13 @@ files:
 - Changelog.md
 - .yardopts
 - .document
-- features/README.markdown
+- features/README.md
 - features/Upgrade.md
 - features/built_in_matchers/README.md
 - features/built_in_matchers/be.feature
 - features/built_in_matchers/be_within.feature
 - features/built_in_matchers/cover.feature
+- features/built_in_matchers/end_with.feature
 - features/built_in_matchers/equality.feature
 - features/built_in_matchers/exist.feature
 - features/built_in_matchers/expect_change.feature
@@ -148,8 +151,10 @@ files:
 - features/built_in_matchers/predicates.feature
 - features/built_in_matchers/respond_to.feature
 - features/built_in_matchers/satisfy.feature
+- features/built_in_matchers/start_with.feature
 - features/built_in_matchers/throw_symbol.feature
 - features/built_in_matchers/types.feature
+- features/built_in_matchers/yield.feature
 - features/custom_matchers/access_running_example.feature
 - features/custom_matchers/define_diffable_matcher.feature
 - features/custom_matchers/define_matcher.feature
@@ -192,7 +197,9 @@ files:
 - spec/rspec/matchers/raise_error_spec.rb
 - spec/rspec/matchers/respond_to_spec.rb
 - spec/rspec/matchers/satisfy_spec.rb
+- spec/rspec/matchers/start_with_end_with_spec.rb
 - spec/rspec/matchers/throw_symbol_spec.rb
+- spec/rspec/matchers/yield_spec.rb
 - spec/spec_helper.rb
 - spec/support/classes.rb
 - spec/support/matchers.rb
@@ -213,7 +220,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -382523939105044110
+      hash: -3405734179281869157
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -222,20 +229,21 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -382523939105044110
+      hash: -3405734179281869157
 requirements: []
 rubyforge_project: rspec
-rubygems_version: 1.8.21
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
-summary: rspec-expectations-2.9.1
+summary: rspec-expectations-2.10.0
 test_files:
-- features/README.markdown
+- features/README.md
 - features/Upgrade.md
 - features/built_in_matchers/README.md
 - features/built_in_matchers/be.feature
 - features/built_in_matchers/be_within.feature
 - features/built_in_matchers/cover.feature
+- features/built_in_matchers/end_with.feature
 - features/built_in_matchers/equality.feature
 - features/built_in_matchers/exist.feature
 - features/built_in_matchers/expect_change.feature
@@ -247,8 +255,10 @@ test_files:
 - features/built_in_matchers/predicates.feature
 - features/built_in_matchers/respond_to.feature
 - features/built_in_matchers/satisfy.feature
+- features/built_in_matchers/start_with.feature
 - features/built_in_matchers/throw_symbol.feature
 - features/built_in_matchers/types.feature
+- features/built_in_matchers/yield.feature
 - features/custom_matchers/access_running_example.feature
 - features/custom_matchers/define_diffable_matcher.feature
 - features/custom_matchers/define_matcher.feature
@@ -291,8 +301,11 @@ test_files:
 - spec/rspec/matchers/raise_error_spec.rb
 - spec/rspec/matchers/respond_to_spec.rb
 - spec/rspec/matchers/satisfy_spec.rb
+- spec/rspec/matchers/start_with_end_with_spec.rb
 - spec/rspec/matchers/throw_symbol_spec.rb
+- spec/rspec/matchers/yield_spec.rb
 - spec/spec_helper.rb
 - spec/support/classes.rb
 - spec/support/matchers.rb
 - spec/support/ruby_version.rb
+has_rdoc: