rspec-expectations 2.6.0 → 2.7.0.rc1

data/spec/rspec/matchers/have_spec.rb

@@ -23,6 +23,7 @@ describe "have matcher" do
     (1..n).each do |number|
       owner.add_to_collection_with_length_method(number)
       owner.add_to_collection_with_size_method(number)
+      owner.add_to_collection_with_count_method(number)
     end
     owner
   end
@@ -33,12 +34,21 @@ describe "have matcher" do
       owner = create_collection_owner_with(3)
       owner.should have(3).items_in_collection_with_length_method
       owner.should have(3).items_in_collection_with_size_method
+      owner.should have(3).items_in_collection_with_count_method
     end
 
     it "converts :no to 0" do
       owner = create_collection_owner_with(0)
       owner.should have(:no).items_in_collection_with_length_method
       owner.should have(:no).items_in_collection_with_size_method
+      owner.should have(:no).items_in_collection_with_count_method
+    end
+
+    it "converts a String argument to Integer" do
+      owner = create_collection_owner_with(3)
+      owner.should have('3').items_in_collection_with_length_method
+      owner.should have('3').items_in_collection_with_size_method
+      owner.should have('3').items_in_collection_with_count_method
     end
 
     it "fails if target has a collection of items with < n members" do
@@ -49,6 +59,9 @@ describe "have matcher" do
       lambda {
         owner.should have(4).items_in_collection_with_size_method
       }.should fail_with("expected 4 items_in_collection_with_size_method, got 3")
+      lambda {
+        owner.should have(4).items_in_collection_with_count_method
+      }.should fail_with("expected 4 items_in_collection_with_count_method, got 3")
     end
 
     it "fails if target has a collection of items with > n members" do
@@ -59,6 +72,9 @@ describe "have matcher" do
       lambda {
         owner.should have(2).items_in_collection_with_size_method
       }.should fail_with("expected 2 items_in_collection_with_size_method, got 3")
+      lambda {
+        owner.should have(2).items_in_collection_with_count_method
+      }.should fail_with("expected 2 items_in_collection_with_count_method, got 3")
     end
   end
 
@@ -122,7 +138,7 @@ describe "have matcher" do
       end.new
       lambda do
         owner.should have(3).items
-      end.should raise_error("expected items to be a collection but it does not respond to #length or #size")
+      end.should raise_error("expected items to be a collection but it does not respond to #length, #size or #count")
     end
   end
 
@@ -132,12 +148,14 @@ describe "have matcher" do
       owner = create_collection_owner_with(3)
       owner.should_not have(4).items_in_collection_with_length_method
       owner.should_not have(4).items_in_collection_with_size_method
+      owner.should_not have(4).items_in_collection_with_count_method
     end
 
     it "passes if target has a collection of items with > n members" do
       owner = create_collection_owner_with(3)
       owner.should_not have(2).items_in_collection_with_length_method
       owner.should_not have(2).items_in_collection_with_size_method
+      owner.should_not have(2).items_in_collection_with_count_method
     end
 
     it "fails if target has a collection of items with n members" do
@@ -148,6 +166,9 @@ describe "have matcher" do
       lambda {
         owner.should_not have(3).items_in_collection_with_size_method
         }.should fail_with("expected target not to have 3 items_in_collection_with_size_method, got 3")
+      lambda {
+        owner.should_not have(3).items_in_collection_with_count_method
+        }.should fail_with("expected target not to have 3 items_in_collection_with_count_method, got 3")
     end
   end
 
@@ -157,12 +178,14 @@ describe "have matcher" do
       owner = create_collection_owner_with(3)
       owner.should have_exactly(3).items_in_collection_with_length_method
       owner.should have_exactly(3).items_in_collection_with_size_method
+      owner.should have_exactly(3).items_in_collection_with_count_method
     end
 
     it "converts :no to 0" do
       owner = create_collection_owner_with(0)
       owner.should have_exactly(:no).items_in_collection_with_length_method
       owner.should have_exactly(:no).items_in_collection_with_size_method
+      owner.should have_exactly(:no).items_in_collection_with_count_method
     end
 
     it "fails if target has a collection of items with < n members" do
@@ -173,6 +196,9 @@ describe "have matcher" do
       lambda {
         owner.should have_exactly(4).items_in_collection_with_size_method
       }.should fail_with("expected 4 items_in_collection_with_size_method, got 3")
+      lambda {
+        owner.should have_exactly(4).items_in_collection_with_count_method
+      }.should fail_with("expected 4 items_in_collection_with_count_method, got 3")
     end
 
     it "fails if target has a collection of items with > n members" do
@@ -183,6 +209,9 @@ describe "have matcher" do
       lambda {
         owner.should have_exactly(2).items_in_collection_with_size_method
       }.should fail_with("expected 2 items_in_collection_with_size_method, got 3")
+      lambda {
+        owner.should have_exactly(2).items_in_collection_with_count_method
+      }.should fail_with("expected 2 items_in_collection_with_count_method, got 3")
     end
   end
 
@@ -192,12 +221,14 @@ describe "have matcher" do
       owner = create_collection_owner_with(3)
       owner.should have_at_least(3).items_in_collection_with_length_method
       owner.should have_at_least(3).items_in_collection_with_size_method
+      owner.should have_at_least(3).items_in_collection_with_count_method
     end
 
     it "passes if target has a collection of items with > n members" do
       owner = create_collection_owner_with(3)
       owner.should have_at_least(2).items_in_collection_with_length_method
       owner.should have_at_least(2).items_in_collection_with_size_method
+      owner.should have_at_least(2).items_in_collection_with_count_method
     end
 
     it "fails if target has a collection of items with < n members" do
@@ -208,6 +239,9 @@ describe "have matcher" do
       lambda {
         owner.should have_at_least(4).items_in_collection_with_size_method
       }.should fail_with("expected at least 4 items_in_collection_with_size_method, got 3")
+      lambda {
+        owner.should have_at_least(4).items_in_collection_with_count_method
+      }.should fail_with("expected at least 4 items_in_collection_with_count_method, got 3")
     end
 
     it "provides educational negative failure messages" do
@@ -215,13 +249,15 @@ describe "have matcher" do
       owner = create_collection_owner_with(3)
       length_matcher = have_at_least(3).items_in_collection_with_length_method
       size_matcher = have_at_least(3).items_in_collection_with_size_method
+      count_matcher = have_at_least(3).items_in_collection_with_count_method
 
       #when
       length_matcher.matches?(owner)
       size_matcher.matches?(owner)
+      count_matcher.matches?(owner)
 
       #then
-      length_matcher.failure_message_for_should_not.should == <<-EOF
+      length_matcher.failure_message_for_should_not.should eq <<-EOF
 Isn't life confusing enough?
 Instead of having to figure out the meaning of this:
   should_not have_at_least(3).items_in_collection_with_length_method
@@ -229,12 +265,19 @@ We recommend that you use this instead:
   should have_at_most(2).items_in_collection_with_length_method
 EOF
 
-      size_matcher.failure_message_for_should_not.should == <<-EOF
+      size_matcher.failure_message_for_should_not.should eq <<-EOF
 Isn't life confusing enough?
 Instead of having to figure out the meaning of this:
   should_not have_at_least(3).items_in_collection_with_size_method
 We recommend that you use this instead:
   should have_at_most(2).items_in_collection_with_size_method
+EOF
+      count_matcher.failure_message_for_should_not.should eq <<-EOF
+Isn't life confusing enough?
+Instead of having to figure out the meaning of this:
+  should_not have_at_least(3).items_in_collection_with_count_method
+We recommend that you use this instead:
+  should have_at_most(2).items_in_collection_with_count_method
 EOF
     end
   end
@@ -244,6 +287,7 @@ EOF
       owner = create_collection_owner_with(3)
       owner.should have_at_most(3).items_in_collection_with_length_method
       owner.should have_at_most(3).items_in_collection_with_size_method
+      owner.should have_at_most(3).items_in_collection_with_count_method
     end
 
     it "fails if target has a collection of items with > n members" do
@@ -254,12 +298,16 @@ EOF
       lambda {
         owner.should have_at_most(2).items_in_collection_with_size_method
       }.should fail_with("expected at most 2 items_in_collection_with_size_method, got 3")
+      lambda {
+        owner.should have_at_most(2).items_in_collection_with_count_method
+      }.should fail_with("expected at most 2 items_in_collection_with_count_method, got 3")
     end
 
     it "passes if target has a collection of items with < n members" do
       owner = create_collection_owner_with(3)
       owner.should have_at_most(4).items_in_collection_with_length_method
       owner.should have_at_most(4).items_in_collection_with_size_method
+      owner.should have_at_most(4).items_in_collection_with_count_method
     end
 
     it "provides educational negative failure messages" do
@@ -267,13 +315,15 @@ EOF
       owner = create_collection_owner_with(3)
       length_matcher = have_at_most(3).items_in_collection_with_length_method
       size_matcher = have_at_most(3).items_in_collection_with_size_method
+      count_matcher = have_at_most(3).items_in_collection_with_count_method
 
       #when
       length_matcher.matches?(owner)
       size_matcher.matches?(owner)
+      count_matcher.matches?(owner)
 
       #then
-      length_matcher.failure_message_for_should_not.should == <<-EOF
+      length_matcher.failure_message_for_should_not.should eq <<-EOF
 Isn't life confusing enough?
 Instead of having to figure out the meaning of this:
   should_not have_at_most(3).items_in_collection_with_length_method
@@ -281,13 +331,21 @@ We recommend that you use this instead:
   should have_at_least(4).items_in_collection_with_length_method
 EOF
 
-      size_matcher.failure_message_for_should_not.should == <<-EOF
+      size_matcher.failure_message_for_should_not.should eq <<-EOF
 Isn't life confusing enough?
 Instead of having to figure out the meaning of this:
   should_not have_at_most(3).items_in_collection_with_size_method
 We recommend that you use this instead:
   should have_at_least(4).items_in_collection_with_size_method
 EOF
+
+      count_matcher.failure_message_for_should_not.should eq <<-EOF
+Isn't life confusing enough?
+Instead of having to figure out the meaning of this:
+  should_not have_at_most(3).items_in_collection_with_count_method
+We recommend that you use this instead:
+  should have_at_least(4).items_in_collection_with_count_method
+EOF
     end
   end
 
@@ -336,7 +394,6 @@ EOF
     before(:each) do
       @collection = Object.new
       def @collection.floozles; [1,2] end
-      def @collection.send(*args); raise "DOH! Library developers shouldn't use #send!" end
     end
 
     it "works in the straightforward case" do
@@ -364,7 +421,7 @@ EOF
     end
 
     it "does not respond_to? method_missing (because it's private)" do
-      formatter = described_class.new({ }, StringIO.new)
+      formatter = described_class.new(0, StringIO.new)
       formatter.should_not respond_to(:method_missing)
     end
 

data/spec/rspec/matchers/match_array_spec.rb

@@ -1,9 +1,6 @@
 require 'spec_helper'
 
 class UnsortableObject
-  # ruby-1.9.2 adds <=> to Object
-  undef_method :<=> rescue nil
-
   def initialize(id)
     @id = id
   end

data/spec/rspec/matchers/operator_matcher_spec.rb

@@ -151,11 +151,14 @@ end
 
 describe "should >=" do
   
-  it "passes if >= passes" do
-    4.should > 3
+  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
@@ -178,11 +181,14 @@ end
 
 describe "should <=" do
   
-  it "passes if <= passes" do
-    4.should <= 5
+  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

data/spec/rspec/matchers/raise_error_spec.rb

@@ -161,11 +161,11 @@ describe "should raise_error(NamedError, error_message) { |err| ... }" do
       raise "example message"
     }.should raise_error(RuntimeError, "example message") { |err|
       ran = true
-      err.class.should == RuntimeError
-      err.message.should == "example message"
+      err.class.should eq RuntimeError
+      err.message.should eq "example message"
     }
 
-    ran.should == true
+    ran.should be(true)
   end
 
   it "yielded block fails on it's own right" do
@@ -176,13 +176,13 @@ describe "should raise_error(NamedError, error_message) { |err| ... }" do
         raise "example message"
       }.should raise_error(RuntimeError, "example message") { |err|
         ran = true
-        5.should == 4
+        5.should eq 4
         passed = true
       }
     }.should fail_with(/expected: 4/m)
 
-    ran.should == true
-    passed.should == false
+    ran.should be(true)
+    passed.should be(false)
   end
 
   it "does NOT yield exception if no error was thrown" do

data/spec/support/classes.rb

@@ -7,34 +7,45 @@ module RSpec
         def size; @list.size; end
         def push(item); @list.push(item); end
       end
-      
+
       class CollectionWithLengthMethod
         def initialize; @list = []; end
         def length; @list.size; end
         def push(item); @list.push(item); end
       end
 
+      class CollectionWithCountMethod
+        def initialize; @list = []; end
+        def count; @list.count; end
+        def push(item); @list.push(item); end
+      end
+
       class CollectionOwner
-        attr_reader :items_in_collection_with_size_method, :items_in_collection_with_length_method
-      
+        attr_reader :items_in_collection_with_size_method, :items_in_collection_with_length_method, :items_in_collection_with_count_method
+
         def initialize
           @items_in_collection_with_size_method = CollectionWithSizeMethod.new
           @items_in_collection_with_length_method = CollectionWithLengthMethod.new
+          @items_in_collection_with_count_method = CollectionWithCountMethod.new
         end
-      
+
         def add_to_collection_with_size_method(item)
           @items_in_collection_with_size_method.push(item)
         end
-      
-        def add_to_collection_with_length_method(item)
-          @items_in_collection_with_length_method.push(item)
-        end
-      
+
+      def add_to_collection_with_length_method(item)
+        @items_in_collection_with_length_method.push(item)
+      end
+
+      def add_to_collection_with_count_method(item)
+        @items_in_collection_with_count_method.push(item)
+      end
+
         def items_for(arg)
           return [1, 2, 3] if arg == 'a'
           [1]
         end
-      
+
         def items
           @items_in_collection_with_size_method
         end

metadata

@@ -1,13 +1,15 @@
 --- !ruby/object:Gem::Specification 
 name: rspec-expectations
 version: !ruby/object:Gem::Version 
-  hash: 23
-  prerelease: 
+  hash: 15424039
+  prerelease: 6
   segments: 
   - 2
-  - 6
+  - 7
   - 0
-  version: 2.6.0
+  - rc
+  - 1
+  version: 2.7.0.rc1
 platform: ruby
 authors: 
 - David Chelimsky
@@ -16,10 +18,12 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-05-12 00:00:00 -05:00
-default_executable: 
+date: 2011-10-09 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
+  type: :runtime
+  prerelease: false
+  name: diff-lcs
   version_requirements: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -31,10 +35,7 @@ dependencies:
         - 1
         - 2
         version: 1.1.2
-  prerelease: false
-  type: :runtime
   requirement: *id001
-  name: diff-lcs
 description: rspec expectations (should[_not] and matchers)
 email: dchelimsky@gmail.com;chad.humphries@gmail.com
 executables: []
@@ -44,56 +45,15 @@ extensions: []
 extra_rdoc_files: 
 - README.md
 files: 
-- .document
-- .gitignore
-- .travis.yml
-- Gemfile
-- Guardfile
-- License.txt
-- README.md
-- Rakefile
-- cucumber.yml
-- features/.nav
-- features/Changelog.md
-- features/README.markdown
-- 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/equality.feature
-- features/built_in_matchers/exist.feature
-- features/built_in_matchers/expect_change.feature
-- features/built_in_matchers/expect_error.feature
-- features/built_in_matchers/have.feature
-- features/built_in_matchers/include.feature
-- features/built_in_matchers/match.feature
-- features/built_in_matchers/operators.feature
-- features/built_in_matchers/predicates.feature
-- features/built_in_matchers/respond_to.feature
-- features/built_in_matchers/satisfy.feature
-- features/built_in_matchers/throw_symbol.feature
-- features/built_in_matchers/types.feature
-- features/custom_matchers/access_running_example.feature
-- features/custom_matchers/define_diffable_matcher.feature
-- features/custom_matchers/define_matcher.feature
-- features/custom_matchers/define_matcher_outside_rspec.feature
-- features/custom_matchers/define_matcher_with_fluent_interface.feature
-- features/customized_message.feature
-- features/diffing.feature
-- features/implicit_docstrings.feature
-- features/step_definitions/additional_cli_steps.rb
-- features/support/env.rb
-- features/test_frameworks/test_unit.feature
 - lib/rspec-expectations.rb
 - lib/rspec/expectations.rb
-- lib/rspec/expectations/backward_compatibility.rb
 - lib/rspec/expectations/deprecation.rb
 - lib/rspec/expectations/differ.rb
 - lib/rspec/expectations/errors.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/version.rb
@@ -113,7 +73,7 @@ files:
 - lib/rspec/matchers/equal.rb
 - lib/rspec/matchers/errors.rb
 - lib/rspec/matchers/exist.rb
-- lib/rspec/matchers/extensions/instance_exec.rb
+- lib/rspec/matchers/extensions/instance_eval_with_args.rb
 - lib/rspec/matchers/generated_descriptions.rb
 - lib/rspec/matchers/has.rb
 - lib/rspec/matchers/have.rb
@@ -128,7 +88,37 @@ files:
 - lib/rspec/matchers/respond_to.rb
 - lib/rspec/matchers/satisfy.rb
 - lib/rspec/matchers/throw_symbol.rb
-- rspec-expectations.gemspec
+- README.md
+- features/README.markdown
+- 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/equality.feature
+- features/built_in_matchers/exist.feature
+- features/built_in_matchers/expect_change.feature
+- features/built_in_matchers/expect_error.feature
+- features/built_in_matchers/have.feature
+- features/built_in_matchers/include.feature
+- features/built_in_matchers/match.feature
+- features/built_in_matchers/operators.feature
+- features/built_in_matchers/predicates.feature
+- features/built_in_matchers/respond_to.feature
+- features/built_in_matchers/satisfy.feature
+- features/built_in_matchers/throw_symbol.feature
+- features/built_in_matchers/types.feature
+- features/custom_matchers/access_running_example.feature
+- features/custom_matchers/define_diffable_matcher.feature
+- features/custom_matchers/define_matcher.feature
+- features/custom_matchers/define_matcher_outside_rspec.feature
+- features/custom_matchers/define_matcher_with_fluent_interface.feature
+- features/customized_message.feature
+- features/diffing.feature
+- features/implicit_docstrings.feature
+- features/step_definitions/additional_cli_steps.rb
+- features/support/env.rb
+- features/test_frameworks/test_unit.feature
 - spec/rspec/expectations/differ_spec.rb
 - spec/rspec/expectations/extensions/kernel_spec.rb
 - spec/rspec/expectations/fail_with_spec.rb
@@ -164,8 +154,6 @@ files:
 - spec/support/classes.rb
 - spec/support/matchers.rb
 - spec/support/ruby_version.rb
-- specs.watchr
-has_rdoc: true
 homepage: http://github.com/rspec/rspec-expectations
 licenses: []
 
@@ -186,21 +174,22 @@ required_ruby_version: !ruby/object:Gem::Requirement
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version 
-      hash: 3
+      hash: 25
       segments: 
-      - 0
-      version: "0"
+      - 1
+      - 3
+      - 1
+      version: 1.3.1
 requirements: []
 
 rubyforge_project: rspec
-rubygems_version: 1.6.2
+rubygems_version: 1.8.6
 signing_key: 
 specification_version: 3
-summary: rspec-expectations-2.6.0
+summary: rspec-expectations-2.7.0.rc1
 test_files: 
-- features/Changelog.md
 - features/README.markdown
 - features/Upgrade.md
 - features/built_in_matchers/README.md