rspec-expectations 2.0.0 → 2.0.1

data/History.markdown

@@ -1,5 +1,12 @@
 ## rspec-expectations release history (incomplete)
 
+### 2.0.1 / 2010-10-18
+
+[full changelog](http://github.com/rspec/rspec-expectations/compare/v2.0.0...v2.0.1)
+
+* Enhancements
+  * Make dependencies on other rspec gems consistent across gems
+
 ### 2.0.0 / 2010-10-10
 
 [full changelog](http://github.com/rspec/rspec-expectations/compare/v2.0.0.rc...v2.0.0)

data/features/matchers/types.feature

@@ -0,0 +1,114 @@
+Feature: Type Check matchers
+
+  rspec-expectations includes two matchers specify types of objects:
+
+    * obj.should be_kind_of(type): calls obj.kind_of?(type), which returns
+      true if type is in obj's class hierarchy or is a module and is
+      included in a class in obj's class hierarchy.
+    * obj.should be_instance_of(type): calls obj.instance_of?(type), which
+      returns true if and only if type if obj's class.
+
+  Both of these matchers have aliases:
+
+    * obj.should be_a_kind_of(type) # same as obj.should be_kind_of(type)
+    * obj.should be_a(type) # same as obj.should be_kind_of(type)
+    * obj.should be_an(type) # same as obj.should be_kind_of(type)
+    * obj.should be_an_instance_of(type) # same as obj.should be_instance_of(type)
+
+  Scenario: be_(a_)kind_of matcher
+    Given a file named "be_kind_of_matcher_spec.rb" with:
+      """
+      module MyModule; end
+
+      class Fixnum
+        include MyModule
+      end
+
+      describe 17 do
+        # the actual class
+        it { should be_kind_of(Fixnum) }
+        it { should be_a_kind_of(Fixnum) }
+        it { should be_a(Fixnum) }
+
+        # the superclass
+        it { should be_kind_of(Integer) }
+        it { should be_a_kind_of(Integer) }
+        it { should be_an(Integer) }
+
+        # an included module
+        it { should be_kind_of(MyModule) }
+        it { should be_a_kind_of(MyModule) }
+        it { should be_a(MyModule) }
+
+        # negative passing case
+        it { should_not be_kind_of(String) }
+        it { should_not be_a_kind_of(String) }
+        it { should_not be_a(String) }
+
+        # deliberate failures
+        it { should_not be_kind_of(Fixnum) }
+        it { should_not be_a_kind_of(Fixnum) }
+        it { should_not be_a(Fixnum) }
+        it { should_not be_kind_of(Integer) }
+        it { should_not be_a_kind_of(Integer) }
+        it { should_not be_an(Integer) }
+        it { should_not be_kind_of(MyModule) }
+        it { should_not be_a_kind_of(MyModule) }
+        it { should_not be_a(MyModule) }
+        it { should be_kind_of(String) }
+        it { should be_a_kind_of(String) }
+        it { should be_a(String) }
+      end
+      """
+    When I run "rspec be_kind_of_matcher_spec.rb"
+    Then the output should contain all of these:
+      | 24 examples, 12 failures                 |
+      | expected 17 not to be a kind of Fixnum   |
+      | expected 17 not to be a kind of Integer  |
+      | expected 17 not to be a kind of MyModule |
+      | expected 17 to be a kind of String       |
+
+  Scenario: be_(an_)instance_of matcher
+    Given a file named "be_instance_of_matcher_spec.rb" with:
+      """
+      module MyModule; end
+
+      class Fixnum
+        include MyModule
+      end
+
+      describe 17 do
+        # the actual class
+        it { should be_instance_of(Fixnum) }
+        it { should be_an_instance_of(Fixnum) }
+
+        # the superclass
+        it { should_not be_instance_of(Integer) }
+        it { should_not be_an_instance_of(Integer) }
+
+        # an included module
+        it { should_not be_instance_of(MyModule) }
+        it { should_not be_an_instance_of(MyModule) }
+
+        # another class with no relation to the subject's hierarchy
+        it { should_not be_instance_of(String) }
+        it { should_not be_an_instance_of(String) }
+
+        # deliberate failures
+        it { should_not be_instance_of(Fixnum) }
+        it { should_not be_an_instance_of(Fixnum) }
+        it { should be_instance_of(Integer) }
+        it { should be_an_instance_of(Integer) }
+        it { should be_instance_of(MyModule) }
+        it { should be_an_instance_of(MyModule) }
+        it { should be_instance_of(String) }
+        it { should be_an_instance_of(String) }
+      end
+      """
+    When I run "rspec be_instance_of_matcher_spec.rb"
+    Then the output should contain all of these:
+      | 16 examples, 8 failures                     |
+      | expected 17 not to be an instance of Fixnum |
+      | expected 17 to be an instance of Integer    |
+      | expected 17 to be an instance of MyModule   |
+      | expected 17 to be an instance of String     |

data/features/test_frameworks/test_unit.feature

@@ -12,6 +12,15 @@ Feature: Test::Unit integration
       require 'rspec/expectations'
 
       class RSpecExpectationsTest < Test::Unit::TestCase
+        RSpec::Matchers.define :be_an_integer do
+          match { |actual| Integer === actual }
+        end
+
+        def be_an_int
+          RSpec.deprecate(:be_an_int, :be_an_integer)
+          be_an_integer
+        end
+
         def test_passing_expectation
           x = 1 + 3
           x.should == 4
@@ -21,9 +30,13 @@ Feature: Test::Unit integration
           array = [1, 2]
           array.should be_empty
         end
+
+        def test_custom_matcher_and_deprecation_warning
+          1.should be_an_int
+        end
       end
       """
      When I run "ruby rspec_expectations_test.rb"
-     Then the output should contain "2 tests"
-      And the output should contain "1 failure" or "1 error"
+     Then the output should contain "3 tests, 0 assertions, 1 failures, 0 errors" or "3 tests, 0 assertions, 0 failures, 1 errors"
       And the output should contain "expected empty? to return true, got false"
+      And the output should contain "be_an_int is deprecated"

data/lib/rspec/expectations.rb

@@ -1,6 +1,7 @@
 require 'rspec/matchers'
 require 'rspec/expectations/fail_with'
 require 'rspec/expectations/errors'
+require 'rspec/expectations/deprecation'
 require 'rspec/expectations/extensions'
 require 'rspec/expectations/handler'
 require 'rspec/expectations/version'

data/lib/rspec/expectations/deprecation.rb

@@ -0,0 +1,36 @@
+module RSpec
+
+  # This is defined in rspec-core, but we can't assume it's loaded since
+  # rspec-expectations should be usable w/o rspec-core.
+  unless respond_to?(:deprecate)
+    class << self
+      def deprecate(method, alternate_method=nil, version=nil)
+        version_string = version ? "rspec-#{version}" : "a future version of RSpec"
+
+        message = <<-NOTICE
+
+*****************************************************************
+DEPRECATION WARNING: you are using deprecated behaviour that will
+be removed from #{version_string}.
+
+#{caller(0)[2]}
+
+* #{method} is deprecated.
+NOTICE
+      if alternate_method
+        message << <<-ADDITIONAL
+* please use #{alternate_method} instead.
+ADDITIONAL
+      end
+
+        message << "*****************************************************************"
+        warn_deprecation(message)
+      end
+
+      def warn_deprecation(message)
+        send :warn, message
+      end
+    end
+  end
+end
+

data/lib/rspec/expectations/version.rb

@@ -1,7 +1,7 @@
 module RSpec # :nodoc:
   module Expectations # :nodoc:
     module Version # :nodoc:
-      STRING = '2.0.0'
+      STRING = '2.0.1'
     end
   end
 end

data/rspec-expectations.gemspec

@@ -25,7 +25,7 @@ Gem::Specification.new do |s|
   s.add_runtime_dependency     'diff-lcs',    '>= 1.1.2'
   s.add_development_dependency 'cucumber',    ">= 0.6.2"
   s.add_development_dependency 'aruba',       ">= 0.1.1"
-  s.add_development_dependency 'rspec-core',  ">= #{RSpec::Expectations::Version::STRING}"
-  s.add_development_dependency 'rspec-mocks', ">= #{RSpec::Expectations::Version::STRING}"
+  s.add_development_dependency 'rspec-core',  "~> 2.0.1"
+  s.add_development_dependency 'rspec-mocks', "~> 2.0.1"
 end
 

metadata

@@ -1,12 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: rspec-expectations
 version: !ruby/object:Gem::Version 
+  hash: 13
   prerelease: false
   segments: 
   - 2
   - 0
-  - 0
-  version: 2.0.0
+  - 1
+  version: 2.0.1
 platform: ruby
 authors: 
 - David Chelimsky
@@ -15,84 +16,89 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-10-10 00:00:00 -05:00
+date: 2010-10-18 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: diff-lcs
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  version_requirements: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 23
         segments: 
         - 1
         - 1
         - 2
         version: 1.1.2
+  requirement: *id001
   type: :runtime
+  name: diff-lcs
   prerelease: false
-  version_requirements: *id001
 - !ruby/object:Gem::Dependency 
-  name: cucumber
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
         segments: 
         - 0
         - 6
         - 2
         version: 0.6.2
+  requirement: *id002
   type: :development
+  name: cucumber
   prerelease: false
-  version_requirements: *id002
 - !ruby/object:Gem::Dependency 
-  name: aruba
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  version_requirements: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 25
         segments: 
         - 0
         - 1
         - 1
         version: 0.1.1
+  requirement: *id003
   type: :development
+  name: aruba
   prerelease: false
-  version_requirements: *id003
 - !ruby/object:Gem::Dependency 
-  name: rspec-core
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  version_requirements: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version 
+        hash: 13
         segments: 
         - 2
         - 0
-        - 0
-        version: 2.0.0
+        - 1
+        version: 2.0.1
+  requirement: *id004
   type: :development
+  name: rspec-core
   prerelease: false
-  version_requirements: *id004
 - !ruby/object:Gem::Dependency 
-  name: rspec-mocks
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  version_requirements: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version 
+        hash: 13
         segments: 
         - 2
         - 0
-        - 0
-        version: 2.0.0
+        - 1
+        version: 2.0.1
+  requirement: *id005
   type: :development
+  name: rspec-mocks
   prerelease: false
-  version_requirements: *id005
 description: rspec expectations (should[_not] and matchers)
 email: dchelimsky@gmail.com;chad.humphries@gmail.com
 executables: []
@@ -129,12 +135,14 @@ files:
 - features/matchers/operators.feature
 - features/matchers/predicates.feature
 - features/matchers/respond_to.feature
+- features/matchers/types.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
@@ -219,7 +227,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: -4161069882601304184
+      hash: 3
       segments: 
       - 0
       version: "0"
@@ -228,7 +236,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: -4161069882601304184
+      hash: 3
       segments: 
       - 0
       version: "0"
@@ -238,7 +246,7 @@ rubyforge_project: rspec
 rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
-summary: rspec-expectations-2.0.0
+summary: rspec-expectations-2.0.1
 test_files: 
 - features/README.markdown
 - features/expectations/attribute_of_subject.feature
@@ -258,6 +266,7 @@ test_files:
 - features/matchers/operators.feature
 - features/matchers/predicates.feature
 - features/matchers/respond_to.feature
+- features/matchers/types.feature
 - features/step_definitions/additional_cli_steps.rb
 - features/support/env.rb
 - features/test_frameworks/test_unit.feature