Partial solution for cask processing.

Homebrew · Dec 25, 2024 · 9de6a1c · 9de6a1c
1 parent e8b300a
commit 9de6a1c
Showing 1 changed file with 19 additions and 16 deletions.
diff --git a/Library/Homebrew/test/cmd/list_spec.rb b/Library/Homebrew/test/cmd/list_spec.rb
@@ -13,35 +13,38 @@
     formulae.each do |f|
       (HOMEBREW_CELLAR/f/"1.0/somedir").mkpath
     end
-    # casks.each do |f|
-    #   (HOMEBREW_CELLAR/"../Caskroom"/f/"42.0/somedir").mkpath
-    # end
+    casks.each do |f|
+      (HOMEBREW_PREFIX/"Caskroom"/f/"42.0/somedir").mkpath
+    end
 
     expect { brew "list", "--formula" }
       .to output("#{formulae.sort.join("\n")}\n").to_stdout
       .and not_to_output.to_stderr
       .and be_a_success
 
-    # expect { brew "list", "--cask" }
-    #   .to output("#{casks.sort.join("\n")}\n").to_stdout
-    #   .and not_to_output.to_stderr
-    #   .and be_a_success
+    expect { brew "list", "--cask" }
+      .to output("#{casks.sort.join("\n")}\n").to_stdout
+      .and not_to_output.to_stderr
+      .and be_a_success
 
     expect { brew "list", "--formula", "--version" }
       .to output("#{formulae.sort.map { |name| "#{name} 1.0" }.join("\n")}\n").to_stdout
       .and not_to_output.to_stderr
       .and be_a_success
 
-    # expect { brew "list", "--cask", "--version" }
-    #   .to output("#{casks.sort.map { |name| "#{name} 42.0" }.join("\n")}\n").to_stdout
-    #   .and not_to_output.to_stderr
-    #   .and be_a_success
+    expect { brew "list", "--cask", "--version" }
+      .to output("#{casks.sort.map { |name| "#{name} 42.0" }.join("\n")}\n").to_stdout
+      .and not_to_output.to_stderr
+      .and be_a_success
 
-    # expect { brew "list", "--version" }
-    #   .to output("#{formulae.sort.map { |name| "#{name} 1.0" }.join("\n")}\n" +
-    #              "#{casks.sort.map { |name| "#{name} 42.0" }.join("\n")}\n").to_stdout
-    #   .and not_to_output.to_stderr
-    #   .and be_a_success
+    expect { brew "list", "--version" }
+      .to output(<<~OUTPUT,
+        #{formulae.sort.map { |name| "#{name} 1.0" }.join("\n")}
+        #{casks.sort.map { |name| "#{name} 42.0" }.join("\n")}
+      OUTPUT
+                ).to_stdout
+      .and not_to_output.to_stderr
+      .and be_a_success
   end
 
   # TODO: add a test for the shell fast-path (`brew_sh`)