From 40c9a3dad5bc18213eb9b5ad21aa00580c12c77b Mon Sep 17 00:00:00 2001 From: Benoit Daloze Date: Mon, 26 Feb 2024 14:45:28 +0100 Subject: [PATCH] Update to ruby/mspec@36e8ed8 --- spec/mspec/spec/integration/run_spec.rb | 9 +++++---- spec/mspec/spec/integration/tag_spec.rb | 9 +++++---- spec/mspec/spec/spec_helper.rb | 2 ++ 3 files changed, 12 insertions(+), 8 deletions(-) diff --git a/spec/mspec/spec/integration/run_spec.rb b/spec/mspec/spec/integration/run_spec.rb index 90dc051543..ea0735e9b2 100644 --- a/spec/mspec/spec/integration/run_spec.rb +++ b/spec/mspec/spec/integration/run_spec.rb @@ -1,20 +1,21 @@ require 'spec_helper' RSpec.describe "Running mspec" do + q = BACKTRACE_QUOTE a_spec_output = <' -CWD/spec/fixtures/a_spec.rb:2:in `' +CWD/spec/fixtures/a_spec.rb:8:in #{q}block (2 levels) in ' +CWD/spec/fixtures/a_spec.rb:2:in #{q}' 2) Foo#bar fails ERROR RuntimeError: failure -CWD/spec/fixtures/a_spec.rb:12:in `block (2 levels) in ' -CWD/spec/fixtures/a_spec.rb:2:in `' +CWD/spec/fixtures/a_spec.rb:12:in #{q}block (2 levels) in ' +CWD/spec/fixtures/a_spec.rb:2:in #{q}' Finished in D.DDDDDD seconds EOS diff --git a/spec/mspec/spec/integration/tag_spec.rb b/spec/mspec/spec/integration/tag_spec.rb index 33df1cfd40..ae08e9d45f 100644 --- a/spec/mspec/spec/integration/tag_spec.rb +++ b/spec/mspec/spec/integration/tag_spec.rb @@ -13,6 +13,7 @@ RSpec.describe "Running mspec tag" do it "tags the failing specs" do fixtures = "spec/fixtures" out, ret = run_mspec("tag", "--add fails --fail #{fixtures}/tagging_spec.rb") + q = BACKTRACE_QUOTE expect(out).to eq <' -CWD/spec/fixtures/tagging_spec.rb:3:in `' +CWD/spec/fixtures/tagging_spec.rb:9:in #{q}block (2 levels) in ' +CWD/spec/fixtures/tagging_spec.rb:3:in #{q}' 2) Tag#me érròrs in unicode FAILED Expected 1 == 2 to be truthy but was false -CWD/spec/fixtures/tagging_spec.rb:13:in `block (2 levels) in ' -CWD/spec/fixtures/tagging_spec.rb:3:in `' +CWD/spec/fixtures/tagging_spec.rb:13:in #{q}block (2 levels) in ' +CWD/spec/fixtures/tagging_spec.rb:3:in #{q}' Finished in D.DDDDDD seconds diff --git a/spec/mspec/spec/spec_helper.rb b/spec/mspec/spec/spec_helper.rb index 3a749581ee..5cabfe5626 100644 --- a/spec/mspec/spec/spec_helper.rb +++ b/spec/mspec/spec/spec_helper.rb @@ -66,3 +66,5 @@ PublicMSpecMatchers = Class.new { include MSpecMatchers public :raise_error }.new + +BACKTRACE_QUOTE = RUBY_VERSION >= "3.4" ? "'" : "`"