rspec-expectations 2.1.0 → 2.2.0

data/Gemfile

@@ -5,7 +5,7 @@ source "http://rubygems.org"
 end
 
 gem "rake"
-gem "cucumber", "0.8.5"
+gem "cucumber", "0.9.4"
 gem "aruba", "0.2.2"
 gem "autotest"
 gem "diff-lcs"

data/History.markdown

@@ -1,5 +1,9 @@
 ## rspec-expectations release history (incomplete)
 
+### 2.2.0 / 2010-11-28
+
+[full changelog](http://github.com/rspec/rspec-expectations/compare/v2.1.0...v2.2.0)
+
 ### 2.1.0 / 2010-11-07
 
 [full changelog](http://github.com/rspec/rspec-expectations/compare/v2.0.1...v2.1.0)

data/License.txt

@@ -1,6 +1,6 @@
 (The MIT License)
 
-Copyright (c) 2005-2010 The RSpec Development Team
+Copyright (c) 2005 The RSpec Development Team
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

data/{README.markdown → README.md}

@@ -5,13 +5,21 @@ RSpec::Matchers, a library of standard matchers.
 
 ## Documentation
 
-* [Cucumber features](http://relishapp.com/rspec/rspec-expectations/v/2-0)
-* [RDoc](http://rubydoc.info/gems/rspec-expectations/2.0.1/frames)
+The [Cucumber features](http://relishapp.com/rspec/rspec-expectations/v/2-1)
+are the most comprehensive and up-to-date docs for end-users.
+
+The [RDoc](http://rubydoc.info/gems/rspec-expectations/2.1/frames) provides
+additional information for contributors and/or extenders.
+
+All of the documentation is open source and a work in progress. If you find it
+lacking or confusing, you can help improve it by submitting requests and
+patches to the [rspec-expectations issue
+tracker](https://github.com/rspec/rspec-expectations/issues).
 
 ## Install
 
     gem install rspec               # for rspec-core, rspec-expectations, rspec-mocks
-    gem install rspec-expecctations # for rspec-core only
+    gem install rspec-expecctations # for rspec-expectations only
 
 ## Matchers
 

data/features/expectations/customized_message.feature

@@ -1,54 +1,22 @@
 Feature: customized message
 
-  In order to get the feedback I want
-  As an RSpec user
-  I want to customize the failure message per example
+  RSpec tries to provide useful failure messages, but for cases in which you
+  want more specific information, you can define your own message right in the
+  example. This works for any matcher _other than the operator matchers_.
   
-  Scenario: one additional method
-    Given a file named "node_spec.rb" with:
+  Scenario: customize failure message
+    Given a file named "example_spec.rb" with:
       """
-      class Node
-        def initialize(state=:waiting)
-          @state = state
-        end
-        def state
-          @state
-        end
-        def waiting?
-          @state == :waiting
-        end
-        def started?
-          @state == :started
-        end
-        def start
-          @state = :started
-        end
-      end
-
-      describe "a new Node" do
-        it "should be waiting" do
-          node = Node.new(:started) #start w/ started to trigger failure
-          node.should be_waiting, "node.state: #{node.state} (first example)"
-        end
-
-        it "should not be started" do
-          node = Node.new(:started) #start w/ started to trigger failure
-          node.should_not be_started, "node.state: #{node.state} (second example)"
-        end
-      end
-
-      describe "node.start" do
-        it "should change the state" do
-          node = Node.new(:started) #start w/ started to trigger failure
-          lambda {node.start}.should change{node.state}, "expected a change"
+      describe Array do
+        context "when created with `new`" do
+          it "is empty" do
+            array = Array.new
+            array << 1 # trigger a failure to demonstrate the message
+            array.should be_empty, "expected empty array, got #{array.inspect}"
+          end
         end
       end
 
       """
-    When I run "rspec ./node_spec.rb --format documentation"
-    Then the output should contain "3 examples, 3 failures"
-    And  the output should not contain "to return true, got false"
-    And  the output should not contain "to return false, got true"
-    And  the output should contain "node.state: started (first example)"
-    And  the output should contain "node.state: started (second example)"
-    And  the output should contain "expected a change"
+    When I run "rspec example_spec.rb --format documentation"
+    Then the output should contain "expected empty array, got [1]"

data/features/matchers/be.feature

@@ -0,0 +1,149 @@
+Feature: be matchers
+
+  There are several related "be" matchers:
+
+    * obj.should be_true # passes if obj is truthy (not nil or false)
+    * obj.should be_false # passes if obj is falsey (nil or false)
+    * obj.should be_nil # passes if obj is nil
+    * obj.should be # passes if obj is not nil
+    * obj.should be < expected # passes if obj < expected
+    * obj.should be > expected # passes if obj > expected
+    * obj.should be <= expected # passes if obj <= expected
+    * obj.should be >= expected # passes if obj >= expected
+
+  Scenario: be_true matcher
+    Given a file named "be_true_spec.rb" with:
+      """
+      describe "be_true matcher" do
+        specify { true.should be_true }
+        specify { 7.should be_true }
+        specify { "foo".should be_true }
+        specify { nil.should_not be_true }
+        specify { false.should_not be_true }
+
+        # deliberate failures
+        specify { true.should_not be_true }
+        specify { 7.should_not be_true }
+        specify { "foo".should_not be_true }
+        specify { nil.should be_true }
+        specify { false.should be_true }
+      end
+      """
+    When I run "rspec be_true_spec.rb"
+    Then the output should contain all of these:
+      | 10 examples, 5 failures       |
+      | expected true not to be true  |
+      | expected 7 not to be true     |
+      | expected "foo" not to be true |
+      | expected nil to be true       |
+      | expected false to be true     |
+
+  Scenario: be_false matcher
+    Given a file named "be_false_spec.rb" with:
+      """
+      describe "be_false matcher" do
+        specify { nil.should be_false }
+        specify { false.should be_false }
+        specify { true.should_not be_false }
+        specify { 7.should_not be_false }
+        specify { "foo".should_not be_false }
+
+        # deliberate failures
+        specify { nil.should_not be_false }
+        specify { false.should_not be_false }
+        specify { true.should be_false }
+        specify { 7.should be_false }
+        specify { "foo".should be_false }
+      end
+      """
+    When I run "rspec be_false_spec.rb"
+    Then the output should contain all of these:
+      | 10 examples, 5 failures        |
+      | expected nil not to be false   |
+      | expected false not to be false |
+      | expected true to be false      |
+      | expected 7 to be false         |
+      | expected "foo" to be false     |
+
+  Scenario: be_nil matcher
+    Given a file named "be_nil_spec.rb" with:
+      """
+      describe "be_nil matcher" do
+        specify { nil.should be_nil }
+        specify { false.should_not be_nil }
+        specify { true.should_not be_nil }
+        specify { 7.should_not be_nil }
+        specify { "foo".should_not be_nil }
+
+        # deliberate failures
+        specify { nil.should_not be_nil }
+        specify { false.should be_nil }
+        specify { true.should be_nil }
+        specify { 7.should be_nil }
+        specify { "foo".should be_nil }
+      end
+      """
+    When I run "rspec be_nil_spec.rb"
+    Then the output should contain all of these:
+      | 10 examples, 5 failures   |
+      | expected not nil, got nil |
+      | expected nil, got false   |
+      | expected nil, got true    |
+      | expected nil, got 7       |
+      | expected nil, got "foo"   |
+
+  Scenario: be matcher
+    Given a file named "be_spec.rb" with:
+      """
+      describe "be_matcher" do
+        specify { true.should be }
+        specify { 7.should be }
+        specify { "foo".should be }
+        specify { nil.should_not be }
+        specify { false.should_not be }
+
+        # deliberate failures
+        specify { true.should_not be }
+        specify { 7.should_not be }
+        specify { "foo".should_not be }
+        specify { nil.should be }
+        specify { false.should be }
+      end
+      """
+    When I run "rspec be_spec.rb"
+    Then the output should contain all of these:
+      | 10 examples, 5 failures             |
+      | expected true to evaluate to false  |
+      | expected 7 to evaluate to false     |
+      | expected "foo" to evaluate to false |
+      | expected nil to evaluate to true    |
+      | expected false to evaluate to true  |
+
+  Scenario: be operator matchers
+    Given a file named "be_operators_spec.rb" with:
+      """
+      describe 17 do
+        it { should be < 20 }
+        it { should be > 15 }
+        it { should be <= 17 }
+        it { should be >= 17 }
+        it { should_not be < 15 }
+        it { should_not be > 20 }
+        it { should_not be <= 16 }
+        it { should_not be >= 18 }
+
+        # deliberate failures
+        it { should be < 15 }
+        it { should be > 20 }
+        it { should be <= 16 }
+        it { should be >= 18 }
+      end
+      """
+    When I run "rspec be_operators_spec.rb"
+    Then the output should contain all of these:
+      | 12 examples, 4 failures           |
+      | expected < 15, got 17             |
+      | expected > 20, got 17             |
+      | expected <= 16, got 17            |
+      | expected >= 18, got 17            |
+

data/features/matchers/match.feature

@@ -0,0 +1,50 @@
+Feature: match matcher
+
+  The match matcher calls #match on the object, passing if #match returns a
+  truthy (not false or nil) value.  Regexp and String both provide a #match
+  method.
+
+    "a string".should match(/str/) # passes
+    "a string".should match(/foo/) # fails
+    /foo/.should match("food")     # passes
+    /foo/.should match("drinks")   # fails
+
+  This is equivalent to using the =~ matcher (see the operator matchers
+  feature for more details).
+
+  Scenario: string usage
+    Given a file named "string_match_spec.rb" with:
+      """
+      describe "a string" do
+        it { should match(/str/) }
+        it { should_not match(/foo/) }
+
+        # deliberate failures
+        it { should_not match(/str/) }
+        it { should match(/foo/) }
+      end
+      """
+    When I run "rspec string_match_spec.rb"
+    Then the output should contain all of these:
+      | 4 examples, 2 failures                 |
+      | expected "a string" not to match /str/ |
+      | expected "a string" to match /foo/     |
+
+  Scenario: regular expression usage
+    Given a file named "regexp_match_spec.rb" with:
+      """
+      describe /foo/ do
+        it { should match("food") }
+        it { should_not match("drinks") }
+
+        # deliberate failures
+        it { should_not match("food") }
+        it { should match("drinks") }
+      end
+      """
+    When I run "rspec regexp_match_spec.rb"
+    Then the output should contain all of these:
+      | 4 examples, 2 failures             |
+      | expected /foo/ not to match "food" |
+      | expected /foo/ to match "drinks"   |
+

data/lib/rspec/expectations/version.rb

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

data/lib/rspec/matchers/have.rb

@@ -73,10 +73,10 @@ EOF
     
       private
       
-      def method_missing(sym, *args, &block)
-        @collection_name = sym
+      def method_missing(method, *args, &block)
+        @collection_name = method
         if inflector = (defined?(ActiveSupport::Inflector) && ActiveSupport::Inflector.respond_to?(:pluralize) ? ActiveSupport::Inflector : (defined?(Inflector) ? Inflector : nil))
-          @plural_collection_name = inflector.pluralize(sym.to_s)
+          @plural_collection_name = inflector.pluralize(method.to_s)
         end
         @args = args
         @block = block

data/lib/rspec/matchers/matcher.rb

@@ -107,11 +107,11 @@ module RSpec
       
     private
 
-      def method_missing(name, *args, &block)
-        if $matcher_execution_context.respond_to?(name)
-          $matcher_execution_context.send name, *args, &block
+      def method_missing(method, *args, &block)
+        if $matcher_execution_context.respond_to?(method)
+          $matcher_execution_context.send method, *args, &block
         else
-          super(name, *args, &block)
+          super(method, *args, &block)
         end
       end
     

data/lib/rspec/matchers/method_missing.rb

@@ -1,8 +1,11 @@
 module RSpec
   module Matchers
-    def method_missing(sym, *args, &block) # :nodoc:
-      return Matchers::BePredicate.new(sym, *args, &block) if sym.to_s =~ /^be_/
-      return Matchers::Has.new(sym, *args, &block) if sym.to_s =~ /^have_/
+
+    private
+
+    def method_missing(method, *args, &block) # :nodoc:
+      return Matchers::BePredicate.new(method, *args, &block) if method.to_s =~ /^be_/
+      return Matchers::Has.new(method, *args, &block) if method.to_s =~ /^have_/
       super
     end
   end

data/rspec-expectations.gemspec

@@ -18,7 +18,7 @@ Gem::Specification.new do |s|
   s.files            = `git ls-files`.split("\n")
   s.test_files       = `git ls-files -- {spec,features}/*`.split("\n")
   s.executables      = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
-  s.extra_rdoc_files = [ "README.markdown" ]
+  s.extra_rdoc_files = [ "README.md" ]
   s.rdoc_options     = ["--charset=UTF-8"]
   s.require_path     = "lib"
 

metadata

@@ -4,9 +4,9 @@ version: !ruby/object:Gem::Version
   prerelease: false
   segments: 
   - 2
-  - 1
+  - 2
   - 0
-  version: 2.1.0
+  version: 2.2.0
 platform: ruby
 authors: 
 - David Chelimsky
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-11-07 01:00:00 -05:00
+date: 2010-11-28 00:00:00 -06:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -40,14 +40,14 @@ executables: []
 extensions: []
 
 extra_rdoc_files: 
-- README.markdown
+- README.md
 files: 
 - .document
 - .gitignore
 - Gemfile
 - History.markdown
 - License.txt
-- README.markdown
+- README.md
 - Rakefile
 - Upgrade.markdown
 - cucumber.yml
@@ -57,6 +57,7 @@ files:
 - features/expectations/diffing.feature
 - features/expectations/implicit_docstrings.feature
 - features/matchers/access_running_example.feature
+- features/matchers/be.feature
 - features/matchers/be_within.feature
 - features/matchers/define_diffable_matcher.feature
 - features/matchers/define_matcher.feature
@@ -68,6 +69,7 @@ files:
 - features/matchers/expect_error.feature
 - features/matchers/have.feature
 - features/matchers/include.feature
+- features/matchers/match.feature
 - features/matchers/operators.feature
 - features/matchers/predicates.feature
 - features/matchers/respond_to.feature
@@ -167,7 +169,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: -1883027973330642761
+      hash: -833655942959929431
       segments: 
       - 0
       version: "0"
@@ -176,7 +178,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: -1883027973330642761
+      hash: -833655942959929431
       segments: 
       - 0
       version: "0"
@@ -186,7 +188,7 @@ rubyforge_project: rspec
 rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
-summary: rspec-expectations-2.1.0
+summary: rspec-expectations-2.2.0
 test_files: 
 - features/README.markdown
 - features/expectations/attribute_of_subject.feature
@@ -194,6 +196,7 @@ test_files:
 - features/expectations/diffing.feature
 - features/expectations/implicit_docstrings.feature
 - features/matchers/access_running_example.feature
+- features/matchers/be.feature
 - features/matchers/be_within.feature
 - features/matchers/define_diffable_matcher.feature
 - features/matchers/define_matcher.feature
@@ -205,6 +208,7 @@ test_files:
 - features/matchers/expect_error.feature
 - features/matchers/have.feature
 - features/matchers/include.feature
+- features/matchers/match.feature
 - features/matchers/operators.feature
 - features/matchers/predicates.feature
 - features/matchers/respond_to.feature