rspec-its 1.3.0 → 1.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3cfe85990115a44650dbb9504dd24e6e420d16b3d238d605ae549996a6c13875
-  data.tar.gz: 0c51a50090b6e2259afddc89c53d80e5b04ad3a2f097c3a5ae396f9342d4710e
+  metadata.gz: ede48c8c66058550c26cb470fbbc8a0e8cdc42693b2bd67a9996a5ef010c94a4
+  data.tar.gz: b0bfe107c8683af7f7797ec123a9d4677da93b53364af49808bc7d8dc0c51d0e
 SHA512:
-  metadata.gz: 7f985aeec4c6eff52cf67a5dfadf97d93ddca29637323b2cda6e6411b4d0606cd535209cfad8bf332c3120af2c811585919c533117c1f93c0b58a9e5c5db630f
-  data.tar.gz: 16d40f864a714c522ba2433995feaa2009d093f4543980fe4b5fbe01c7292d23abbfbba624ec64bdf0d7f1b30ae51158cd29219fa08ce2373d7eb06849a346f7
+  metadata.gz: 5d0e4aa570b53ed61476c17a616d4b60dca827e78d74fff470b775b034502fbf5e22eb3bbecafae894833614d1f90b61f1aaf97ae32e83acf5a37d445118797e
+  data.tar.gz: 7f032617d48bc1fe4e499f002583463b4c474fd1145fc7398c96696870a1d0b8694afc4bfd672219d411b70a35f6f5c9ee0d8552ef0508639161deee17d8a472

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/dependabot.yml

@@ -0,0 +1,6 @@
+version: 2
+updates:
+  - package-ecosystem: "github-actions"
+    directory: "/"
+    schedule:
+      interval: "weekly"

data/.github/workflows/ci.yml

@@ -0,0 +1,131 @@
+name: RSpec CI
+on:
+  push:
+    branches:
+      - 'main'
+      - '*-maintenance'
+      - '*-dev'
+  pull_request:
+    branches:
+      - '*'
+env:
+  BRANCH: '3-12-maintenance'
+  RSPEC_CI: true
+jobs:
+  test:
+    name: Ruby ${{ matrix.ruby }} ${{ matrix.name_extra || '' }}
+    runs-on: ${{ matrix.os || 'ubuntu-20.04' }}
+    strategy:
+      matrix:
+        ruby:
+          - '3.2'
+          - '3.1'
+          - '3.0'
+          - 2.7
+          - 2.6
+          - 2.5
+          - 2.4
+          - 2.3
+          - 2.2
+          - 2.1.9
+        env:
+          -
+            BRANCH: "main"
+        include:
+          - ruby: jruby-9.2.13.0
+            env:
+              JRUBY_OPTS: "--dev"
+          # Compatibility builds
+          - ruby: '3.2'
+            name_extra: "against RSpec 3.12"
+            env:
+              BRANCH: "3-12-maintenance"
+          - ruby: '3.1'
+            name_extra: "against RSpec 3.11"
+            env:
+              BRANCH: "3-11-maintenance"
+          - ruby: '3.1'
+            name_extra: "against RSpec 3.10"
+            env:
+              BRANCH: "3-10-maintenance"
+          - ruby: '3.0'
+            name_extra: "against RSpec 3.9"
+            env:
+              BRANCH: "3-9-maintenance"
+          - ruby: '3.0'
+            name_extra: "against RSpec 3.8"
+            env:
+              BRANCH: "3-8-maintenance"
+          - ruby: '3.0'
+            name_extra: "against RSpec 3.7"
+            env:
+              BRANCH: "3-7-maintenance"
+          - ruby: '3.0'
+            name_extra: "against RSpec 3.6"
+            env:
+              BRANCH: "3-6-maintenance"
+          - ruby: '3.0'
+            name_extra: "against RSpec 3.5"
+            env:
+              BRANCH: "3-5-maintenance"
+          - ruby: '3.0'
+            name_extra: "against RSpec 3.4"
+            env:
+              BRANCH: "3-4-maintenance"
+          - ruby: '3.0'
+            name_extra: "against RSpec 3.3"
+            env:
+              BRANCH: "3-3-maintenance"
+          - ruby: '3.0'
+            name_extra: "against RSpec 3.2"
+            env:
+              BRANCH: "3-2-maintenance"
+          - ruby: '3.0'
+            name_extra: "against RSpec 3.1"
+            env:
+              BRANCH: "3-1-maintenance"
+          - ruby: '3.0'
+            name_extra: "against RSpec 3.0"
+            env:
+              BRANCH: "3-0-maintenance"
+
+      fail-fast: false
+    continue-on-error: ${{ matrix.allow_failure || endsWith(matrix.ruby, 'head') }}
+    env: ${{ matrix.env }}
+    steps:
+      - uses: actions/checkout@v3
+      - uses: ruby/setup-ruby@v1
+        with:
+          bundler: ${{ matrix.bundler || 2 }}
+          ruby-version: ${{ matrix.ruby }}
+      - run: script/update_rubygems_and_install_bundler
+      - run: bundle install --binstubs --standalone
+      - run: script/test_all
+
+  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:
+        container:
+          - version: "2.0"
+            tag: ghcr.io/rspec/docker-ci:2.0.0
+          - version: "1.9.3"
+            tag: ghcr.io/rspec/docker-ci:1.9.3
+          - version: "JRuby 1.7"
+            tag: ghcr.io/rspec/docker-ci:jruby-1.7
+          - version: "JRuby 9.1.17.0"
+            tag: ghcr.io/rspec/docker-ci:jruby-9.1.17.0
+            options: "--add-host rubygems.org:151.101.129.227 --add-host api.rubygems.org:151.101.129.227"
+    env:
+      ACTIONS_ALLOW_USE_UNSECURE_NODE_VERSION: true
+      LEGACY_CI: true
+      JRUBY_OPTS: ${{ matrix.container.jruby_opts || '--dev' }}
+    steps:
+      - uses: actions/checkout@v3
+      - run: script/legacy_setup.sh
+      - run: script/test_all

data/Changelog.md

@@ -1,3 +1,11 @@
+### 1.3.1 / 2024-10-23
+[full changelog](http://github.com/rspec/rspec-its/compare/v1.3.0...v1.3.1)
+
+Bug fixes:
+
+* Prevent overridden `example` methods causing issues by creating our own
+  Example Group creation alias `__its_example`. (Jon Rowe, #95)
+
 ### 1.3.0 / 2019-04-09
 [full changelog](http://github.com/rspec/rspec-its/compare/v1.2.0...v1.3.0)
 

data/Gemfile

@@ -4,31 +4,35 @@ source 'https://rubygems.org'
 gemspec
 
 %w[rspec rspec-core rspec-expectations rspec-mocks rspec-support].each do |lib|
-  branch = ENV.fetch('BRANCH','3-1-maintenance')
+  branch = ENV.fetch('BRANCH','main')
   library_path = File.expand_path("../../#{lib}", __FILE__)
+
   if File.exist?(library_path) && !ENV['USE_GIT_REPOS']
     gem lib, :path => library_path
+  elsif lib == 'rspec'
+    gem 'rspec', :git => "https://github.com/rspec/rspec-metagem.git", :branch => branch
   else
-    gem lib, :git => "git://github.com/rspec/#{lib}.git",
-             :branch => branch
+    gem lib, :git => "https://github.com/rspec/#{lib}.git", :branch => branch
   end
 end
 
-if RUBY_VERSION < '2.0.0' && !!(RbConfig::CONFIG['host_os'] =~ /cygwin|mswin|mingw|bccwin|wince|emx/)
-  gem 'ffi', '< 1.9.15' # allow ffi to be installed on older rubies on windows
-elsif RUBY_VERSION < '1.9'
+if RUBY_VERSION < '2.2.0' && !!(RbConfig::CONFIG['host_os'] =~ /cygwin|mswin|mingw|bccwin|wince|emx/)
+  gem 'ffi', '< 1.10'
+elsif RUBY_VERSION < '2.4.0' && !!(RbConfig::CONFIG['host_os'] =~ /cygwin|mswin|mingw|bccwin|wince|emx/)
+  gem 'ffi', '< 1.15'
+elsif RUBY_VERSION < '2.0'
   gem 'ffi', '< 1.9.19' # ffi dropped Ruby 1.8 support in 1.9.19
+elsif RUBY_VERSION < '2.3.0'
+  gem 'ffi', '~> 1.12.0'
 else
-  gem 'ffi', '~> 1.9.25'
+  gem 'ffi', '~> 1.15.0'
 end
 
 # test coverage
 # gem 'simplecov', :require => false
 
+gem 'contracts', '< 0.16' if RUBY_VERSION < '1.9.0'
+
 gem 'coveralls', :require => false, :platform => :mri_20
 
 eval File.read('Gemfile-custom') if File.exist?('Gemfile-custom')
-
-platform :rbx do
-  gem 'rubysl'
-end

data/features/its.feature

@@ -1,5 +1,6 @@
 Feature: attribute of subject
 
+  @pre-3-9
   Scenario: specify value of a nested attribute
     Given a file named "example_spec.rb" with:
       """ruby
@@ -31,6 +32,38 @@ Feature: attribute of subject
             should eq "555-1212"
       """
 
+  @post-3-9
+  Scenario: specify value of a nested attribute
+    Given a file named "example_spec.rb" with:
+      """ruby
+      class Person
+        attr_reader :phone_numbers
+        def initialize
+          @phone_numbers = []
+        end
+      end
+
+      describe Person do
+        context "with one phone number (555-1212)"do
+          subject do
+            person = Person.new
+            person.phone_numbers << "555-1212"
+            person
+          end
+
+          its("phone_numbers.first") { should eq("555-1212") }
+        end
+      end
+      """
+    When I run rspec with the documentation option
+    Then the output should contain:
+      """
+      Person
+        with one phone number (555-1212)
+          phone_numbers.first
+            is expected to eq "555-1212"
+      """
+
   Scenario: specify value of an attribute of a hash
     Given a file named "example_spec.rb" with:
       """ruby
@@ -124,7 +157,7 @@ Feature: attribute of subject
     When I run rspec specifying line number 2
     Then the examples should all pass
 
-  Scenario: specify a method throws an expection
+  Scenario: specify a method throws an exception
     Given a file named "example_spec.rb" with:
       """ruby
       class Klass
@@ -142,7 +175,7 @@ Feature: attribute of subject
     When I run rspec
     Then the examples should all pass
 
-  Scenario: specify a method does not throw an expection
+  Scenario: specify a method does not throw an exception
     Given a file named "example_spec.rb" with:
       """ruby
       class Klass; end

data/features/support/env.rb

@@ -2,22 +2,14 @@ require 'aruba/cucumber'
 require 'rspec/core'
 require 'rspec/its'
 
-Before do
-  if RUBY_PLATFORM =~ /java/ || defined?(Rubinius)
-    @aruba_timeout_seconds = 60
-  else
-    @aruba_timeout_seconds = 10
-  end
-end
-
 Aruba.configure do |config|
-  config.before_cmd do |cmd|
-    set_env('JRUBY_OPTS', "-X-C #{ENV['JRUBY_OPTS']}") # disable JIT since these processes are so short lived
+  config.before(:command) do |cmd|
+    cmd.environment['JRUBY_OPTS'] = "-X-C #{ENV['JRUBY_OPTS']}" # disable JIT since these processes are so short lived
   end
 end if RUBY_PLATFORM == 'java'
 
 Aruba.configure do |config|
-  config.before_cmd do |cmd|
-    set_env('RBXOPT', "-Xint=true #{ENV['RBXOPT']}") # disable JIT since these processes are so short lived
+  config.before(:command) do |cmd|
+    cmd.environment['RBXOPT'] = "-Xint=true #{ENV['RBXOPT']}" # disable JIT since these processes are so short lived
   end
 end if defined?(Rubinius)

data/lib/rspec/its/version.rb

@@ -1,5 +1,5 @@
 module RSpec
   module Its
-    VERSION = "1.3.0"
+    VERSION = "1.3.1"
   end
 end

data/lib/rspec/its.rb

@@ -1,6 +1,8 @@
 require 'rspec/its/version'
 require 'rspec/core'
 
+RSpec::Core::ExampleGroup.define_example_method :__its_example
+
 module RSpec
   module Its
 
@@ -166,7 +168,7 @@ module RSpec
         options << {} unless options.last.kind_of?(Hash)
         options.last.merge!(:caller => its_caller)
 
-        example(nil, *options, &block)
+        __its_example(nil, *options, &block)
 
       end
     end

data/rspec-its.gemspec

@@ -28,9 +28,22 @@ Gem::Specification.new do |spec|
 
   spec.add_runtime_dependency 'rspec-core', '>= 3.0.0'
   spec.add_runtime_dependency 'rspec-expectations', '>= 3.0.0'
-  spec.add_development_dependency 'bundler',  '> 1.3.0'
-  spec.add_development_dependency 'rake',     '~> 10.1.0'
-  spec.add_development_dependency 'cucumber', '~> 1.3.8'
-  spec.add_development_dependency "aruba",    "~> 0.6.2" # 0.7 is broken on ruby 1.8.7
 
+  if RUBY_VERSION.to_f < 1.9 || RUBY_VERSION == '1.9.2'
+    spec.add_development_dependency "rake",     "~> 10.0.0"
+  elsif RUBY_VERSION.to_f < 2
+    spec.add_development_dependency "rake",     "~> 11.0.0"
+  elsif RUBY_VERSION.to_f < 2.3
+    spec.add_development_dependency "rake",     "~> 12.3.2"
+  else
+    spec.add_development_dependency "rake",     "~> 13.0.0"
+  end
+
+  spec.add_development_dependency 'bundler',  '> 1.3.0'
+  if RUBY_VERSION.to_f < 2
+    spec.add_development_dependency 'cucumber', '< 3.0.0'
+  else
+    spec.add_development_dependency 'cucumber', '>= 1.3.8'
+  end
+  spec.add_development_dependency "aruba",    "~> 0.14.12"
 end

data/script/legacy_setup.sh

@@ -0,0 +1,16 @@
+#!/bin/bash
+set -e
+
+bundle install --standalone --binstubs
+
+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

@@ -14,10 +14,23 @@ bin/rspec spec --format progress --profile
 
 echo "Running cucumber specs"
 
+if [ -z ${BRANCH+" is set"} ]; then
+  echo "BRANCH must be set for this script."
+  exit 1
+else
+  echo "Using $BRANCH"
+fi
+
+if ruby -e 'exit(ENV.fetch("BRANCH") =~ /3-[0-8]-maintenance/ ? 0 : 1)'; then
+  TAGS="--tags @pre-3-9"
+else
+  TAGS="--tags @post-3-9"
+fi;
+
 if ruby -e "exit(defined?(RUBY_PLATFORM) && RUBY_PLATFORM == 'java')"; then
   # This is JRUBY which requires this one weird path trick...
   PATH="${PWD}/bin:$PATH" \
-  bundle exec cucumber --strict
+  bundle exec cucumber --strict $TAGS
 else
-  bundle exec cucumber --strict
+  bundle exec cucumber --strict $TAGS
 fi;

data/script/update_rubygems_and_install_bundler

@@ -4,6 +4,14 @@
 
 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
@@ -12,9 +20,14 @@ function is_ruby_23_plus {
   fi
 }
 
-if is_ruby_23_plus; then
-  gem update --system
-  gem install bundler
+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'

data/spec/rspec/its_spec.rb

@@ -9,6 +9,7 @@ module RSpec
           its([]) { expect(described_class).to be Its }
         end
       end
+
       context "with explicit subject" do
         subject do
           Class.new do
@@ -269,7 +270,6 @@ module RSpec
         end
 
         its(:good) { will_not raise_error }
-        its(:bad) { will raise_error }
         its(:bad) { will raise_error(ArgumentError) }
         its(:bad) { will raise_error("message") }
         its(:bad) { will raise_error(ArgumentError, "message") }
@@ -375,6 +375,20 @@ module RSpec
             raise_error(ArgumentError, '`will_not` only supports block expectations')
         end
       end
+
+      context "when example is redefined" do
+        subject do
+          Class.new do
+            def will_still_work; true; end
+          end.new
+        end
+
+        def self.example(*_args)
+          raise
+        end
+
+        its(:will_still_work) { is_expected.to be true }
+      end
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rspec-its
 version: !ruby/object:Gem::Version
-  version: 1.3.0
+  version: 1.3.1
 platform: ruby
 authors:
 - Peter Alfvin
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2019-04-09 00:00:00.000000000 Z
+date: 2024-10-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec-core
@@ -39,45 +39,45 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 3.0.0
 - !ruby/object:Gem::Dependency
-  name: bundler
+  name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">"
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3.0
+        version: 13.0.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">"
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3.0
+        version: 13.0.0
 - !ruby/object:Gem::Dependency
-  name: rake
+  name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">"
       - !ruby/object:Gem::Version
-        version: 10.1.0
+        version: 1.3.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">"
       - !ruby/object:Gem::Version
-        version: 10.1.0
+        version: 1.3.0
 - !ruby/object:Gem::Dependency
   name: cucumber
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.3.8
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.3.8
 - !ruby/object:Gem::Dependency
@@ -86,14 +86,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.6.2
+        version: 0.14.12
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.6.2
+        version: 0.14.12
 description: RSpec extension gem for attribute matching
 email:
 - palfvin@gmail.com
@@ -101,9 +101,11 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".github/FUNDING.yml"
+- ".github/dependabot.yml"
+- ".github/workflows/ci.yml"
 - ".gitignore"
 - ".rspec"
-- ".travis.yml"
 - Changelog.md
 - Gemfile
 - LICENSE.txt
@@ -115,6 +117,7 @@ files:
 - lib/rspec/its.rb
 - lib/rspec/its/version.rb
 - rspec-its.gemspec
+- script/legacy_setup.sh
 - script/test_all
 - script/update_rubygems_and_install_bundler
 - spec/rspec/its_spec.rb
@@ -124,11 +127,11 @@ licenses:
 - MIT
 metadata:
   bug_tracker_uri: https://github.com/rspec/rspec-its/issues
-  changelog_uri: https://github.com/rspec/rspec-its/blob/v1.3.0/Changelog.md
-  documentation_uri: https://www.rubydoc.info/gems/rspec-its/1.3.0
+  changelog_uri: https://github.com/rspec/rspec-its/blob/v1.3.1/Changelog.md
+  documentation_uri: https://www.rubydoc.info/gems/rspec-its/1.3.1
   mailing_list_uri: https://groups.google.com/forum/#!forum/rspec
   source_code_uri: https://github.com/rspec/rspec-its
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -143,8 +146,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
-signing_key: 
+rubygems_version: 3.5.16
+signing_key:
 specification_version: 4
 summary: Provides "its" method formerly part of rspec-core
 test_files:

data/.travis.yml

@@ -1,31 +0,0 @@
-language: ruby
-script: "script/test_all"
-email: false
-before_install:
-  - script/update_rubygems_and_install_bundler
-bundler_args: "--standalone --binstubs --without documentation"
-rvm:
-  - 1.8.7
-  - 1.9.2
-  - 1.9.3
-  - 2.0.0
-  - 2.1
-  - 2.2.10
-  - 2.3.8
-  - 2.4.5
-  - 2.5.3
-  - 2.6.0
-  - ruby-head
-  - ree
-  - jruby-9.2.5.0
-  - jruby-head
-  - jruby-1.7.27
-  - rbx-3
-env:
-  - JRUBY_OPTS='--dev'
-matrix:
-  allow_failures:
-    - rvm: jruby-head
-    - rvm: ruby-head
-    - rvm: rbx-3
-  fast_finish: true