Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Updates from rspec-dev (2024-09-03) #614

Merged
merged 1 commit into from
Sep 3, 2024
Merged

Updates from rspec-dev (2024-09-03) #614

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/dependabot.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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-03T15:04:33+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
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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-03T15:04:33+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
Expand Down
2 changes: 1 addition & 1 deletion .rubocop_rspec_base.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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-03T15:04:33+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
Expand Down
2 changes: 1 addition & 1 deletion script/ci_functions.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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-03T15:04:33+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:
Expand Down
4 changes: 2 additions & 2 deletions script/clone_all_rspec_repos
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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-03T15:04:33+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
Expand All @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion script/cucumber.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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-03T15:04:33+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
Expand Down
5 changes: 1 addition & 4 deletions script/functions.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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-03T15:04:33+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 )"
Expand Down Expand Up @@ -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

Expand Down
2 changes: 1 addition & 1 deletion script/legacy_setup.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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-03T15:04:33+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
Expand Down
11 changes: 3 additions & 8 deletions script/predicate_functions.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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-03T15:04:33+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 {
Expand Down Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion script/run_build
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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-03T15:04:33+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
Expand Down
2 changes: 1 addition & 1 deletion script/run_rubocop
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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-03T15:04:33+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
Expand Down
2 changes: 1 addition & 1 deletion script/update_rubygems_and_install_bundler
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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-03T15:04:33+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
Expand Down
Loading