rspec-collection_matchers 1.2.0 → 1.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e43660c5a2622eb036fd9c25df4db49d446d347544eb96c8a4358d9960c8bb57
-  data.tar.gz: d6ab46976808a1f520e7234f0322589215d17316d5d5bc005dd7c50eaf89a33a
+  metadata.gz: 6f855370067f7ba87dab3a0ceccc86eb3037530ac096faf23cc34e95dc711018
+  data.tar.gz: 4dd38d0be031f4c7a865297398918cb28e49afcea17bd54ecca7d749136688f2
 SHA512:
-  metadata.gz: ae4028c0f65583927c66b5917e33647cd4e56369147d1e5eda0d0dab714bc62e1c103349c32d74e2eebed3b5d14b4bfef12d6dc916ca54de2591205fe39f30b4
-  data.tar.gz: bc98fed176296eea54ef79db04cf74b036a6399d11a9bfdc521458ac24c09224245d385acffb75f0da949392d4567c9d4d31aa7b460137e6fc36bc00d7ea6071
+  metadata.gz: 3f4ca52d387d060ec33a219aa373512c9a1d59359adb71aa9b08d3caf7657d9dfd01102f93e55190d9f5042e95e7f9bf8f5ac8c8f5aa97d7fa62d7e9475b56f2
+  data.tar.gz: 57b7a7046d617bf39369b993b69e455a91eb09f29dae8d0287f066489a8869e5cad920861330f96b4ccd99a447a14640c003f0629eb3ff329dd0a40b279196df

data/.github/FUNDING.yml

@@ -0,0 +1,5 @@
+# This file was generated on 2019-12-05T21:32:24+00:00 from the rspec-dev repo.
+# DO NOT modify it by hand as your changes will get lost the next time it is generated.
+
+github: [JonRowe]
+open_collective: rspec

data/.github/workflows/ci.yml

@@ -0,0 +1,69 @@
+name: RSpec CI
+on:
+  push:
+    branches:
+      - 'main'
+      - '*-maintenance'
+      - '*-dev'
+      - 'pr-*'
+  pull_request:
+    branches:
+      - '*'
+permissions:
+  contents: read
+concurrency:
+  group: ${{ github.workflow }}-${{ github.github.head_ref || github.run_id }}
+  cancel-in-progress: true
+
+jobs:
+  test:
+    name: 'Ruby: ${{ matrix.ruby }}, Rails: ${{ matrix.env.RAILS_VERSION }}'
+    runs-on: ubuntu-20.04
+    strategy:
+      fail-fast: false
+      matrix:
+       include:
+         - ruby: '3.2'
+         - ruby: '3.1'
+         - ruby: '3.0'
+         - ruby: 2.7
+         - ruby: 2.6
+         - ruby: 2.5
+         - ruby: 2.3
+         - ruby: 2.2
+    steps:
+      - uses: actions/checkout@v4
+      - uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: ${{ matrix.ruby }}
+      - run: script/update_rubygems_and_install_bundler
+      - run: bundle install --binstubs
+      - run: script/run_build
+
+  legacy:
+    name: Legacy Ruby Builds (${{ matrix.container.version }})
+    runs-on: ubuntu-20.04
+    container:
+      image: ${{ matrix.container.tag }}
+      options: ${{ matrix.container.options || '--add-host github-complains-if-this-is-empty.com:127.0.0.1' }}
+    strategy:
+      fail-fast: false
+      matrix:
+        include:
+          - container:
+              version: "2.1.9"
+              tag: ghcr.io/rspec/docker-ci:2.1.9
+              post: git config --global --add safe.directory `pwd`
+          - container:
+              version: "2.0"
+              tag: ghcr.io/rspec/docker-ci:2.0.0
+          - container:
+              version: "1.9.3"
+              tag: ghcr.io/rspec/docker-ci:1.9.3
+    env:
+      LEGACY_CI: true
+    steps:
+      - uses: actions/checkout@v3
+      - run: script/legacy_setup.sh
+      - run: ${{ matrix.container.post }}
+      - run: script/run_build

data/.rspec

@@ -1,2 +1 @@
 --format documentation
---color

data/Changelog.md

@@ -1,3 +1,10 @@
+### 1.2.1 / 2023-09-28
+
+Bug Fixes:
+
+* Support modern RSpec by defining #supports_value_expectations? on matcher.
+  (Jon Rowe, #52)
+
 ### 1.2.0 / 2019-09-18
 
 Enhancements:

data/Gemfile

@@ -2,25 +2,30 @@ source 'https://rubygems.org'
 
 gemspec
 
-%w[rspec rspec-core rspec-expectations rspec-mocks].each do |lib|
+%w[rspec rspec-support rspec-core rspec-expectations rspec-mocks].each do |lib|
   library_path = File.expand_path("../../#{lib}", __FILE__)
   if File.exist?(library_path) && !ENV['USE_GIT_REPOS']
     gem lib, :path => library_path
   else
-    gem lib, :git    => "git://github.com/rspec/#{lib}.git",
-             :branch => ENV.fetch('BRANCH',"master")
+    gem lib, :git => "https://github.com/rspec/#{lib}.git", :branch => ENV.fetch('BRANCH', 'main')
   end
 end
 
-# only the master branch is supported on rspec-support
-gem "rspec-support", :git => "git://github.com/rspec/rspec-support.git"
-
 gem "aruba"
-gem "rake",     "~> 10.0.0"
+
+if RUBY_VERSION < '1.9.3'
+  gem "rake", "~> 10.0.0" # rake 11 requires Ruby 1.9.3 or later
+elsif RUBY_VERSION < '2.0.0'
+  gem "rake", "~> 11.0.0" # rake 12 requires Ruby 2.0.0 or later
+elsif RUBY_VERSION < '2.2.0'
+  gem "rake", "~> 12.3.2" # rake 13 requires Ruby 2.2.0 or later
+else
+  gem "rake", "~> 13.0.0"
+end
 
 version_file = File.expand_path("../.rails-version", __FILE__)
 rails_gem_args = case version = ENV['RAILS_VERSION'] || (File.exist?(version_file) && File.read(version_file).chomp)
-when /master/
+when /main/
  { :git => "git://github.com/rails/rails.git" }
 when /stable$/
  { :git => "git://github.com/rails/rails.git", :branch => version }
@@ -46,14 +51,11 @@ if RUBY_VERSION.to_f < 2
   gem 'tins', '~> 1.6.0' # used by term-ansicolor
 else
   gem "cucumber"
+  gem "json", "> 2.3.0"
 end
 
 if RUBY_VERSION < '1.9.3'
   gem 'i18n', '< 0.7.0'
 end
 
-platform :rbx do
-  gem 'rubysl'
-end
-
 eval File.read('Gemfile-custom') if File.exist?('Gemfile-custom')

data/README.md

@@ -1,4 +1,4 @@
-# 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 [![Build Status](https://secure.travis-ci.org/rspec/rspec-collection_matchers.svg?branch=main)](http://travis-ci.org/rspec/rspec-collection_matchers)
 
 RSpec::CollectionMatchers lets you express expected outcomes on collections
 of an object in an example.
@@ -66,6 +66,7 @@ expect(collection).to have(n).items
 expect(collection).to have_exactly(n).items
 expect(collection).to have_at_most(n).items
 expect(collection).to have_at_least(n).items
+expect(collection).to have(:no).items
 ```
 
 ## See also

data/lib/rspec/collection_matchers/have.rb

@@ -24,6 +24,10 @@ module RSpec
         }
       end
 
+      def supports_value_expectations?
+        true
+      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

data/lib/rspec/collection_matchers/version.rb

@@ -1,5 +1,5 @@
 module RSpec
   module CollectionMatchers
-    VERSION = "1.2.0"
+    VERSION = "1.2.1"
   end
 end

data/script/legacy_setup.sh

@@ -0,0 +1,19 @@
+#!/bin/bash
+# This file was generated on 2023-06-26T13:27:27+01:00 from the rspec-dev repo.
+# DO NOT modify it by hand as your changes will get lost the next time it is generated.
+
+set -e
+
+bundle install --standalone --binstubs --without coverage documentation
+
+if [ -x ./bin/rspec ]; then
+  echo "RSpec bin detected"
+else
+  if [ -x ./exe/rspec ]; then
+    cp ./exe/rspec ./bin/rspec
+    echo "RSpec restored from exe"
+  else
+    echo "No RSpec bin available"
+    exit 1
+  fi
+fi

data/script/{test_all → run_build}

@@ -18,4 +18,3 @@ echo "Running cucumber specs"
 # shells out (via aruba) and executes `rspec`--which can pick up the wrong
 # rspec version if we're not running with bundler.
 bundle exec cucumber
-

data/script/update_rubygems_and_install_bundler

@@ -0,0 +1,33 @@
+#!/bin/bash
+
+set -e
+
+function is_ruby_31_plus {
+  if ruby -e "exit(RUBY_VERSION.to_f >= 3.1)"; then
+    return 0
+  else
+    return 1
+  fi
+}
+
+function is_ruby_23_plus {
+  if ruby -e "exit(RUBY_VERSION.to_f >= 2.3)"; then
+    return 0
+  else
+    return 1
+  fi
+}
+
+if is_ruby_31_plus; then
+  echo "Installing rubygems 3.3.6 / bundler 2.3.6"
+  yes | gem update --system '3.3.6'
+  yes | gem install bundler -v '2.3.6'
+elif is_ruby_23_plus; then
+  echo "Installing rubygems 3.2.22 / bundler 2.2.22"
+  yes | gem update --system '3.2.22'
+  yes | gem install bundler -v '2.2.22'
+else
+  echo "Warning installing older versions of Rubygems / Bundler"
+  gem update --system '2.7.8'
+  gem install bundler -v '1.17.3'
+fi

data/spec/rspec/collection_matchers/have_spec.rb

@@ -1,7 +1,7 @@
 require 'spec_helper'
 require 'stringio'
 
-describe "have matcher" do
+RSpec.describe "have matcher" do
   let(:inflector) do
     Class.new do
       def self.pluralize(string)
@@ -560,14 +560,12 @@ end
 
 module RSpec
   module CollectionMatchers
-    describe Syntax do
+    RSpec.describe Syntax do
       describe "expression generation" do
         let(:target) { "foo" }
         let(:expectation) { "eq('bar')" }
         let(:positive_expect_example) { "expect(foo).to eq('bar')" }
-        let(:positive_should_example) { "foo.should eq('bar')" }
         let(:negative_expect_example) { "expect(foo).not_to eq('bar')" }
-        let(:negative_should_example) { "foo.should_not eq('bar')" }
 
         def positive_expression
           Syntax.positive_expression(target, expectation)
@@ -577,52 +575,14 @@ module RSpec
           Syntax.negative_expression(target, expectation)
         end
 
-        context "when only :expect is enabled", :uses_only_expect do
-          before do
-            expect(Expectations::Syntax.should_enabled?).to be_falsey
-            expect(Expectations::Syntax.expect_enabled?).to be_truthy
-          end
-
-          it 'generates a positive expression using the expect syntax' do
-            expect(positive_expression).to eq(positive_expect_example)
-          end
-
-          it 'generates a negative expression using the expect syntax' do
-            expect(negative_expression).to eq(negative_expect_example)
-          end
+        it 'generates a positive expression using the expect syntax' do
+          expect(positive_expression).to eq(positive_expect_example)
         end
 
-        context "when both :should and :expect are enabled", :uses_should do
-          before do
-            expect(Expectations::Syntax.should_enabled?).to be_truthy
-            expect(Expectations::Syntax.expect_enabled?).to be_truthy
-          end
-
-          it 'generates a positive expression using the expect syntax' do
-            expect(positive_expression).to eq(positive_expect_example)
-          end
-
-          it 'generates a negative expression using the expect syntax' do
-            expect(negative_expression).to eq(negative_expect_example)
-          end
-        end
-
-        context "when only :should is enabled", :uses_only_should do
-          before do
-            Expectations::Syntax.should_enabled?.should be_truthy
-            Expectations::Syntax.expect_enabled?.should be_falsey
-          end
-
-          it 'generates a positive expression using the expect syntax' do
-            positive_expression.should eq(positive_should_example)
-          end
-
-          it 'generates a negative expression using the expect syntax' do
-            negative_expression.should eq(negative_should_example)
-          end
+        it 'generates a negative expression using the expect syntax' do
+          expect(negative_expression).to eq(negative_expect_example)
         end
       end
-
     end
   end
 end

data/spec/rspec/collection_matchers/rails_extensions_spec.rb

@@ -2,7 +2,7 @@ require "spec_helper"
 require 'active_model'
 
 module RSpec::CollectionMatchers
-  describe "Have extensions for rails" do
+  RSpec.describe "Have extensions for rails" do
     describe "error_on" do
       it "provides a description including the name of what the error is on" do
         expect(have(1).error_on(:whatever).description).to eq "have 1 error on :whatever"

data/spec/spec_helper.rb

@@ -9,56 +9,8 @@ require 'rspec/collection_matchers'
 Dir['./spec/support/**/*'].each {|f| require f}
 
 RSpec.configure do |config|
-  config.treat_symbols_as_metadata_keys_with_true_values = true if RSpec::Expectations::Version::STRING < "3.0"
-  config.run_all_when_everything_filtered = true
-  config.filter_run :focus
-
   config.order = 'random'
 
-  config.expect_with :rspec do |rspec|
-    rspec.syntax = :expect
-  end
-
-  config.mock_with :rspec do |rspec|
-    rspec.syntax = :expect
-  end
-end
-
-shared_context "with #should enabled", :uses_should do
-  orig_syntax = nil
-
-  before(:all) do
-    orig_syntax = RSpec::Matchers.configuration.syntax
-    RSpec::Matchers.configuration.syntax = [:expect, :should]
-  end
-
-  after(:all) do
-    RSpec::Matchers.configuration.syntax = orig_syntax
-  end
-end
-
-shared_context "with #should exclusively enabled", :uses_only_should do
-  orig_syntax = nil
-
-  before(:all) do
-    orig_syntax = RSpec::Matchers.configuration.syntax
-    RSpec::Matchers.configuration.syntax = :should
-  end
-
-  after(:all) do
-    RSpec::Matchers.configuration.syntax = orig_syntax
-  end
-end
-
-shared_context "with #expect exclusively enabled", :uses_only_expect do
-  orig_syntax = nil
-
-  before(:all) do
-    orig_syntax = RSpec::Matchers.configuration.syntax
-    RSpec::Matchers.configuration.syntax = :expect
-  end
-
-  after(:all) do
-    RSpec::Matchers.configuration.syntax = orig_syntax
-  end
+  config.expect_with :rspec
+  config.mock_with :rspec
 end

data/spec/support/shared_examples.rb

@@ -1,4 +1,4 @@
-shared_examples_for "an RSpec matcher" do |options|
+RSpec.shared_examples_for "an RSpec matcher" do |options|
   let(:valid_value)   { options.fetch(:valid_value) }
   let(:invalid_value) { options.fetch(:invalid_value) }
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rspec-collection_matchers
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.2.1
 platform: ruby
 authors:
 - Hugo Baraúna
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2019-09-18 00:00:00.000000000 Z
+date: 2023-09-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec-expectations
@@ -59,9 +59,10 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".github/FUNDING.yml"
+- ".github/workflows/ci.yml"
 - ".gitignore"
 - ".rspec"
-- ".travis.yml"
 - Changelog.md
 - Gemfile
 - LICENSE.txt
@@ -75,7 +76,9 @@ files:
 - lib/rspec/collection_matchers/rails_extensions.rb
 - lib/rspec/collection_matchers/version.rb
 - rspec-collection_matchers.gemspec
-- script/test_all
+- script/legacy_setup.sh
+- script/run_build
+- script/update_rubygems_and_install_bundler
 - spec/rspec/collection_matchers/have_spec.rb
 - spec/rspec/collection_matchers/rails_extensions_spec.rb
 - spec/spec_helper.rb
@@ -87,11 +90,11 @@ licenses:
 - MIT
 metadata:
   bug_tracker_uri: https://github.com/rspec/rspec-collection_matchers/issues
-  changelog_uri: https://github.com/rspec/rspec-collection_matchers/blob/v1.2.0/Changelog.md
+  changelog_uri: https://github.com/rspec/rspec-collection_matchers/blob/v1.2.1/Changelog.md
   documentation_uri: https://rspec.info/documentation/
   mailing_list_uri: https://groups.google.com/forum/#!forum/rspec
   source_code_uri: https://github.com/rspec/rspec-collection_matchers
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -106,10 +109,10 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
-signing_key: 
+rubygems_version: 3.3.3
+signing_key:
 specification_version: 4
-summary: rspec-collection_matchers-1.2.0
+summary: rspec-collection_matchers-1.2.1
 test_files:
 - features/have.feature
 - features/support/env.rb

data/.travis.yml

@@ -1,27 +0,0 @@
-language: ruby
-script: "script/test_all"
-bundler_args: "--standalone --binstubs --without documentation"
-before_install:
-  - gem update --system --conservative || (gem i "rubygems-update:~>2.7" --no-document && update_rubygems)
-  - gem update bundler --conservative
-
-# In order to install old Rubies, we need to use old Ubuntu distibution.
-dist: trusty
-
-rvm:
-  - 1.8.7
-  - 1.9.2
-  - 1.9.3
-  - 2.0.0
-  - 2.1
-  - 2.2.10
-  - 2.3.8
-  - 2.4.6
-  - 2.5.5
-  - 2.6.3
-  - ree
-  - jruby-19mode
-  - jruby-18mode
-env:
-  - BRANCH=master
-  - BRANCH=2-99-maintenance