Merge pull request #21669 from Homebrew/migrator_cask_loads

migrator: fix cask loads.

Author: MikeMcQuaid

Library/Homebrew/cask/migrator.rb

@@ -1,7 +1,6 @@
 # typed: strict
 # frozen_string_literal: true
 
-require "cask/cask_loader"
 require "utils/inreplace"
 require "utils/output"
 
@@ -27,9 +26,10 @@ def self.migrate_if_needed(new_cask, dry_run: false)
 
       return unless (installed_caskfile = new_cask.installed_caskfile)
 
-      old_cask = CaskLoader.load(installed_caskfile)
-      return if new_cask.token == old_cask.token
+      installed_token = installed_caskfile.basename(installed_caskfile.extname).to_s
+      return if new_cask.token == installed_token
 
+      old_cask = Cask.new(installed_token)
       migrator = new(old_cask, new_cask)
       migrator.migrate(dry_run:)
     end

Library/Homebrew/test/cask/migrator_spec.rb

@@ -0,0 +1,44 @@
+# frozen_string_literal: true
+
+require "cask/migrator"
+
+RSpec.describe Cask::Migrator do
+  describe ".migrate_if_needed" do
+    let(:new_cask) do
+      instance_double(
+        Cask::Cask,
+        old_tokens:         ["old-token"],
+        installed_caskfile:,
+        token:              new_token,
+      )
+    end
+
+    context "when the installed token matches the current token" do
+      let(:installed_caskfile) { Pathname("/tmp/Casks/docker-desktop.rb") }
+      let(:new_token) { "docker-desktop" }
+
+      it "returns without loading or migrating" do
+        expect(Cask::Cask).not_to receive(:new)
+        expect(described_class).not_to receive(:new)
+
+        described_class.migrate_if_needed(new_cask)
+      end
+    end
+
+    context "when the installed token differs from the current token" do
+      let(:installed_caskfile) { Pathname("/tmp/Casks/old-token.rb") }
+      let(:new_token) { "new-token" }
+
+      it "migrates using the installed token from the caskfile path" do
+        old_cask = instance_double(Cask::Cask)
+        migrator = instance_double(described_class)
+
+        expect(Cask::Cask).to receive(:new).with("old-token").and_return(old_cask)
+        expect(described_class).to receive(:new).with(old_cask, new_cask).and_return(migrator)
+        expect(migrator).to receive(:migrate).with(dry_run: false)
+
+        described_class.migrate_if_needed(new_cask)
+      end
+    end
+  end
+end