From 82cdf27eb866b533ef147e74a29f79e797a4f6ba Mon Sep 17 00:00:00 2001
From: Razvan Azamfirei <azamfireirazvan@gmail.com>
Date: Sat, 27 Jan 2024 16:22:07 -0500
Subject: [PATCH] fixture/cask: fix style violations

---
 .../test/support/fixtures/cask/Casks/everything.rb        | 6 +++---
 .../test/support/fixtures/cask/Casks/with-installable.rb  | 4 ++--
 .../test/support/fixtures/cask/Casks/with-pkgutil-zap.rb  | 4 ++--
 .../Homebrew/test/support/fixtures/cask/Casks/with-zap.rb | 6 +++---
 .../Homebrew/test/support/fixtures/cask/everything.json   | 8 ++++----
 5 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/Library/Homebrew/test/support/fixtures/cask/Casks/everything.rb b/Library/Homebrew/test/support/fixtures/cask/Casks/everything.rb
index 1f0cfe08f53c4..fd8e30cb54d16 100644
--- a/Library/Homebrew/test/support/fixtures/cask/Casks/everything.rb
+++ b/Library/Homebrew/test/support/fixtures/cask/Casks/everything.rb
@@ -32,12 +32,12 @@
   }
 
   uninstall launchctl: "com.every.thing.agent",
-            delete:    "/Library/EverythingHelperTools",
-            kext:      "com.every.thing.driver",
             signal:    [
               ["TERM", "com.every.thing.controller#{version.major}"],
               ["TERM", "com.every.thing.bin"],
-            ]
+            ],
+            kext:      "com.every.thing.driver",
+            delete:    "/Library/EverythingHelperTools"
 
   zap trash: [
     "~/.everything",
diff --git a/Library/Homebrew/test/support/fixtures/cask/Casks/with-installable.rb b/Library/Homebrew/test/support/fixtures/cask/Casks/with-installable.rb
index d6f8ad75b694f..67d58c52d24ea 100644
--- a/Library/Homebrew/test/support/fixtures/cask/Casks/with-installable.rb
+++ b/Library/Homebrew/test/support/fixtures/cask/Casks/with-installable.rb
@@ -7,9 +7,9 @@
 
   pkg "MyFancyPkg/Fancy.pkg"
 
-  uninstall script:     { executable: "MyFancyPkg/FancyUninstaller.tool", args: ["--please"] },
-            quit:       "my.fancy.package.app",
+  uninstall quit:       "my.fancy.package.app",
             login_item: "Fancy",
+            script:     { executable: "MyFancyPkg/FancyUninstaller.tool", args: ["--please"] },
             delete:     [
               "#{TEST_TMPDIR}/absolute_path",
               "#{TEST_TMPDIR}/glob_path*",
diff --git a/Library/Homebrew/test/support/fixtures/cask/Casks/with-pkgutil-zap.rb b/Library/Homebrew/test/support/fixtures/cask/Casks/with-pkgutil-zap.rb
index b19a54de0425b..560d5cd581e61 100644
--- a/Library/Homebrew/test/support/fixtures/cask/Casks/with-pkgutil-zap.rb
+++ b/Library/Homebrew/test/support/fixtures/cask/Casks/with-pkgutil-zap.rb
@@ -7,7 +7,7 @@
 
   pkg "Fancy.pkg"
 
-  zap pkgutil:   "my.fancy.package.*",
+  zap launchctl: "my.fancy.package.service",
       kext:      "my.fancy.package.kernelextension",
-      launchctl: "my.fancy.package.service"
+      pkgutil:   "my.fancy.package.*"
 end
diff --git a/Library/Homebrew/test/support/fixtures/cask/Casks/with-zap.rb b/Library/Homebrew/test/support/fixtures/cask/Casks/with-zap.rb
index 9027e38bfa23d..69f49f5dcfb70 100644
--- a/Library/Homebrew/test/support/fixtures/cask/Casks/with-zap.rb
+++ b/Library/Homebrew/test/support/fixtures/cask/Casks/with-zap.rb
@@ -9,11 +9,11 @@
 
   uninstall quit: "my.fancy.package.app.from.uninstall"
 
-  zap script:     {
+  zap quit:       "my.fancy.package.app",
+      login_item: "Fancy",
+      script:     {
         executable: "MyFancyPkg/FancyUninstaller.tool",
         args:       ["--please"],
       },
-      quit:       "my.fancy.package.app",
-      login_item: "Fancy",
       delete:     "~/Library/Preferences/my.fancy.app.plist"
 end
diff --git a/Library/Homebrew/test/support/fixtures/cask/everything.json b/Library/Homebrew/test/support/fixtures/cask/everything.json
index 9f8243f9ae4a8..6efdcaa095993 100644
--- a/Library/Homebrew/test/support/fixtures/cask/everything.json
+++ b/Library/Homebrew/test/support/fixtures/cask/everything.json
@@ -28,8 +28,6 @@
       "uninstall": [
         {
           "launchctl": "com.every.thing.agent",
-          "delete": "/Library/EverythingHelperTools",
-          "kext": "com.every.thing.driver",
           "signal": [
             [
               "TERM",
@@ -39,7 +37,9 @@
               "TERM",
               "com.every.thing.bin"
             ]
-          ]
+          ],
+          "kext": "com.every.thing.driver",
+          "delete": "/Library/EverythingHelperTools"
         }
       ]
     },
@@ -101,6 +101,6 @@
   ],
   "ruby_source_path": "Casks/everything.rb",
   "ruby_source_checksum": {
-    "sha256": "0c4af571cce1632fc6a3dcf3e75ba82a3283077ef12399428192c26f9d6f779b"
+    "sha256": "d8d0d6b2e5ff65388eccb82236fd3aa157b4a29bb043a1f72b97f0e9b70e8320"
   }
 }