Uncomment deprecations

Homebrew · Dec 17, 2023 · e5f20f9 · e5f20f9
1 parent 6431822
commit e5f20f9
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 44 deletions.
diff --git a/Library/Homebrew/cask/dsl.rb b/Library/Homebrew/cask/dsl.rb
@@ -324,7 +324,7 @@ def caveats(*strings, &block)
     end
 
     def discontinued?
-      # odeprecated "`discontinued?`", "`deprecated?` or `disabled?`"
+      odeprecated "`discontinued?`", "`deprecated?` or `disabled?`"
       @caveats&.discontinued? == true
     end
 

diff --git a/Library/Homebrew/cask/dsl/caveats.rb b/Library/Homebrew/cask/dsl/caveats.rb
@@ -163,7 +163,7 @@ def eval_caveats(&block)
       end
 
       caveat :discontinued do
-        # odeprecated "`caveats :discontinued`", "`deprecated!`"
+        odeprecated "`caveats :discontinued`", "`deprecated!`"
         @discontinued = true
         <<~EOS
           #{@cask} has been officially discontinued upstream.

diff --git a/Library/Homebrew/test/livecheck/skip_conditions_spec.rb b/Library/Homebrew/test/livecheck/skip_conditions_spec.rb
@@ -91,19 +91,6 @@
           regex(/"stable":"(\d+(?:\.\d+)+)"/i)
         end
       end,
-      discontinued:      Cask::Cask.new("test_discontinued") do
-        version "0.0.1"
-        sha256 :no_check
-
-        url "https://brew.sh/test-0.0.1.tgz"
-        name "Test Discontinued"
-        desc "Discontinued test cask"
-        homepage "https://brew.sh"
-
-        caveats do
-          discontinued
-        end
-      end,
       deprecated:        Cask::Cask.new("test_deprecated") do
         version "0.0.1"
         sha256 :no_check
@@ -245,13 +232,6 @@
         },
       },
       cask:    {
-        discontinued:      {
-          cask:   "test_discontinued",
-          status: "deprecated",
-          meta:   {
-            livecheckable: false,
-          },
-        },
         deprecated:        {
           cask:   "test_deprecated",
           status: "deprecated",
@@ -359,13 +339,6 @@
       end
     end
 
-    context "when a cask without a livecheckable is discontinued" do
-      it "skips" do
-        expect(skip_conditions.skip_information(casks[:discontinued]))
-          .to eq(status_hashes[:cask][:discontinued])
-      end
-    end
-
     context "when a cask without a livecheckable is deprecated" do
       it "skips" do
         expect(skip_conditions.skip_information(casks[:deprecated]))
@@ -475,13 +448,6 @@
       end
     end
 
-    context "when a cask without a livecheckable is discontinued" do
-      it "errors" do
-        expect { skip_conditions.referenced_skip_information(casks[:discontinued], original_name) }
-          .to raise_error(RuntimeError, "Referenced cask (test_discontinued) is skipped as deprecated")
-      end
-    end
-
     context "when a cask without a livecheckable is deprecated" do
       it "errors" do
         expect { skip_conditions.referenced_skip_information(casks[:deprecated], original_name) }
@@ -598,14 +564,6 @@
       end
     end
 
-    context "when the cask is discontinued without a livecheckable" do
-      it "prints skip information" do
-        expect { skip_conditions.print_skip_information(status_hashes[:cask][:discontinued]) }
-          .to output("test_discontinued: deprecated\n").to_stdout
-          .and not_to_output.to_stderr
-      end
-    end
-
     context "when the cask is deprecated without a livecheckable" do
       it "prints skip information" do
         expect { skip_conditions.print_skip_information(status_hashes[:cask][:deprecated]) }