diff --git a/.github/dependabot.yml b/.github/dependabot.yml index c8d6ee094..851a34974 100644 --- a/.github/dependabot.yml +++ b/.github/dependabot.yml @@ -1,4 +1,4 @@ -# This file was generated on 2024-07-15T22:27:33+01:00 from the rspec-dev repo. +# This file was generated on 2024-09-03T14:29:32+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. version: 2 diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index aa95b8776..64524ee97 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -1,4 +1,4 @@ -# This file was generated on 2024-07-15T22:27:33+01:00 from the rspec-dev repo. +# This file was generated on 2024-09-03T14:29:32+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 diff --git a/.rubocop_rspec_base.yml b/.rubocop_rspec_base.yml index 49b4c1f47..b6ab82080 100644 --- a/.rubocop_rspec_base.yml +++ b/.rubocop_rspec_base.yml @@ -1,4 +1,4 @@ -# This file was generated on 2024-07-15T22:27:33+01:00 from the rspec-dev repo. +# This file was generated on 2024-09-03T14:29:32+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 index 1e93b3079..4d6dec0e5 100644 --- a/script/ci_functions.sh +++ b/script/ci_functions.sh @@ -1,4 +1,4 @@ -# This file was generated on 2024-07-15T22:27:33+01:00 from the rspec-dev repo. +# This file was generated on 2024-09-03T14:29:32+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 index fdfdf341c..33ce8207e 100755 --- a/script/clone_all_rspec_repos +++ b/script/clone_all_rspec_repos @@ -1,5 +1,5 @@ #!/bin/bash -# This file was generated on 2024-07-15T22:27:33+01:00 from the rspec-dev repo. +# This file was generated on 2024-09-03T14:29:32+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 @@ -12,7 +12,7 @@ if is_mri; then clone_repo "rspec-core" clone_repo "rspec-expectations" clone_repo "rspec-mocks" - clone_repo "rspec-rails" "rspec-rails" "6-1-maintenance" + clone_repo "rspec-rails" "rspec-rails" "7-0-maintenance" if rspec_support_compatible; then clone_repo "rspec-support" diff --git a/script/cucumber.sh b/script/cucumber.sh index 3e3ce5bb4..e3e51d2f6 100755 --- a/script/cucumber.sh +++ b/script/cucumber.sh @@ -1,5 +1,5 @@ #!/bin/bash -# This file was generated on 2024-07-15T22:27:33+01:00 from the rspec-dev repo. +# This file was generated on 2024-09-03T14:29:32+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 index d715b9c16..31ddc7fbd 100644 --- a/script/functions.sh +++ b/script/functions.sh @@ -1,4 +1,4 @@ -# This file was generated on 2024-07-15T22:27:33+01:00 from the rspec-dev repo. +# This file was generated on 2024-09-03T14:29:32+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 )" @@ -204,9 +204,6 @@ 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/legacy_setup.sh b/script/legacy_setup.sh index 635c77ab9..07f051177 100755 --- a/script/legacy_setup.sh +++ b/script/legacy_setup.sh @@ -1,5 +1,5 @@ #!/bin/bash -# This file was generated on 2024-07-15T22:27:33+01:00 from the rspec-dev repo. +# This file was generated on 2024-09-03T14:29:32+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/predicate_functions.sh b/script/predicate_functions.sh index a9b928b41..b3e837860 100644 --- a/script/predicate_functions.sh +++ b/script/predicate_functions.sh @@ -1,4 +1,4 @@ -# This file was generated on 2024-07-15T22:27:33+01:00 from the rspec-dev repo. +# This file was generated on 2024-09-03T14:29:32+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 { @@ -112,13 +112,8 @@ function is_ruby_31_plus { } function rspec_rails_compatible { - if is_ruby_25_plus; then - # TODO remove when RSpec-Rails build is 3.1 safe by default - if is_ruby_31_plus; then - return 1 - else - return 0 - fi + if is_ruby_27_plus; then + return 0 else return 1 fi diff --git a/script/run_build b/script/run_build index 70a4640dd..3eb289e86 100755 --- a/script/run_build +++ b/script/run_build @@ -1,5 +1,5 @@ #!/bin/bash -# This file was generated on 2024-07-15T22:27:33+01:00 from the rspec-dev repo. +# This file was generated on 2024-09-03T14:29:32+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 index be676538b..c9a3433e5 100755 --- a/script/run_rubocop +++ b/script/run_rubocop @@ -1,5 +1,5 @@ #!/bin/bash -# This file was generated on 2024-07-15T22:27:33+01:00 from the rspec-dev repo. +# This file was generated on 2024-09-03T14:29:32+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 index c9fa78d63..b1643541e 100755 --- 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 2024-07-15T22:27:33+01:00 from the rspec-dev repo. +# This file was generated on 2024-09-03T14:29:32+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