rspec · JonRowe · Sep 9, 2022 · Sep 9, 2022
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -1,4 +1,4 @@
-# This file was generated on 2022-09-09T13:21:55+01:00 from the rspec-dev repo.
+# This file was generated on 2022-09-09T14:27:55+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.
 
 name: RSpec CI
@@ -22,7 +22,7 @@ jobs:
     name: Rubocop
     runs-on: 'ubuntu-20.04'
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
       - uses: ruby/setup-ruby@v1
         with:
           ruby-version: '3.0'
@@ -47,7 +47,7 @@ jobs:
           - 2.3
         env:
           -
-            RAILS_VERSION: '~> 6.1.0'
+            __UNUSED_VARIABLE: "Prevents build error when {matrix.env} is used."
         include:
           - ruby: ruby-head
             env:

diff --git a/.rubocop_rspec_base.yml b/.rubocop_rspec_base.yml
@@ -1,4 +1,4 @@
-# This file was generated on 2022-09-09T13:21:55+01:00 from the rspec-dev repo.
+# This file was generated on 2022-09-09T14:27:55+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.
 
 # This file contains defaults for RSpec projects. Individual projects

diff --git a/script/ci_functions.sh b/script/ci_functions.sh
@@ -1,4 +1,4 @@
-# This file was generated on 2022-09-09T13:21:55+01:00 from the rspec-dev repo.
+# This file was generated on 2022-09-09T14:27:55+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.
 
 # Taken from:

diff --git a/script/clone_all_rspec_repos b/script/clone_all_rspec_repos
@@ -1,5 +1,5 @@
 #!/bin/bash
-# This file was generated on 2022-09-09T13:21:55+01:00 from the rspec-dev repo.
+# This file was generated on 2022-09-09T14:27:55+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

diff --git a/script/functions.sh b/script/functions.sh
@@ -1,4 +1,4 @@
-# This file was generated on 2022-09-09T13:21:55+01:00 from the rspec-dev repo.
+# This file was generated on 2022-09-09T14:27:55+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.
 
 SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
@@ -192,6 +192,9 @@ function run_all_spec_suites {
   fold "rspec-expectations specs" run_spec_suite_for "rspec-expectations"
   fold "rspec-mocks specs" run_spec_suite_for "rspec-mocks"
   if rspec_rails_compatible; then
+    if ! is_ruby_27_plus; then
+      export RAILS_VERSION='~> 6.1.0'
+    fi
     fold "rspec-rails specs" run_spec_suite_for "rspec-rails"
   fi
 

diff --git a/script/predicate_functions.sh b/script/predicate_functions.sh
@@ -1,4 +1,4 @@
-# This file was generated on 2022-09-09T13:21:55+01:00 from the rspec-dev repo.
+# This file was generated on 2022-09-09T14:27:55+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.
 
 function is_mri {
@@ -95,6 +95,14 @@ function is_ruby_25_plus {
   fi
 }
 
+function is_ruby_27_plus {
+  if ruby -e "exit(RUBY_VERSION.to_f >= 2.7)"; then
+    return 0
+  else
+    return 1
+  fi
+}
+
 function is_ruby_31_plus {
   if ruby -e "exit(RUBY_VERSION.to_f >= 3.1)"; then
     return 0

diff --git a/script/run_build b/script/run_build
@@ -1,5 +1,5 @@
 #!/bin/bash
-# This file was generated on 2022-09-09T13:21:55+01:00 from the rspec-dev repo.
+# This file was generated on 2022-09-09T14:27:55+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

diff --git a/script/run_rubocop b/script/run_rubocop
@@ -1,5 +1,5 @@
 #!/bin/bash
-# This file was generated on 2022-09-09T13:21:55+01:00 from the rspec-dev repo.
+# This file was generated on 2022-09-09T14:27:55+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

diff --git a/script/update_rubygems_and_install_bundler b/script/update_rubygems_and_install_bundler
@@ -1,5 +1,5 @@
 #!/bin/bash
-# This file was generated on 2022-09-09T13:21:55+01:00 from the rspec-dev repo.
+# This file was generated on 2022-09-09T14:27:55+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