rspec-expectations 2.10.0 → 2.11.0

data/spec/rspec/matchers/equal_spec.rb

@@ -2,11 +2,11 @@ require 'spec_helper'
 module RSpec
   module Matchers
     describe "equal" do
-      
+
       def inspect_object(o)
         "#<#{o.class}:#{o.object_id}> => #{o.inspect}"
       end
-      
+
       it "matches when actual.equal?(expected)" do
         1.should equal(1)
       end
@@ -14,18 +14,18 @@ module RSpec
       it "does not match when !actual.equal?(expected)" do
         "1".should_not equal("1")
       end
-      
+
       it "describes itself" do
         matcher = equal(1)
         matcher.matches?(1)
         matcher.description.should == "equal 1"
       end
-      
+
       it "provides message on #failure_message" do
         expected, actual = "1", "1"
         matcher = equal(expected)
         matcher.matches?(actual)
-        
+
         matcher.failure_message_for_should.should == <<-MESSAGE
 
 expected #{inspect_object(expected)}
@@ -33,12 +33,12 @@ expected #{inspect_object(expected)}
 
 Compared using equal?, which compares object identity,
 but expected and actual are not the same object. Use
-'actual.should == expected' if you don't care about
+'actual.should eq(expected)' if you don't care about
 object identity in this example.
 
 MESSAGE
       end
-      
+
       it "provides message on #negative_failure_message" do
         expected = actual = "1"
         matcher = equal(expected)

data/spec/rspec/matchers/match_array_spec.rb

@@ -14,6 +14,18 @@ class UnsortableObject
   end
 end
 
+describe "using match_array with expect" do
+  it "passes a valid positive expectation" do
+    expect([1, 2]).to match_array [2, 1]
+  end
+
+  it "fails an invalid positive expectation" do
+    expect {
+      expect([1, 2, 3]).to match_array [2, 1]
+    }.to fail_with(/expected collection contained/)
+  end
+end
+
 describe "array.should =~ other_array" do
   it "passes if target contains all items" do
     [1,2,3].should =~ [1,2,3]

data/spec/rspec/matchers/yield_spec.rb

@@ -291,18 +291,18 @@ describe "yield_successive_args matcher" do
 
   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])
+      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])
+        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])
+        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

data/spec/support/in_sub_process.rb

@@ -0,0 +1,31 @@
+module InSubProcess
+  # Useful as a way to isolate a global change to a subprocess.
+  def in_sub_process
+    readme, writeme = IO.pipe
+
+    pid = Process.fork do
+      value = nil
+      begin
+        yield
+      rescue => e
+        value = e
+      end
+
+      writeme.write Marshal.dump(value)
+
+      readme.close
+      writeme.close
+      exit! # prevent at_exit hooks from running (e.g. minitest)
+    end
+
+    writeme.close
+    Process.waitpid(pid)
+
+    if exception = Marshal.load(readme.read)
+      raise exception
+    end
+
+    readme.close
+  end
+end
+

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rspec-expectations
 version: !ruby/object:Gem::Version
-  version: 2.10.0
+  version: 2.11.0
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-05-04 00:00:00.000000000 Z
+date: 2012-07-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: diff-lcs
@@ -87,16 +87,16 @@ files:
 - lib/rspec/expectations/deprecation.rb
 - lib/rspec/expectations/differ.rb
 - lib/rspec/expectations/errors.rb
+- lib/rspec/expectations/expectation_target.rb
 - lib/rspec/expectations/extensions.rb
 - lib/rspec/expectations/extensions/array.rb
-- lib/rspec/expectations/extensions/kernel.rb
 - lib/rspec/expectations/extensions/object.rb
 - lib/rspec/expectations/fail_with.rb
 - lib/rspec/expectations/handler.rb
+- lib/rspec/expectations/syntax.rb
 - lib/rspec/expectations/version.rb
 - lib/rspec/matchers.rb
 - lib/rspec/matchers/be_close.rb
-- lib/rspec/matchers/block_aliases.rb
 - lib/rspec/matchers/built_in.rb
 - lib/rspec/matchers/built_in/base_matcher.rb
 - lib/rspec/matchers/built_in/be.rb
@@ -121,6 +121,7 @@ files:
 - lib/rspec/matchers/built_in/throw_symbol.rb
 - lib/rspec/matchers/built_in/yield.rb
 - lib/rspec/matchers/compatibility.rb
+- lib/rspec/matchers/configuration.rb
 - lib/rspec/matchers/dsl.rb
 - lib/rspec/matchers/extensions/instance_eval_with_args.rb
 - lib/rspec/matchers/generated_descriptions.rb
@@ -165,8 +166,10 @@ files:
 - features/implicit_docstrings.feature
 - features/step_definitions/additional_cli_steps.rb
 - features/support/env.rb
+- features/syntax_configuration.feature
 - features/test_frameworks/test_unit.feature
 - spec/rspec/expectations/differ_spec.rb
+- spec/rspec/expectations/expectation_target_spec.rb
 - spec/rspec/expectations/extensions/kernel_spec.rb
 - spec/rspec/expectations/fail_with_spec.rb
 - spec/rspec/expectations/handler_spec.rb
@@ -177,7 +180,7 @@ files:
 - spec/rspec/matchers/be_spec.rb
 - spec/rspec/matchers/be_within_spec.rb
 - spec/rspec/matchers/change_spec.rb
-- spec/rspec/matchers/compatibility_spec.rb
+- spec/rspec/matchers/configuration_spec.rb
 - spec/rspec/matchers/cover_spec.rb
 - spec/rspec/matchers/description_generation_spec.rb
 - spec/rspec/matchers/dsl_spec.rb
@@ -202,6 +205,7 @@ files:
 - spec/rspec/matchers/yield_spec.rb
 - spec/spec_helper.rb
 - spec/support/classes.rb
+- spec/support/in_sub_process.rb
 - spec/support/matchers.rb
 - spec/support/ruby_version.rb
 homepage: http://github.com/rspec/rspec-expectations
@@ -220,7 +224,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3405734179281869157
+      hash: 2819654037547751839
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -229,13 +233,13 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3405734179281869157
+      hash: 2819654037547751839
 requirements: []
 rubyforge_project: rspec
 rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
-summary: rspec-expectations-2.10.0
+summary: rspec-expectations-2.11.0
 test_files:
 - features/README.md
 - features/Upgrade.md
@@ -269,8 +273,10 @@ test_files:
 - features/implicit_docstrings.feature
 - features/step_definitions/additional_cli_steps.rb
 - features/support/env.rb
+- features/syntax_configuration.feature
 - features/test_frameworks/test_unit.feature
 - spec/rspec/expectations/differ_spec.rb
+- spec/rspec/expectations/expectation_target_spec.rb
 - spec/rspec/expectations/extensions/kernel_spec.rb
 - spec/rspec/expectations/fail_with_spec.rb
 - spec/rspec/expectations/handler_spec.rb
@@ -281,7 +287,7 @@ test_files:
 - spec/rspec/matchers/be_spec.rb
 - spec/rspec/matchers/be_within_spec.rb
 - spec/rspec/matchers/change_spec.rb
-- spec/rspec/matchers/compatibility_spec.rb
+- spec/rspec/matchers/configuration_spec.rb
 - spec/rspec/matchers/cover_spec.rb
 - spec/rspec/matchers/description_generation_spec.rb
 - spec/rspec/matchers/dsl_spec.rb
@@ -306,6 +312,7 @@ test_files:
 - spec/rspec/matchers/yield_spec.rb
 - spec/spec_helper.rb
 - spec/support/classes.rb
+- spec/support/in_sub_process.rb
 - spec/support/matchers.rb
 - spec/support/ruby_version.rb
 has_rdoc: 

data/lib/rspec/expectations/extensions/kernel.rb

@@ -1,26 +0,0 @@
-module Kernel
-  # Passes if +matcher+ returns true.  Available on every +Object+.
-  # @example
-  #   actual.should eq(expected)
-  #   actual.should be > 4
-  # @param [Matcher]
-  #   matcher
-  # @param [String] message optional message to display when the expectation fails
-  # @return [Boolean] true if the expectation succeeds (else raises)
-  # @see RSpec::Matchers
-  def should(matcher=nil, message=nil, &block)
-    RSpec::Expectations::PositiveExpectationHandler.handle_matcher(self, matcher, message, &block)
-  end
-
-  # Passes if +matcher+ returns false.  Available on every +Object+.
-  # @example
-  #   actual.should_not eq(expected)
-  # @param [Matcher]
-  #   matcher
-  # @param [String] message optional message to display when the expectation fails
-  # @return [Boolean] false if the negative expectation succeeds (else raises)
-  # @see RSpec::Matchers
-  def should_not(matcher=nil, message=nil, &block)
-    RSpec::Expectations::NegativeExpectationHandler.handle_matcher(self, matcher, message, &block)
-  end
-end

data/lib/rspec/matchers/block_aliases.rb

@@ -1,21 +0,0 @@
-require 'rspec/expectations/extensions/kernel'
-module RSpec
-  module Matchers
-    module BlockAliases
-      alias_method :to,     :should
-      alias_method :to_not, :should_not
-      alias_method :not_to, :should_not
-    end
-
-    # Extends the submitted block with aliases to and to_not
-    # for should and should_not.
-    #
-    # @example
-    #   expect { this_block }.to change{this.expression}.from(old_value).to(new_value)
-    #   expect { this_block }.to raise_error
-    def expect(&block)
-      block.extend BlockAliases
-    end
-  end
-end
-

data/spec/rspec/matchers/compatibility_spec.rb

@@ -1,28 +0,0 @@
-require 'spec_helper'
-
-RSpec::Matchers.define :have_public_instance_method do |method|
-  match do |klass|
-    klass.public_instance_methods.any? {|m| [method, method.to_sym].include?(m)}
-  end
-end
-
-(RSpec::Matchers.constants.sort).each do |c|
-  if (Class === (klass = RSpec::Matchers.const_get(c)))
-    describe klass do
-      if klass.public_instance_methods.any? {|m| ['failure_message_for_should',:failure_message_for_should].include?(m)}
-        describe "called with should" do
-          subject { klass }
-          it { should have_public_instance_method('failure_message_for_should')}
-          it { should have_public_instance_method('failure_message')}
-        end
-      end
-      if klass.public_instance_methods.any? {|m| ['failure_message_for_should_not',:failure_message_for_should_not].include?(m)}
-        describe "called with should not" do
-          subject { klass }
-          it { should have_public_instance_method('failure_message_for_should_not')}
-          it { should have_public_instance_method('negative_failure_message')}
-        end
-      end
-    end
-  end
-end