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-07-15) #1475

Merged
merged 2 commits into from
Jul 16, 2024
Merged

Updates from rspec-dev (2024-07-15) #1475

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1c1b211
Updated ci build scripts (from rspec-dev) 3-13
JonRowe Jul 15, 2024
167d9e5
Fix for Ruby 3.4 output in cucumber scenarios
JonRowe Jul 15, 2024
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-09T08:58:35+02:00 from the rspec-dev repo.
# This file was generated on 2024-07-15T22:27: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-09T08:58:35+02:00 from the rspec-dev repo.
# This file was generated on 2024-07-15T22:27: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-09T08:58:35+02:00 from the rspec-dev repo.
# This file was generated on 2024-07-15T22:27: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: 2 additions & 0 deletions features/step_definitions/additional_cli_steps.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,8 @@
table.raw.flatten.each do |string|
if RUBY_VERSION == '1.8.7' && string =~ /\{.+=>.+\}/
warn "Skipping checking #{string} on 1.8.7 because hash ordering is not consistent"
elsif RUBY_VERSION.to_f > 3.3
expect(all_output).to include_output_string string.gsub('undefined method `', "undefined method '")
else
expect(all_output).to include_output_string string
end
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-09T08:58:35+02:00 from the rspec-dev repo.
# This file was generated on 2024-07-15T22:27: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
2 changes: 1 addition & 1 deletion 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-09T08:58:35+02:00 from the rspec-dev repo.
# This file was generated on 2024-07-15T22:27: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/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-09T08:58:35+02:00 from the rspec-dev repo.
# This file was generated on 2024-07-15T22:27: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
9 changes: 8 additions & 1 deletion 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-09T08:58:35+02:00 from the rspec-dev repo.
# This file was generated on 2024-07-15T22:27: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 @@ -68,6 +68,13 @@ function run_cukes {
RUBYOPT="-I${PWD}/../bundle -rbundler/setup" \
PATH="${PWD}/bin:$PATH" \
bin/cucumber --strict
elif is_ruby_head; then
# This is a monkey patch to fix an issue with cucumber using outdated hash syntax, remove when cucumber is updated or ruby 3.4 released
sed -i '$i\class Hash; alias :__initialize :initialize; def initialize(*args, **_kw, &block) = __initialize(*args, &block); end' bin/cucumber

RUBYOPT="${RUBYOPT} -I${PWD}/../bundle -rbundler/setup" \
PATH="${PWD}/bin:$PATH" \
bin/cucumber --strict
else
# Prepare RUBYOPT for scenarios that are shelling out to ruby,
# and PATH for those that are using `rspec` or `rake`.
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-09T08:58:35+02:00 from the rspec-dev repo.
# This file was generated on 2024-07-15T22:27: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/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-09T08:58:35+02:00 from the rspec-dev repo.
# This file was generated on 2024-07-15T22:27: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
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-09T08:58:35+02:00 from the rspec-dev repo.
# This file was generated on 2024-07-15T22:27: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-09T08:58:35+02:00 from the rspec-dev repo.
# This file was generated on 2024-07-15T22:27: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-09T08:58:35+02:00 from the rspec-dev repo.
# This file was generated on 2024-07-15T22:27: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