Test command with env

jcouball · jcouball · commit 6d13a32bf911 · 2022-08-31T17:17:43.000-07:00
diff --git a/tests/units/test_merge.rb b/tests/units/test_merge.rb
@@ -74,9 +74,30 @@ def env
   end
 
   def env_var(name)
+    windows_platform? ? "%#{name}%" : "$#{name}"
+  end
 
+  def windows_platform?
+    # Check if on Windows via RUBY_PLATFORM (CRuby) and RUBY_DESCRIPTION (JRuby)
+    win_platform_regex = /mingw|mswin/
+    RUBY_PLATFORM =~ win_platform_regex || RUBY_DESCRIPTION =~ win_platform_regex
   end
+
   def command(cmd)
+    puts '-' * 80
+    puts "Running: #{cmd}"
+    puts '-' * 10
+    output, status = Open3.capture2e("#{cmd} 2>&1")
+    puts output
+    puts '-' * 10
+    pp status
+    puts '-' * 80
+    puts
+
+    exit 1 unless status.success?
+  end
+
+  def command_with_env(env, cmd)
     puts '-' * 80
     puts "Running: #{cmd}"
     puts '-' * 10
@@ -106,7 +127,10 @@ def work_tree
   end
 
   def test_command_with_env
-
+    command_with_env(
+      { 'PATH' => 'testing' },
+      %Q(echo "#{env_var('PATH')}" 2>&1)
+    )
   end
 
   def test_octopus_merge
