From 3261bbc0bdb10c3d5d1f97b0367e1fe15ddb3fc5 Mon Sep 17 00:00:00 2001
From: Sam Ford <1584702+samford@users.noreply.github.com>
Date: Sat, 19 Dec 2020 22:26:37 -0500
Subject: [PATCH] Reorganize livecheck/livecheck test variables

---
 .../Homebrew/test/livecheck/livecheck_spec.rb | 59 ++++++++++---------
 1 file changed, 30 insertions(+), 29 deletions(-)

diff --git a/Library/Homebrew/test/livecheck/livecheck_spec.rb b/Library/Homebrew/test/livecheck/livecheck_spec.rb
index 5873f7ae78..64ae501f8d 100644
--- a/Library/Homebrew/test/livecheck/livecheck_spec.rb
+++ b/Library/Homebrew/test/livecheck/livecheck_spec.rb
@@ -20,6 +20,24 @@ describe Homebrew::Livecheck do
     end
   end
 
+  let(:c) do
+    Cask::CaskLoader.load(+<<-RUBY)
+      cask "test" do
+        version "0.0.1,2"
+
+        url "https://brew.sh/test-0.0.1.tgz"
+        name "Test"
+        desc "Test cask"
+        homepage "https://brew.sh"
+
+        livecheck do
+          url "https://formulae.brew.sh/api/formula/ruby.json"
+          regex(/"stable":"(\d+(?:\.\d+)+)"/i)
+        end
+      end
+    RUBY
+  end
+
   let(:f_deprecated) do
     formula("test_deprecated") do
       desc "Deprecated test formula"
@@ -38,11 +56,11 @@ describe Homebrew::Livecheck do
     end
   end
 
-  let(:f_gist) do
-    formula("test_gist") do
-      desc "Gist test formula"
+  let(:f_versioned) do
+    formula("test@0.0.1") do
+      desc "Versioned test formula"
       homepage "https://brew.sh"
-      url "https://gist.github.com/Homebrew/0000000000"
+      url "https://brew.sh/test-0.0.1.tgz"
     end
   end
 
@@ -54,6 +72,14 @@ describe Homebrew::Livecheck do
     end
   end
 
+  let(:f_gist) do
+    formula("test_gist") do
+      desc "Gist test formula"
+      homepage "https://brew.sh"
+      url "https://gist.github.com/Homebrew/0000000000"
+    end
+  end
+
   let(:f_skip) do
     formula("test_skip") do
       desc "Skipped test formula"
@@ -66,31 +92,6 @@ describe Homebrew::Livecheck do
     end
   end
 
-  let(:f_versioned) do
-    formula("test@0.0.1") do
-      desc "Versioned test formula"
-      homepage "https://brew.sh"
-      url "https://brew.sh/test-0.0.1.tgz"
-    end
-  end
-
-  let(:c) do
-    Cask::CaskLoader.load(+<<-RUBY)
-      cask "test" do
-        version "0.0.1,2"
-
-        url "https://brew.sh/test-0.0.1.tgz"
-        name "Test"
-        homepage "https://brew.sh"
-
-        livecheck do
-          url "https://formulae.brew.sh/api/formula/ruby.json"
-          regex(/"stable":"(\d+(?:\.\d+)+)"/i)
-        end
-      end
-    RUBY
-  end
-
   describe "::formula_name" do
     it "returns the name of the formula" do
       expect(livecheck.formula_name(f)).to eq("test")