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.

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

Fix specs for ruby head. #3124

Merged
merged 2 commits into from
Nov 20, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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 lib/rspec/core/drb.rb
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@ def add_full_description(argv)
def add_filter(argv, name, hash)
hash.each_pair do |k, v|
next if CONDITIONAL_FILTERS.include?(k)
tag = name == :inclusion ? k.to_s : "~#{k}".dup
tag = name == :inclusion ? k.to_s.dup : "~#{k}".dup
tag << ":#{v}" if v.is_a?(String)
argv << "--tag" << tag
end unless hash.empty?
Expand Down
4 changes: 2 additions & 2 deletions spec/integration/spec_file_load_errors_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -222,9 +222,9 @@ def foo
While loading ./broken_file a `raise SyntaxError` occurred, RSpec will now quit.
EOS

# A fix was backported to 3.2.3
# There was a fix was backported in 3.2.3, but syntax changed in 3.4.0 in terms of line endings
if RUBY_VERSION > '3.2.2'
expect(formatted_output).to include unindent(<<-EOS)
expect(formatted_output.gsub(/\n\n/, "\n")).to include unindent(<<-EOS)
SyntaxError:
--> ./tmp/aruba/broken_file.rb
Unmatched keyword, missing `end' ?
Expand Down
Loading