diff --git a/lib/rspec/core/drb.rb b/lib/rspec/core/drb.rb index e44db97c3..31bfbf653 100644 --- a/lib/rspec/core/drb.rb +++ b/lib/rspec/core/drb.rb @@ -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? diff --git a/spec/integration/spec_file_load_errors_spec.rb b/spec/integration/spec_file_load_errors_spec.rb index 435d2ff26..609d0e04e 100644 --- a/spec/integration/spec_file_load_errors_spec.rb +++ b/spec/integration/spec_file_load_errors_spec.rb @@ -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' ?