Fix Bootsnap.unload_cache!

Fix: #421 It was broken because of some stupid rebase mistakes...
Shopify · Aug 11, 2022 · fbb7146 · fbb7146
1 parent 27735a5
commit fbb7146
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 2 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,7 @@
 # Unreleased
 
+* Fix `Bootsnap.unload_cache!`, it simply wouldn't work at all becaue of a merge mistake. See #421.
+
 # 1.13.0
 
 * Stop decorating `Kernel.load`. This used to be very useful in development because the Rails "classic" autoloader

diff --git a/lib/bootsnap.rb b/lib/bootsnap.rb
@@ -76,7 +76,7 @@ def setup(
       )
     end
 
-    def self.unload_cache!
+    def unload_cache!
       LoadPathCache.unload!
     end
 

diff --git a/lib/bootsnap/load_path_cache.rb b/lib/bootsnap/load_path_cache.rb
@@ -50,7 +50,6 @@ def unload!
         @realpath_cache = nil
         @load_path_cache = nil
         ChangeObserver.unregister($LOAD_PATH)
-        ::Kernel.alias_method(:require_relative, :require_relative_without_bootsnap)
       end
 
       def supported?

diff --git a/test/setup_test.rb b/test/setup_test.rb
@@ -94,5 +94,9 @@ def test_default_setup_with_BOOTSNAP_LOG
 
       Bootsnap.default_setup
     end
+
+    def test_unload_cache
+      Bootsnap.unload_cache!
+    end
   end
 end
-Original file line number
+Diff line change
@@ Expand Up / @@ -76,7 +76,7 @@ def setup( @@
           )
         end
-        def self.unload_cache!
+        def unload_cache!
           LoadPathCache.unload!
         end
@@ Expand Down @@