rspec-collection_matchers 1.0.0 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 86033281a3678444334d1e1cf880efa504c4266d
-  data.tar.gz: 1cca65c5b89d5ba99522ccf4e6e97bd9baca32e5
+  metadata.gz: faaf9c8611959593b7239c07f886daa9574880ae
+  data.tar.gz: f655c3df99261b8fe162c11c5915a9b5c2f9e29e
 SHA512:
-  metadata.gz: 2d79a9e118392ac26979226c828600a65e2686f36a3f97c1bfdf7dc198bab48d3fb89e9538002410e437f1c536c099f662f7516992beaef48f1200f174f8d63e
-  data.tar.gz: bab2277dd6b827e6cfe7c8ed758896afc896a5b06c77f02f6cb22f9abd08c399a31f86dd9bd822af59a1256881d323f470927293a661f7a6073a6be4aa1ef4d7
+  metadata.gz: d169d56403d92a256ad2efe912c28714816ffb9dcac8b77fbb34b20bc6126b159bd5b4456980c8a2234193ecb7aceaf234102115bf634c57910d1cddfa44c94d
+  data.tar.gz: e1bb78d0844f4c94c266649e08e42b39edb9ac6bf362b0e634884606fb33f7d941547973715b05cb8f6d7a9a3c622c15a4d1db429e4541e3c051fdc763b45572

data/Changelog.md

@@ -1,3 +1,15 @@
+### Development
+
+[full changelog](http://github.com/rspec/rspec-collection_matchers/compare/v1.0.0...master)
+
+Enhancements:
+
+* Make matchers composable on RSpec 3 and above. (Johnson Denen, #19)
+
+### 1.0.0 / 2014-06-09
+
+[full changelog](http://github.com/rspec/rspec-collection_matchers/compare/v0.0.4...v1.0.0)
+
 ### 0.0.4 / 2014-04-24
 
 [full changelog](http://github.com/rspec/rspec-collection_matchers/compare/v0.0.3...v0.0.4)

data/lib/rspec/collection_matchers/have.rb

@@ -1,6 +1,8 @@
 module RSpec
   module CollectionMatchers
     class Have
+      include RSpec::Matchers::Composable unless RSpec::Core::Version::STRING.to_f < 3.0
+
       QUERY_METHODS = [:size, :length, :count].freeze
       IGNORED_CLASSES = [Integer].freeze
 

data/lib/rspec/collection_matchers/version.rb

@@ -1,5 +1,5 @@
 module RSpec
   module CollectionMatchers
-    VERSION = "1.0.0"
+    VERSION = "1.1.0"
   end
 end

data/spec/rspec/collection_matchers/have_spec.rb

@@ -384,6 +384,52 @@ EOF
     end
   end
 
+  describe "expectations compounded with RSpec::Matchers::Composable", :if => defined?(RSpec::Matchers::Composable) do
+    context "using #and" do
+      it "fails with relevant error when only first expectation fails" do
+        expect {
+          expect([1, 2, 3]).to be_falsey.and have(3).items
+        }.to fail_matching "expected: falsey value"
+      end
+
+      it "fails with relevant error when only second expectation fails" do
+        expect {
+          expect([1, 2, 3]).to have(3).items.and be_falsey
+        }.to fail_matching "expected: falsey value"
+      end
+
+      it "fails with relevant error when both expectations fail" do
+        expect {
+          expect([1, 2, 3]).to be_falsey.and have(0).items
+        }.to fail_matching "...and:"
+      end
+
+      it "passes when both expectations are met" do
+        expect([1, 2, 3]).to have(3).items.and be_truthy
+      end
+    end
+
+    context "using #or" do
+      it "fails with relevant error when neither expectation is met" do
+        expect {
+          expect([1, 2, 3]).to be_falsey.or have(0).items
+        }.to fail_matching "...or:"
+      end
+
+      it "passes when only first expectation is met" do
+        expect([1, 2, 3]).to have(3).items.or be_falsey
+      end
+
+      it "passes when only second expectation is met" do
+        expect([1, 2, 3]).to be_falsey.or have(3).items
+      end
+
+      it "passes when both expectations are met" do
+        expect([1, 2, 3]).to be_truthy.or have(3).items
+      end
+    end
+  end
+
   describe RSpec::CollectionMatchers::Have, "for a collection owner that implements #send" do
     before(:each) do
       @collection = Object.new

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rspec-collection_matchers
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.1.0
 platform: ruby
 authors:
 - Hugo Baraúna
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-06-09 00:00:00.000000000 Z
+date: 2014-11-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec-expectations
@@ -105,7 +105,7 @@ rubyforge_project:
 rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
-summary: rspec-collection_matchers-1.0.0
+summary: rspec-collection_matchers-1.1.0
 test_files:
 - features/have.feature
 - features/support/env.rb