From d4e5d63d7e6eb896a0dead45d91f4f611773aaff Mon Sep 17 00:00:00 2001 From: Jarek Radosz Date: Tue, 25 Feb 2025 02:28:01 +0100 Subject: [PATCH] DEV: Fix command error message formatting (#31491) a follow up to 51b0903f514c3c22569401e74ebd1215c317d787 --- lib/discourse.rb | 2 +- spec/lib/discourse_spec.rb | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/lib/discourse.rb b/lib/discourse.rb index c9d740237de..e70685ccd20 100644 --- a/lib/discourse.rb +++ b/lib/discourse.rb @@ -169,7 +169,7 @@ module Discourse stdout, stderr, status = Open3.capture3(*args, chdir: chdir) if !status.exited? || !success_status_codes.include?(status.exitstatus) - message = [command, failure_message, stderr].filter(&:present?).join("\n") + message = [command.join(" "), failure_message, stderr].filter(&:present?).join("\n") raise CommandError.new(message, stdout: stdout, stderr: stderr, status: status) end diff --git a/spec/lib/discourse_spec.rb b/spec/lib/discourse_spec.rb index 2838ec9db0e..2e99924e1d5 100644 --- a/spec/lib/discourse_spec.rb +++ b/spec/lib/discourse_spec.rb @@ -553,8 +553,8 @@ RSpec.describe Discourse do it "includes the command in the error message" do expect do - Discourse::Utils.execute_command("false", failure_message: "oops") - end.to raise_error(RuntimeError, "false\noops") + Discourse::Utils.execute_command("false", "'foo'", failure_message: "oops") + end.to raise_error(RuntimeError, "false 'foo'\noops") end end