rspec-expectations 2.0.0.a1 → 2.0.0.a2

data/spec/rspec/matchers/respond_to_spec.rb

@@ -0,0 +1,116 @@
+require File.dirname(__FILE__) + '/../../spec_helper.rb'
+
+describe "should respond_to(:sym)" do
+  
+  it "passes if target responds to :sym" do
+    Object.new.should respond_to(:methods)
+  end
+  
+  it "fails if target does not respond to :sym" do
+    lambda {
+      "this string".should respond_to(:some_method)
+    }.should fail_with(%q|expected "this string" to respond to :some_method|)
+  end
+  
+end
+
+describe "should respond_to(:sym).with(1).argument" do
+  it "passes if target responds to :sym with 1 arg" do
+    obj = Object.new
+    def obj.foo(arg); end
+    obj.should respond_to(:foo).with(1).argument
+  end
+  
+  it "fails if target does not respond to :sym" do
+    obj = Object.new
+    lambda {
+      obj.should respond_to(:some_method).with(1).argument
+    }.should fail_with(/expected .* to respond to :some_method/)
+  end
+  
+  it "fails if :sym expects 0 args" do
+    obj = Object.new
+    def obj.foo; end
+    lambda {
+      obj.should respond_to(:foo).with(1).argument
+    }.should fail_with(/expected #<Object.*> to respond to :foo with 1 argument/)
+  end
+  
+  it "fails if :sym expects 2 args" do
+    obj = Object.new
+    def obj.foo(arg, arg2); end
+    lambda {
+      obj.should respond_to(:foo).with(1).argument
+    }.should fail_with(/expected #<Object.*> to respond to :foo with 1 argument/)
+  end
+end
+
+describe "should respond_to(message1, message2)" do
+  
+  it "passes if target responds to both messages" do
+    Object.new.should respond_to('methods', 'inspect')
+  end
+  
+  it "fails if target does not respond to first message" do
+    lambda {
+      Object.new.should respond_to('method_one', 'inspect')
+    }.should fail_with(/expected #<Object:.*> to respond to "method_one"/)
+  end
+  
+  it "fails if target does not respond to second message" do
+    lambda {
+      Object.new.should respond_to('inspect', 'method_one')
+    }.should fail_with(/expected #<Object:.*> to respond to "method_one"/)
+  end
+  
+  it "fails if target does not respond to either message" do
+    lambda {
+      Object.new.should respond_to('method_one', 'method_two')
+    }.should fail_with(/expected #<Object:.*> to respond to "method_one", "method_two"/)
+  end
+end
+
+describe "should respond_to(:sym).with(2).arguments" do
+  it "passes if target responds to :sym with 2 args" do
+    obj = Object.new
+    def obj.foo(a1, a2); end
+    obj.should respond_to(:foo).with(2).arguments
+  end
+  
+  it "fails if target does not respond to :sym" do
+    obj = Object.new
+    lambda {
+      obj.should respond_to(:some_method).with(2).arguments
+    }.should fail_with(/expected .* to respond to :some_method/)
+  end
+  
+  it "fails if :sym expects 0 args" do
+    obj = Object.new
+    def obj.foo; end
+    lambda {
+      obj.should respond_to(:foo).with(2).arguments
+    }.should fail_with(/expected #<Object.*> to respond to :foo with 2 arguments/)
+  end
+  
+  it "fails if :sym expects 2 args" do
+    obj = Object.new
+    def obj.foo(arg); end
+    lambda {
+      obj.should respond_to(:foo).with(2).arguments
+    }.should fail_with(/expected #<Object.*> to respond to :foo with 2 arguments/)
+  end
+end
+
+describe "should_not respond_to(:sym)" do
+  
+  it "passes if target does not respond to :sym" do
+    Object.new.should_not respond_to(:some_method)
+  end
+  
+  it "fails if target responds to :sym" do
+    lambda {
+      Object.new.should_not respond_to(:methods)
+    }.should fail_with(/expected #<Object:.*> not to respond to :methods/)
+  end
+  
+end

data/spec/rspec/matchers/satisfy_spec.rb

@@ -0,0 +1,36 @@
+require File.dirname(__FILE__) + '/../../spec_helper.rb'
+
+describe "should satisfy { block }" do
+  it "should pass if block returns true" do
+    true.should satisfy { |val| val }
+    true.should satisfy do |val|
+      val
+    end
+  end
+
+  it "should fail if block returns false" do
+    lambda {
+      false.should satisfy { |val| val }
+    }.should fail_with("expected false to satisfy block")
+    lambda do
+      false.should satisfy do |val|
+        val
+      end
+    end.should fail_with("expected false to satisfy block")
+  end
+end
+
+describe "should_not satisfy { block }" do
+  it "should pass if block returns false" do
+    false.should_not satisfy { |val| val }
+    false.should_not satisfy do |val|
+      val
+    end
+  end
+
+  it "should fail if block returns true" do
+    lambda {
+      true.should_not satisfy { |val| val }
+    }.should fail_with("expected true not to satisfy block")
+  end
+end

data/spec/rspec/matchers/throw_symbol_spec.rb

@@ -0,0 +1,96 @@
+require File.dirname(__FILE__) + '/../../spec_helper.rb'
+
+module Rspec
+  module Matchers
+    describe ThrowSymbol do
+      describe "with no args" do
+        before(:each) { @matcher = ThrowSymbol.new }
+      
+        it "should match if any Symbol is thrown" do
+          @matcher.matches?(lambda{ throw :sym }).should be_true
+        end
+        it "should match if any Symbol is thrown with an arg" do
+          @matcher.matches?(lambda{ throw :sym, "argument" }).should be_true
+        end
+        it "should not match if no Symbol is thrown" do
+          @matcher.matches?(lambda{ }).should be_false
+        end
+        it "should provide a failure message" do
+          @matcher.matches?(lambda{})
+          @matcher.failure_message_for_should.should == "expected a Symbol but nothing was thrown"
+        end
+        it "should provide a negative failure message" do
+          @matcher.matches?(lambda{ throw :sym})
+          @matcher.failure_message_for_should_not.should == "expected no Symbol, got :sym"
+        end
+      end
+          
+      describe "with a symbol" do
+        before(:each) { @matcher = ThrowSymbol.new(:sym) }
+      
+        it "should match if correct Symbol is thrown" do
+          @matcher.matches?(lambda{ throw :sym }).should be_true
+        end
+        it "should match if correct Symbol is thrown with an arg" do
+          @matcher.matches?(lambda{ throw :sym, "argument" }).should be_true
+        end
+        it "should not match if no Symbol is thrown" do
+          @matcher.matches?(lambda{ }).should be_false
+        end
+        it "should not match if correct Symbol is thrown" do
+          @matcher.matches?(lambda{ throw :other_sym }).should be_false
+        end
+        it "should provide a failure message when no Symbol is thrown" do
+          @matcher.matches?(lambda{})
+          @matcher.failure_message_for_should.should == "expected :sym but nothing was thrown"
+        end
+        it "should provide a failure message when wrong Symbol is thrown" do
+          @matcher.matches?(lambda{ throw :other_sym })
+          @matcher.failure_message_for_should.should == "expected :sym, got :other_sym"
+        end
+        it "should provide a negative failure message" do
+          @matcher.matches?(lambda{ throw :sym })
+          @matcher.failure_message_for_should_not.should == "expected :sym not to be thrown"
+        end
+        it "should only match NameErrors raised by uncaught throws" do
+          @matcher.matches?(lambda{ sym }).should be_false
+        end
+      end
+
+      describe "with a symbol and an arg" do
+        before(:each) { @matcher = ThrowSymbol.new(:sym, "a") }
+    
+        it "should match if correct Symbol and args are thrown" do
+          @matcher.matches?(lambda{ throw :sym, "a" }).should be_true
+        end
+        it "should not match if nothing is thrown" do
+          @matcher.matches?(lambda{ }).should be_false
+        end
+        it "should not match if other Symbol is thrown" do
+          @matcher.matches?(lambda{ throw :other_sym, "a" }).should be_false
+        end
+        it "should not match if no arg is thrown" do
+          @matcher.matches?(lambda{ throw :sym }).should be_false
+        end
+        it "should not match if wrong arg is thrown" do
+          @matcher.matches?(lambda{ throw :sym, "b" }).should be_false
+        end
+        it "should provide a failure message when no Symbol is thrown" do
+          @matcher.matches?(lambda{})
+          @matcher.failure_message_for_should.should == %q[expected :sym with "a" but nothing was thrown]
+        end
+        it "should provide a failure message when wrong Symbol is thrown" do
+          @matcher.matches?(lambda{ throw :other_sym })
+          @matcher.failure_message_for_should.should == %q[expected :sym with "a", got :other_sym]
+        end
+        it "should provide a negative failure message" do
+          @matcher.matches?(lambda{ throw :sym })
+          @matcher.failure_message_for_should_not.should == %q[expected :sym with "a" not to be thrown]
+        end
+        it "should only match NameErrors raised by uncaught throws" do
+          @matcher.matches?(lambda{ sym }).should be_false
+        end
+      end
+    end
+  end
+end

data/spec/spec_helper.rb

@@ -5,6 +5,14 @@ require 'rspec/expectations'
 require 'rspec/mocks'
 require 'rspec/core'
 
+Dir['./spec/support/**/*'].each do |f|
+  require f
+end
+
+def with_ruby(version)
+  yield if RUBY_PLATFORM =~ Regexp.compile("^#{version}")
+end
+
 module Rspec
   module Ruby
     class << self
@@ -17,6 +25,10 @@ end
 
 module Rspec  
   module Matchers
+    def fail
+      raise_error(Rspec::Expectations::ExpectationNotMetError)
+    end
+
     def fail_with(message)
       raise_error(Rspec::Expectations::ExpectationNotMetError, message)
     end
@@ -28,4 +40,4 @@ Rspec::Core::configure do |config|
   config.include Rspec::Mocks::Methods
   config.include Rspec::Matchers
   config.color_enabled = true
-end
+end

data/spec/support/classes.rb

@@ -0,0 +1,51 @@
+# This file contains various classes used by the specs.
+module Rspec
+  module Expectations
+    # class ClassWithMultiWordPredicate
+    #   def multi_word_predicate?
+    #     true 
+    #   end
+    # end
+    # 
+    module Helper
+      class CollectionWithSizeMethod
+        def initialize; @list = []; end
+        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 CollectionOwner
+        attr_reader :items_in_collection_with_size_method, :items_in_collection_with_length_method
+      
+        def initialize
+          @items_in_collection_with_size_method = CollectionWithSizeMethod.new
+          @items_in_collection_with_length_method = CollectionWithLengthMethod.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 items_for(arg)
+          return [1, 2, 3] if arg == 'a'
+          [1]
+        end
+      
+        def items
+          @items_in_collection_with_size_method
+        end
+      end
+
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: rspec-expectations
 version: !ruby/object:Gem::Version 
-  version: 2.0.0.a1
+  version: 2.0.0.a2
 platform: ruby
 authors: 
 - David Chelimsky
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-09-16 00:00:00 -04:00
+date: 2010-01-24 00:00:00 -06:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -21,7 +21,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 2.0.0.a1
+        version: 2.0.0.a2
     version: 
 - !ruby/object:Gem::Dependency 
   name: rspec-mocks
@@ -31,7 +31,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 2.0.0.a1
+        version: 2.0.0.a2
     version: 
 description: 
 email: dchelimsky@gmail.com;chad.humphries@gmail.com
@@ -47,16 +47,17 @@ files:
 - License.txt
 - README.markdown
 - Rakefile
-- VERSION
-- VERSION.yml
+- Upgrade.markdown
 - lib/rspec/expectations.rb
 - lib/rspec/expectations/differs/default.rb
 - lib/rspec/expectations/differs/load-diff-lcs.rb
 - lib/rspec/expectations/errors.rb
 - lib/rspec/expectations/extensions.rb
 - lib/rspec/expectations/extensions/kernel.rb
+- lib/rspec/expectations/extensions/rspec/core/example_group.rb
 - lib/rspec/expectations/fail_with.rb
 - lib/rspec/expectations/handler.rb
+- lib/rspec/expectations/version.rb
 - lib/rspec/matchers.rb
 - lib/rspec/matchers/be.rb
 - lib/rspec/matchers/be_close.rb
@@ -83,19 +84,40 @@ files:
 - lib/rspec/matchers/raise_error.rb
 - lib/rspec/matchers/respond_to.rb
 - lib/rspec/matchers/satisfy.rb
-- lib/rspec/matchers/simple_matcher.rb
 - lib/rspec/matchers/throw_symbol.rb
-- lib/rspec/matchers/wrap_expectation.rb
 - rspec-expectations.gemspec
 - spec/rspec/expectations/differs/default_spec.rb
 - spec/rspec/expectations/extensions/kernel_spec.rb
 - spec/rspec/expectations/fail_with_spec.rb
 - spec/rspec/expectations/handler_spec.rb
-- spec/rspec/expectations/wrap_expectation_spec.rb
+- spec/rspec/matchers/be_close_spec.rb
+- spec/rspec/matchers/be_instance_of_spec.rb
+- spec/rspec/matchers/be_kind_of_spec.rb
+- spec/rspec/matchers/be_spec.rb
+- spec/rspec/matchers/change_spec.rb
+- spec/rspec/matchers/compatibility_spec.rb
+- spec/rspec/matchers/description_generation_spec.rb
+- spec/rspec/matchers/dsl_spec.rb
+- spec/rspec/matchers/eql_spec.rb
+- spec/rspec/matchers/equal_spec.rb
+- spec/rspec/matchers/exist_spec.rb
+- spec/rspec/matchers/has_spec.rb
+- spec/rspec/matchers/have_spec.rb
+- spec/rspec/matchers/include_spec.rb
+- spec/rspec/matchers/match_array_spec.rb
+- spec/rspec/matchers/match_spec.rb
+- spec/rspec/matchers/matcher_methods_spec.rb
+- spec/rspec/matchers/matcher_spec.rb
+- spec/rspec/matchers/matchers_spec.rb
+- spec/rspec/matchers/operator_matcher_spec.rb
+- spec/rspec/matchers/raise_error_spec.rb
+- spec/rspec/matchers/respond_to_spec.rb
+- spec/rspec/matchers/satisfy_spec.rb
+- spec/rspec/matchers/throw_symbol_spec.rb
 - spec/spec.opts
 - spec/spec_helper.rb
 - spec/suite.rb
-- spec/support/macros.rb
+- spec/support/classes.rb
 has_rdoc: true
 homepage: http://github.com/rspec/expectations
 licenses: []
@@ -113,13 +135,13 @@ required_ruby_version: !ruby/object:Gem::Requirement
   version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
   requirements: 
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version 
-      version: "0"
+      version: 1.3.1
   version: 
 requirements: []
 
-rubyforge_project: 
+rubyforge_project: rspec
 rubygems_version: 1.3.5
 signing_key: 
 specification_version: 3
@@ -129,7 +151,30 @@ test_files:
 - spec/rspec/expectations/extensions/kernel_spec.rb
 - spec/rspec/expectations/fail_with_spec.rb
 - spec/rspec/expectations/handler_spec.rb
-- spec/rspec/expectations/wrap_expectation_spec.rb
+- spec/rspec/matchers/be_close_spec.rb
+- spec/rspec/matchers/be_instance_of_spec.rb
+- spec/rspec/matchers/be_kind_of_spec.rb
+- spec/rspec/matchers/be_spec.rb
+- spec/rspec/matchers/change_spec.rb
+- spec/rspec/matchers/compatibility_spec.rb
+- spec/rspec/matchers/description_generation_spec.rb
+- spec/rspec/matchers/dsl_spec.rb
+- spec/rspec/matchers/eql_spec.rb
+- spec/rspec/matchers/equal_spec.rb
+- spec/rspec/matchers/exist_spec.rb
+- spec/rspec/matchers/has_spec.rb
+- spec/rspec/matchers/have_spec.rb
+- spec/rspec/matchers/include_spec.rb
+- spec/rspec/matchers/match_array_spec.rb
+- spec/rspec/matchers/match_spec.rb
+- spec/rspec/matchers/matcher_methods_spec.rb
+- spec/rspec/matchers/matcher_spec.rb
+- spec/rspec/matchers/matchers_spec.rb
+- spec/rspec/matchers/operator_matcher_spec.rb
+- spec/rspec/matchers/raise_error_spec.rb
+- spec/rspec/matchers/respond_to_spec.rb
+- spec/rspec/matchers/satisfy_spec.rb
+- spec/rspec/matchers/throw_symbol_spec.rb
 - spec/spec_helper.rb
 - spec/suite.rb
-- spec/support/macros.rb
+- spec/support/classes.rb