rspec-collection_matchers 1.1.2 → 1.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cffeb37567801d1dd72d4ed804de75004fd55c3f
-  data.tar.gz: 92e24526866176b5a664d9c0f9f0cdd288671914
+  metadata.gz: 9d94581983b7d44a39df551b7f66f2ae28c00a32
+  data.tar.gz: aa1cff25eda40661701a3d4220f374e15e955169
 SHA512:
-  metadata.gz: 8483fe9ef1382dd376c024f497b9ba3b521c874bf5394888ded1e5992507dce064dc8586b1434d51a1ef86a3e1017475b20561007cb972e8da3e206d274d1db5
-  data.tar.gz: ad0db80a2bc2e57416d9466175ee1a3c0bfa8fb442d28918422561357492f14c2b96e26974d684d078b74c3d3f9d1cfd320447ea00ae8cb9de3f11183f3ed8bb
+  metadata.gz: 5c756c81ecbb2041a58583c8630f0daa752f6b6b017eae2acf105c06a3b4a1e34ac57d4f65acba1e1b2779a2b226783429eb7d1c923767e18d34070de0740fef
+  data.tar.gz: fd0ffd413ea9306c0f105d538584e7f0a9d62d70371994cfe929aa1838883b4f8efd906fc7ca5cfb022c1eadcacc1602fb586461407b566bc06ecf2b61416543

data/.travis.yml

@@ -1,8 +1,13 @@
 language: ruby
 script: "script/test_all"
 bundler_args: "--standalone --binstubs --without documentation"
+before_install:
+  - gem update --system
+  - gem install bundler
 rvm:
-  - 2.1.0
+  - 2.3.3
+  - 2.2.5
+  - 2.1
   - 2.0.0
   - 1.9.3
   - 1.9.2
@@ -10,7 +15,6 @@ rvm:
   - ree
   - jruby-19mode
   - jruby-18mode
-  - rbx
 env:
   - BRANCH=master
   - BRANCH=2-99-maintenance

data/Changelog.md

@@ -1,5 +1,12 @@
 ### Development
 
+Bug Fixes:
+
+* Define `to_ary` on Ruby 1.9.2 to fix issue when diffing in compound expectations
+  (Jon Rowe, #34)
+* Prevent warning being issued due to incorrect definition of `respond_to`.
+  (Matt Whipple, #33)
+
 ### 1.1.2 / 2014-11-11
 
 [full changelog](http://github.com/rspec/rspec-collection_matchers/compare/v1.1.1...v1.1.2)

data/Gemfile

@@ -4,7 +4,7 @@ gemspec
 
 %w[rspec rspec-core rspec-expectations rspec-mocks].each do |lib|
   library_path = File.expand_path("../../#{lib}", __FILE__)
-  if File.exist?(library_path)
+  if File.exist?(library_path) && !ENV['USE_GIT_REPOS']
     gem lib, :path => library_path
   else
     gem lib, :git    => "git://github.com/rspec/#{lib}.git",
@@ -15,8 +15,7 @@ end
 # only the master branch is supported on rspec-support
 gem "rspec-support", :git => "git://github.com/rspec/rspec-support.git"
 
-gem "cucumber", "~> 1.1.9"
-gem "aruba",    "~> 0.5"
+gem "aruba"
 gem "rake",     "~> 10.0.0"
 
 version_file = File.expand_path("../.rails-version", __FILE__)
@@ -39,6 +38,18 @@ end
 gem "activesupport", *rails_gem_args
 gem "activemodel",   *rails_gem_args
 
+if RUBY_VERSION.to_f < 2
+  gem "cucumber", "< 2"
+  gem 'json', '< 2'
+  gem 'term-ansicolor',  '< 1.4.0' # used by cucumber
+  gem 'tins', '~> 1.6.0' # used by term-ansicolor
+else
+  gem "cucumber"
+end
+
+if RUBY_VERSION < '1.9.3'
+  gem 'i18n', '< 0.7.0'
+end
 
 platform :rbx do
   gem 'rubysl'

data/README.md

@@ -1,4 +1,4 @@
-# RSpec::CollectionMatchers [![Build Status](https://secure.travis-ci.org/rspec/rspec-collection_matchers.png?branch=master)](http://travis-ci.org/rspec/rspec-collection_matchers)
+# RSpec::CollectionMatchers [![Build Status](https://secure.travis-ci.org/rspec/rspec-collection_matchers.svg?branch=master)](http://travis-ci.org/rspec/rspec-collection_matchers)
 
 RSpec::CollectionMatchers lets you express expected outcomes on collections
 of an object in an example.

data/features/support/env.rb

@@ -1,3 +1,18 @@
+unless defined?(RSpec::Matchers.all)
+  module RSpec
+    module Matchers
+      # aruba assumes this is defined
+      def all
+      end
+
+      # aruba doesn't alias this itself on 2.99
+      def an_output_string_including(partial)
+        match partial
+      end
+    end
+  end
+end
+
 require 'aruba/cucumber'
 
 Before do

data/lib/rspec/collection_matchers/have.rb

@@ -24,6 +24,17 @@ module RSpec
         }
       end
 
+      if RUBY_VERSION == '1.9.2'
+        # On Ruby 1.9.2 items that don't return an array for `to_ary`
+        # can't be flattened in arrays, we need to be able to do this
+        # to produce diffs for compound matchers, so this corrects the
+        # default implementation. Note that rspec-support has code that
+        # directly checks for pattern and prevents infinite recursion.
+        def to_ary
+          [self]
+        end
+      end
+
       def matches?(collection_or_owner)
         collection = determine_collection(collection_or_owner)
         case collection
@@ -105,8 +116,8 @@ EOF
         "have #{relative_expectation} #{@collection_name}"
       end
 
-      def respond_to?(m)
-        @expected.respond_to?(m) || super
+      def respond_to?(m, include_all = false)
+        @expected.respond_to?(m, include_all) || super
       end
 
       private

data/lib/rspec/collection_matchers/version.rb

@@ -1,5 +1,5 @@
 module RSpec
   module CollectionMatchers
-    VERSION = "1.1.2"
+    VERSION = "1.1.3"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rspec-collection_matchers
 version: !ruby/object:Gem::Version
-  version: 1.1.2
+  version: 1.1.3
 platform: ruby
 authors:
 - Hugo Baraúna
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-11-11 00:00:00.000000000 Z
+date: 2016-12-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec-expectations
@@ -102,10 +102,10 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.6.8
 signing_key: 
 specification_version: 4
-summary: rspec-collection_matchers-1.1.2
+summary: rspec-collection_matchers-1.1.3
 test_files:
 - features/have.feature
 - features/support/env.rb