rspec-expectations 2.6.0.rc4 → 2.6.0.rc6

data/cucumber.yml

@@ -1,3 +1,10 @@
-default: --require features --tags ~@wip --format progress
-wip: --require features --tags @wip:3 --wip features
+<%
+def tags(tag)
+  tags = [tag]
+  tags << "~@ruby-1.9" if RUBY_VERSION.to_f < 1.9
+  tags.join(" --tags ")
+end
+%>
 
+default: --require features --tags <%= tags("~@wip") %> --format progress
+wip: --require features --tags <%= tags("@wip:3") --wip features

data/features/Changelog.md

@@ -1,7 +1,16 @@
+### 2.6.0.rc6 / 2011-05-06
+
+[full changelog](http://github.com/rspec/rspec-expectations/compare/v2.6.0.rc4...v2.6.0.rc6)
+
+No changes this release (releasing to align with rc5 of other rspec gems).
+
 ### 2.6.0.rc4 / 2011-05-01
 
 [full changelog](http://github.com/rspec/rspec-expectations/compare/v2.6.0.rc2...v2.6.0.rc4)
 
+* Enhancements
+  * range.should cover(*values) (Anders Furseth)
+
 ### 2.6.0.rc2 / 2011-04-18
 
 [full changelog](http://github.com/rspec/rspec-expectations/compare/v2.5.0...v2.6.0.rc2)

data/features/built_in_matchers/README.md

@@ -65,3 +65,7 @@
     [1,2,3].should include(1, 2)
     {:a => 'b'}.should include(:a => 'b')
     "this string".should include("is str")
+
+## Ranges (1.9 only)
+
+    (1..10).should cover(3)

data/features/built_in_matchers/cover.feature

@@ -0,0 +1,45 @@
+@ruby-1.9
+Feature: cover matcher
+
+  Use the cover matcher to specify that a range covers one or more
+  expected objects.  This works on any object that responds to #cover?  (such
+  as a Range):
+
+    (1..10).should cover(5)
+    (1..10).should cover(4, 6)
+    (1..10).should_not cover(11)
+
+  Scenario: range usage
+    Given a file named "range_cover_matcher_spec.rb" with:
+      """
+      describe (1..10) do
+        it { should cover(4) }
+        it { should cover(6) }
+        it { should cover(8) }
+        it { should cover(4, 6) }
+        it { should cover(4, 6, 8) }
+        it { should_not cover(11) }
+        it { should_not cover(11, 12) }
+
+        # deliberate failures
+        it { should cover(11) }
+        it { should_not cover(4) }
+        it { should_not cover(6) }
+        it { should_not cover(8) }
+        it { should_not cover(4, 6, 8) }
+
+        # both of these should fail since it covers 1 but not 9
+        it { should cover(5, 11) }
+        it { should_not cover(5, 11) }
+      end
+      """
+    When I run `rspec range_cover_matcher_spec.rb`
+    Then the output should contain all of these:
+      | 14 examples, 7 failures                 |
+      | expected 1..10 to cover 11              |
+      | expected 1..10 not to cover 4           |
+      | expected 1..10 not to cover 6           |
+      | expected 1..10 not to cover 8           |
+      | expected 1..10 not to cover 4, 6, and 8 |
+      | expected 1..10 to cover 5 and 11        |
+      | expected 1..10 not to cover 5 and 11    |

data/lib/rspec/expectations/version.rb

@@ -1,7 +1,7 @@
 module RSpec # :nodoc:
   module Expectations # :nodoc:
     module Version # :nodoc:
-      STRING = '2.6.0.rc4'
+      STRING = '2.6.0.rc6'
     end
   end
 end

data/lib/rspec/matchers.rb

@@ -181,6 +181,7 @@ require 'rspec/matchers/be_kind_of'
 require 'rspec/matchers/be_within'
 require 'rspec/matchers/block_aliases'
 require 'rspec/matchers/change'
+require 'rspec/matchers/cover' if (1..2).respond_to? :cover?
 require 'rspec/matchers/eq'
 require 'rspec/matchers/eql'
 require 'rspec/matchers/equal'

data/lib/rspec/matchers/cover.rb

@@ -0,0 +1,35 @@
+module RSpec
+  module Matchers
+    # :call-seq:
+    #   should cover(expected)
+    #   should_not cover(expected)
+    #
+    # Passes if actual covers expected. This works for
+    # Ranges. You can also pass in multiple args
+    # and it will only pass if all args are found in Range.
+    #
+    # == Examples
+    #   (1..10).should cover(5)
+    #   (1..10).should cover(4, 6)
+    #   (1..10).should cover(4, 6, 11) # will fail
+    #   (1..10).should_not cover(11)
+    #   (1..10).should_not cover(5)    # will fail
+    #
+    # == Warning: Ruby >= 1.9 only
+    def cover(*expected_values)
+      Matcher.new :cover, *expected_values do |*_expected_values|
+        match_for_should do |actual|
+          _expected_values.all? &cover_value
+        end
+
+        match_for_should_not do |actual|
+          _expected_values.none? &cover_value
+        end
+
+        def cover_value
+          lambda {|value| actual.cover?(value)}
+        end
+      end
+    end
+  end
+end

data/spec/rspec/matchers/cover_spec.rb

@@ -0,0 +1,65 @@
+require 'spec_helper'
+
+describe "should cover(expected)", :if => RSpec::Matchers.respond_to?(:cover) do
+  context "for a range target" do
+    it "passes if target covers expected" do
+      (1..10).should cover(5)
+    end
+
+    it "fails if target does not cover expected" do
+      lambda {
+        (1..10).should cover(11)
+      }.should fail_with("expected 1..10 to cover 11")
+    end
+  end
+end
+
+describe "should cover(with, multiple, args)", :if => RSpec::Matchers.respond_to?(:cover) do
+  context "for a range target" do
+    it "passes if target covers all items" do
+      (1..10).should cover(4, 6)
+    end
+
+    it "fails if target does not cover any one of the items" do
+      lambda {
+        (1..10).should cover(4, 6, 11)
+      }.should fail_with("expected 1..10 to cover 4, 6, and 11")
+    end
+  end
+end
+
+describe "should_not cover(expected)", :if => RSpec::Matchers.respond_to?(:cover) do
+  context "for a range target" do
+    it "passes if target does not cover expected" do
+      (1..10).should_not cover(11)
+    end
+
+    it "fails if target covers expected" do
+      lambda {
+        (1..10).should_not cover(5)
+      }.should fail_with("expected 1..10 not to cover 5")
+    end
+  end
+end
+
+describe "should_not cover(with, multiple, args)", :if => RSpec::Matchers.respond_to?(:cover) do
+  context "for a range target" do
+    it "passes if the target does not cover any of the expected" do
+      (1..10).should_not include(11, 12, 13)
+    end
+
+    it "fails if the target covers all of the expected" do
+      expect {
+        (1..10).should_not include(4, 6)
+      }.to fail_with("expected 1..10 not to include 4 and 6")
+    end
+
+    it "fails if the target covers some (but not all) of the expected" do
+      expect {
+        (1..10).should_not include(5, 11)
+      }.to fail_with("expected 1..10 not to include 5 and 11")
+    end
+  end
+end
+
+

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification 
 name: rspec-expectations
 version: !ruby/object:Gem::Version 
-  hash: 15424061
+  hash: 15424057
   prerelease: 6
   segments: 
   - 2
   - 6
   - 0
   - rc
-  - 4
-  version: 2.6.0.rc4
+  - 6
+  version: 2.6.0.rc6
 platform: ruby
 authors: 
 - David Chelimsky
@@ -18,7 +18,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-05-01 00:00:00 -04:00
+date: 2011-05-06 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -62,6 +62,7 @@ files:
 - 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
@@ -107,6 +108,7 @@ files:
 - lib/rspec/matchers/block_aliases.rb
 - lib/rspec/matchers/change.rb
 - lib/rspec/matchers/compatibility.rb
+- lib/rspec/matchers/cover.rb
 - lib/rspec/matchers/dsl.rb
 - lib/rspec/matchers/eq.rb
 - lib/rspec/matchers/eql.rb
@@ -140,6 +142,7 @@ files:
 - spec/rspec/matchers/be_within_spec.rb
 - spec/rspec/matchers/change_spec.rb
 - spec/rspec/matchers/compatibility_spec.rb
+- spec/rspec/matchers/cover_spec.rb
 - spec/rspec/matchers/description_generation_spec.rb
 - spec/rspec/matchers/dsl_spec.rb
 - spec/rspec/matchers/eq_spec.rb
@@ -199,7 +202,7 @@ rubyforge_project: rspec
 rubygems_version: 1.6.2
 signing_key: 
 specification_version: 3
-summary: rspec-expectations-2.6.0.rc4
+summary: rspec-expectations-2.6.0.rc6
 test_files: 
 - features/Changelog.md
 - features/README.markdown
@@ -207,6 +210,7 @@ test_files:
 - 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
@@ -242,6 +246,7 @@ test_files:
 - spec/rspec/matchers/be_within_spec.rb
 - spec/rspec/matchers/change_spec.rb
 - spec/rspec/matchers/compatibility_spec.rb
+- spec/rspec/matchers/cover_spec.rb
 - spec/rspec/matchers/description_generation_spec.rb
 - spec/rspec/matchers/dsl_spec.rb
 - spec/rspec/matchers/eq_spec.rb