rspec · JonRowe · Oct 26, 2022 · Nov 29, 2022 · Dec 10, 2022 · Dec 10, 2022
diff --git a/.github/FUNDING.yml b/.github/FUNDING.yml
@@ -1,4 +1,4 @@
-# This file was generated on 2020-12-25T18:48:30+00:00 from the rspec-dev repo.
+# This file was generated on 2023-04-16T20:53:21+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.
 
 github: [JonRowe, benoittgt]

diff --git a/.github/dependabot.yml b/.github/dependabot.yml
@@ -0,0 +1,9 @@
+# This file was generated on 2023-12-26T20:49:05+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.
+
+version: 2
+updates:
+  - package-ecosystem: "github-actions"
+    directory: "/"
+    schedule:
+      interval: "weekly"
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -1,4 +1,4 @@
-# This file was generated on 2022-09-08T12:41:59+01:00 from the rspec-dev repo.
+# This file was generated on 2023-12-26T20:49:05+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.
 
 name: RSpec CI
@@ -13,16 +13,19 @@ on:
       - '*'
 permissions:
   contents: read
+concurrency:
+  group: ${{ github.workflow }}-${{ github.head_ref || github.run_id }}
+  cancel-in-progress: true
 env:
   RSPEC_CI: true
   # This tells rspec-rails what branch to run in ci
-  RSPEC_VERSION: '= 3.12.0.pre'
+  RSPEC_VERSION: '~> 3.12.0'
 jobs:
   rubocop:
     name: Rubocop
     runs-on: 'ubuntu-20.04'
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - uses: ruby/setup-ruby@v1
         with:
           ruby-version: '3.0'
@@ -38,6 +41,8 @@ jobs:
     strategy:
       matrix:
         ruby:
+          - '3.3'
+          - '3.2'
           - '3.1'
           - '3.0'
           - 2.7
@@ -46,7 +51,6 @@ jobs:
           - 2.4
           - 2.3
           - 2.2
-          - 2.1.9
         env:
           -
             DIFF_LCS_VERSION: "> 1.4.3"
@@ -57,11 +61,6 @@ jobs:
           - ruby: jruby-9.2.13.0
             env:
               JRUBY_OPTS: "--dev"
-          - ruby: jruby-9.1.17.0
-            bundler: 1
-            os: ubuntu-18.04
-            env:
-              JRUBY_OPTS: "--dev"
           - ruby: 2.7
             name_extra: "with diff-lcs 1.3"
             env:
@@ -74,7 +73,7 @@ jobs:
     continue-on-error: ${{ matrix.allow_failure || endsWith(matrix.ruby, 'head') }}
     env: ${{ matrix.env }}
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - uses: ruby/setup-ruby@v1
         with:
           bundler: ${{ matrix.bundler || '2.2.22' }}
@@ -95,33 +94,40 @@ jobs:
       fail-fast: false
       matrix:
         container:
+          - version: "2.1.9"
+            tag: ghcr.io/rspec/docker-ci:2.1.9
+            post: git config --global --add safe.directory `pwd`
           - version: "2.0"
-            tag: rspec/ci:2.0.0
+            tag: ghcr.io/rspec/docker-ci:2.0.0
           - version: "1.9.3"
-            tag: rspec/ci:1.9.3
+            tag: ghcr.io/rspec/docker-ci:1.9.3
           - version: "1.9.2"
-            tag: rspec/ci:1.9.2
+            tag: ghcr.io/rspec/docker-ci:1.9.2
             options: "--add-host rubygems.org:151.101.129.227 --add-host api.rubygems.org:151.101.129.227"
           - version: "1.8.7"
-            tag: rspec/ci:1.8.7
+            tag: ghcr.io/rspec/docker-ci:1.8.7
             options: "--add-host rubygems.org:151.101.129.227 --add-host api.rubygems.org:151.101.129.227"
           - version: "REE"
-            tag: rspec/ci:ree
+            tag: ghcr.io/rspec/docker-ci:ree
             options: "--add-host rubygems.org:151.101.129.227 --add-host api.rubygems.org:151.101.129.227"
           - version: "JRuby 1.7"
-            tag: rspec/ci:jruby-1.7
+            tag: ghcr.io/rspec/docker-ci:jruby-1.7
           - version: "JRuby 1.7 1.8 mode"
-            tag: rspec/ci:jruby-1.7
+            tag: ghcr.io/rspec/docker-ci:jruby-1.7
             jruby_opts: '--dev --1.8'
             pre: gem uninstall jruby-openssl
             options: "--add-host rubygems.org:151.101.129.227 --add-host api.rubygems.org:151.101.129.227"
+          - 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:
       LEGACY_CI: true
       JRUBY_OPTS: ${{ matrix.container.jruby_opts || '--dev' }}
     steps:
       - uses: actions/checkout@v3
       - run: ${{ matrix.container.pre }}
       - run: script/legacy_setup.sh
+      - run: ${{ matrix.container.post }}
       - run: bundle exec bin/rspec
       - run: bundle exec script/cucumber.sh
 
@@ -137,14 +143,13 @@ jobs:
           - 2.4
           - 2.3
           - 2.2
-          - 2.1.9
       fail-fast: false
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - uses: ruby/setup-ruby@v1
         with:
           bundler: '2.2.22'
           ruby-version: ${{ matrix.ruby }}
           bundler-cache: true
-      - run: cinst ansicon
+      - run: choco install ansicon
       - run: bundle exec rspec --backtrace
diff --git a/.rubocop.yml b/.rubocop.yml
@@ -50,7 +50,7 @@ Lint/LiteralInInterpolation:
 Lint/NonLocalExitFromIterator:
   Enabled: false
 
-# We don't care about single vs double qoutes.
+# We don't care about single vs double quotes.
 Style/StringLiteralsInInterpolation:
   Enabled: false
 

diff --git a/.rubocop_rspec_base.yml b/.rubocop_rspec_base.yml
@@ -1,4 +1,4 @@
-# This file was generated on 2022-09-08T12:41:59+01:00 from the rspec-dev repo.
+# This file was generated on 2023-12-26T20:49:05+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.
 
 # This file contains defaults for RSpec projects. Individual projects

diff --git a/BUILD_DETAIL.md b/BUILD_DETAIL.md
@@ -1,5 +1,5 @@
 <!---
-This file was generated on 2020-12-25T18:48:30+00:00 from the rspec-dev repo.
+This file was generated on 2023-04-16T20:53:21+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.
 -->
 
@@ -50,7 +50,7 @@ project-specific threshold, the build will fail.
 ## Cukes
 
 RSpec uses [cucumber](https://cucumber.io/) for both acceptance testing
-and [documentation](https://relishapp.com/rspec). Since we publish our cukes
+and [documentation](https://rspec.info/documentation). Since we publish our cukes
 as documentation, please limit new cucumber scenarios to user-facing examples
 that help demonstrate usage. Any tests that exist purely to prevent regressions
 should be written as specs, even if they are written in an acceptance style.

diff --git a/CODE_OF_CONDUCT.md b/CODE_OF_CONDUCT.md
@@ -1,5 +1,5 @@
 <!---
-This file was generated on 2020-12-25T18:48:30+00:00 from the rspec-dev repo.
+This file was generated on 2023-04-16T20:53:21+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.
 -->
 

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
@@ -1,5 +1,5 @@
 <!---
-This file was generated on 2020-12-25T18:48:30+00:00 from the rspec-dev repo.
+This file was generated on 2023-04-16T20:53:21+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.
 -->
 
@@ -13,7 +13,7 @@ If you'd like to help make RSpec better, here are some ways you can contribute:
   - by running RSpec HEAD to help us catch bugs before new releases
   - by [reporting bugs you encounter](https://github.com/rspec/rspec-core/issues/new) with [report template](#report-template)
   - by [suggesting new features](https://github.com/rspec/rspec-core/issues/new)
-  - by improving RSpec's [Relish](https://relishapp.com/rspec) or [API](https://rspec.info/documentation/) documentation
+  - by improving RSpec's Feature or API [documentation](https://rspec.info/documentation/)
   - by improving [RSpec's website](https://rspec.info/) ([source](https://github.com/rspec/rspec.github.io))
   - by taking part in [feature and issue discussions](https://github.com/rspec/rspec-core/issues)
   - by adding a failing test for reproducible [reported bugs](https://github.com/rspec/rspec-core/issues)

diff --git a/Changelog.md b/Changelog.md
@@ -1,5 +1,42 @@
 ### Development
-[Full Changelog](https://github.com/rspec/rspec-core/compare/v3.11.0...main)
+[Full Changelog](https://github.com/rspec/rspec-core/compare/v3.12.2...main)
+
+Enhancements:
+
+* Support the `--backtrace` flag when using the JSON formatter. (Matt Larraz, #2980)
+* Ignore commented out lines in CLI config files (e.g. `.rspec`). (Junichi Ito, #2984)
+* Add `pending_failure_output` config option to allow skipping backtraces or
+  muting pending specs output. (Phil Pirozhkov, #2957)
+* Process `--dry-run` before configuration flags that read files so that introspecting
+  it returns the correct value. (Xenor Chang, #3008)
+* Allow specifying custom ordering strategies via `--order`. (Jon Rowe, #3025)
+* Use the improved `syntax_suggest` output for `SyntaxError` when available.
+  (Richard Schneeman, #3015, #3026)
+
+Bug fixes:
+
+* Use `__send__` in output wrapper to avoid issues with IO objects that implement `send`
+  like `Socket`. (Richard Platel, #3045)
+
+### 3.12.2 / 2023-04-18
+[Full Changelog](https://github.com/rspec/rspec-core/compare/v3.12.1...v3.12.2)
+
+Bug fixes:
+
+* Remove link to outdated documentation in generated output. (Jon Rowe, #3035)
+
+### 3.12.1 / 2023-02-03
+[Full Changelog](https://github.com/rspec/rspec-core/compare/v3.12.0...v3.12.1)
+
+Bug fixes:
+
+* Prevent multiple calls to `extra_failure_lines` from adding additional whitespace
+  around them when the lines already contain whitespace. (Jon Rowe, #3006)
+
+### 3.12.0 / 2022-10-26
+[Full Changelog](https://github.com/rspec/rspec-core/compare/v3.11.0...v3.12.0)
+
+* No changes, released to support other gems.
 
 ### 3.11.0 / 2022-02-09
 [Full Changelog](https://github.com/rspec/rspec-core/compare/v3.10.2...v3.11.0)

diff --git a/DEV-README.md b/DEV-README.md
@@ -23,6 +23,6 @@ Or ...
 ## Customize the dev environment
 
 The Gemfile includes the gems you'll need to be able to run specs. If you want
-to customize your dev enviroment with additional tools like guard or
+to customize your dev environment with additional tools like guard or
 ruby-debug, add any additional gem declarations to Gemfile-custom (see
 Gemfile-custom.sample for some examples).
diff --git a/DEVELOPMENT.md b/DEVELOPMENT.md
@@ -1,5 +1,5 @@
 <!---
-This file was generated on 2020-12-25T18:48:30+00:00 from the rspec-dev repo.
+This file was generated on 2023-04-16T20:53:21+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.
 -->
 

diff --git a/Gemfile b/Gemfile
@@ -96,6 +96,9 @@ end
 
 if RUBY_VERSION < '2.0.0'
   gem 'cucumber', "<= 1.3.22"
+elsif !ENV['DIFF_LCS_VERSION'].to_s.empty? && ENV['DIFF_LCS_VERSION'].scan(/\d\.\d/).first.to_f < 1.5
+  # Older version of diff-lcs cause a downstream error with cucumber and modern rails
+  gem "activesupport", "< 7"
 end
 
 gem 'contracts', '< 0.16' if RUBY_VERSION < '1.9.0'

diff --git a/Gemfile-custom.sample b/Gemfile-custom.sample
@@ -1,6 +1,5 @@
 group :development do
   gem 'interactive_rspec'
-  gem 'relish', '~> 0.6.0'
   gem 'guard-rspec', '~> 1.2.1'
   gem 'growl', '1.0.3'
   gem 'spork', '0.9.0'

diff --git a/ISSUE_TEMPLATE.md b/ISSUE_TEMPLATE.md
@@ -1,3 +1,8 @@
+<!---
+Note, we know RelishApp is down, its out of our hands...
+
+Please search for existing issues before reporting new ones.
+-->
 ### Subject of the issue
 <!---
 Describe your issue here.

diff --git a/README.md b/README.md
@@ -116,6 +116,11 @@ pretty much the same as `shared_examples` and `include_examples`, providing
 more accurate naming when you share hooks, `let` declarations, helper methods,
 etc, but no examples.
 
+If you want to reuse shared examples or contexts across your RSpec suite you can
+define them in a stand alone _*.rb_ files (_spec/support/shared_examples/definition.rb_
+for example). But you will have to manually `require` them (there is no autoloading of
+_spec/support/_ directory unless you set it up yourself).
+
 ## Metadata
 
 rspec-core stores a metadata hash with every example and group, which
@@ -322,14 +327,14 @@ Failures:
             got: nil
 
        (compared using ==)
-     # ./spec/calcalator_spec.rb:6:in `block (3 levels) in <top (required)>'
+     # ./spec/calculator_spec.rb:6:in `block (3 levels) in <top (required)>'
 
 Finished in 0.00131 seconds (files took 0.10968 seconds to load)
 1 example, 1 failure
 
 Failed examples:
 
-rspec ./spec/calcalator_spec.rb:5 # Calculator#add returns the sum of its arguments
+rspec ./spec/calculator_spec.rb:5 # Calculator#add returns the sum of its arguments
 ```
 
 Implement the simplest solution, by changing the definition of `Calculator#add` to:

diff --git a/REPORT_TEMPLATE.md b/REPORT_TEMPLATE.md
@@ -1,5 +1,5 @@
 <!---
-This file was generated on 2020-12-25T18:48:30+00:00 from the rspec-dev repo.
+This file was generated on 2023-04-16T20:53:21+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.
 -->
 

diff --git a/Rakefile b/Rakefile
@@ -43,36 +43,6 @@ task :rdoc do
   sh "yardoc"
 end
 
-with_changelog_in_features = lambda do |&block|
-  begin
-    sh "cp Changelog.md features/"
-    block.call
-  ensure
-    sh "rm features/Changelog.md"
-  end
-end
-
-desc "Push docs/cukes to relishapp using the relish-client-gem"
-task :relish, :version do |_t, args|
-  raise "rake relish[VERSION]" unless args[:version]
-
-  with_changelog_in_features.call do
-    if `relish versions rspec/rspec-core`.split.map(&:strip).include? args[:version]
-      puts "Version #{args[:version]} already exists"
-    else
-      sh "relish versions:add rspec/rspec-core:#{args[:version]}"
-    end
-    sh "relish push rspec/rspec-core:#{args[:version]}"
-  end
-end
-
-desc "Push to relish staging environment"
-task :relish_staging do
-  with_changelog_in_features.call do
-    sh "relish push rspec-staging/rspec-core"
-  end
-end
-
 task :default => [:spec, :cucumber, :rubocop]
 
 task :verify_private_key_present do

diff --git a/benchmarks/allocations/1000_groups_1_example.rb b/benchmarks/allocations/1000_groups_1_example.rb
@@ -100,7 +100,7 @@
   - 10K arrays
   - 10K sets
   - 5K FilterableItemRepository
-  - 5K HookCollecion
+  - 5K HookCollection
 
               class_plus                 count
 ---------------------------------------  -----

diff --git a/benchmarks/capture_block_vs_yield.rb b/benchmarks/capture_block_vs_yield.rb
@@ -84,7 +84,7 @@ def call_block_n_times(n, &block)
 a high constant cost, taking about 5x longer than a single `yield`
 (even if the block is never used!).
 
-However, fowarding a captured block can be faster than using `yield`
+However, forwarding a captured block can be faster than using `yield`
 if the block is used many times (the breakeven point is at about 20-25
 invocations), so it appears that he per-invocation cost of `yield`
 is higher than that of a captured-and-forwarded block.

diff --git a/benchmarks/flat_map_vs_inject.rb b/benchmarks/flat_map_vs_inject.rb
@@ -37,7 +37,7 @@ def flat_map_using_block(array, &block)
 Surprisingly, `flat_map(&block)` appears to be faster than
 `flat_map { yield }` in spite of the fact that our array here
 is smaller than the break-even point of 20-25 measured in the
-`capture_block_vs_yield.rb` benchmark. In fact, the forwaded-block
+`capture_block_vs_yield.rb` benchmark. In fact, the forwarded-block
 version remains faster in my benchmarks here no matter how small
 I shrink the `words` array. I'm not sure why!