Merge pull request #684 from dakolech/master

Get rid off undefined method `start_with?' for nil:NilClass error
rails · Jun 23, 2022 · ddc411a · ddc411a
2 parents dd961f1 + b8523b3
commit ddc411a
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/lib/sprockets/path_utils.rb b/lib/sprockets/path_utils.rb
@@ -162,7 +162,7 @@ def set_pipeline(path, mime_exts, pipeline_exts, pipeline)
     def split_subpath(path, subpath)
       return "" if path == subpath
       path = File.join(path, ''.freeze)
-      if subpath.start_with?(path)
+      if subpath&.start_with?(path)
         subpath[path.length..-1]
       else
         nil

diff --git a/test/test_path_utils.rb b/test/test_path_utils.rb
@@ -109,6 +109,8 @@ def test_split_subpath_from_root_path
     subpath = File.expand_path("../fixtures/default/app/application.js", __FILE__)
     assert_equal "app/application.js", split_subpath(path, subpath)
 
+    assert_equal nil, split_subpath(path, nil)
+
     subpath = File.expand_path("../fixtures/default", __FILE__)
     assert_equal "", split_subpath(path, subpath)