Merge pull request #196 from Shopify/cbruckmayer/handle-type-error

Handle path nil
Shopify · Feb 17, 2023 · c012a32 · c012a32
2 parents c3e63e1 + 682526f
commit c012a32
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/ruby/lib/minitest/queue.rb b/ruby/lib/minitest/queue.rb
@@ -144,7 +144,7 @@ def self.project_root
 
     def self.relative_path(path, root: project_root)
       Pathname(path).relative_path_from(Pathname(root)).to_s
-    rescue ArgumentError
+    rescue ArgumentError, TypeError
       path
     end
 

diff --git a/ruby/test/minitest/queue/run_command_formatter_test.rb b/ruby/test/minitest/queue/run_command_formatter_test.rb
@@ -62,5 +62,10 @@ def test_relative_path_with_empty_path
       path = Minitest::Queue.relative_path('', root: '/home/willem/src/project')
       assert_equal "", path
     end
+
+    def test_relative_path_with_nil_path
+      path = Minitest::Queue.relative_path(nil, root: '/home/willem/src/project')
+      refute path
+    end
   end
 end