From b75733f1bd3f2fe337610ddc034ce3a1634b3e29 Mon Sep 17 00:00:00 2001
From: Mike McQuaid <mike@mikemcquaid.com>
Date: Sat, 11 Apr 2020 14:23:02 +0100
Subject: [PATCH] rubocops: downgrade strict cops (passing in core).

---
 Library/Homebrew/rubocops/class.rb                 |  2 +-
 Library/Homebrew/rubocops/formula_desc.rb          |  2 +-
 Library/Homebrew/rubocops/text.rb                  | 14 ++++++++------
 Library/Homebrew/test/rubocops/class_spec.rb       |  2 +-
 .../Homebrew/test/rubocops/formula_desc_spec.rb    |  2 +-
 5 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/Library/Homebrew/rubocops/class.rb b/Library/Homebrew/rubocops/class.rb
index 034b336c2e..16f9339fc6 100644
--- a/Library/Homebrew/rubocops/class.rb
+++ b/Library/Homebrew/rubocops/class.rb
@@ -70,7 +70,7 @@ module RuboCop
       end
     end
 
-    module FormulaAuditStrict
+    module FormulaAudit
       # - `test do ..end` should be meaningfully defined in the formula.
       class Test < FormulaCop
         def audit_formula(_node, _class_node, _parent_class_node, body_node)
diff --git a/Library/Homebrew/rubocops/formula_desc.rb b/Library/Homebrew/rubocops/formula_desc.rb
index ee6673b0d9..aee3ec413e 100644
--- a/Library/Homebrew/rubocops/formula_desc.rb
+++ b/Library/Homebrew/rubocops/formula_desc.rb
@@ -38,7 +38,7 @@ module RuboCop
       end
     end
 
-    module FormulaAuditStrict
+    module FormulaAudit
       # This cop audits `desc` in Formulae.
       #
       # - Checks for leading/trailing whitespace in `desc`
diff --git a/Library/Homebrew/rubocops/text.rb b/Library/Homebrew/rubocops/text.rb
index 8d40777379..ac0e287cdb 100644
--- a/Library/Homebrew/rubocops/text.rb
+++ b/Library/Homebrew/rubocops/text.rb
@@ -61,17 +61,19 @@ module RuboCop
           find_method_with_args(body_node, :system, "cargo", "build") do
             problem "use \"cargo\", \"install\", \"--root\", prefix, \"--path\", \".\""
           end
-        end
-      end
-    end
-    module FormulaAuditStrict
-      class Text < FormulaCop
-        def audit_formula(_node, _class_node, _parent_class_node, body_node)
+
           find_method_with_args(body_node, :go_resource) do
             problem "`go_resource`s are deprecated. Please ask upstream to implement Go vendoring"
           end
         end
       end
     end
+
+    # Keep this (empty) module and class around in case we need it later to
+    # avoid deleting all the FormulaAuditStrict referencing logic.
+    module FormulaAuditStrict
+      class Text < FormulaCop
+      end
+    end
   end
 end
diff --git a/Library/Homebrew/test/rubocops/class_spec.rb b/Library/Homebrew/test/rubocops/class_spec.rb
index 617e7204ef..803611b294 100644
--- a/Library/Homebrew/test/rubocops/class_spec.rb
+++ b/Library/Homebrew/test/rubocops/class_spec.rb
@@ -105,7 +105,7 @@ describe RuboCop::Cop::FormulaAudit::TestCalls do
   end
 end
 
-describe RuboCop::Cop::FormulaAuditStrict::Test do
+describe RuboCop::Cop::FormulaAudit::Test do
   subject(:cop) { described_class.new }
 
   it "reports an offense when there is no test block" do
diff --git a/Library/Homebrew/test/rubocops/formula_desc_spec.rb b/Library/Homebrew/test/rubocops/formula_desc_spec.rb
index 923768edae..ee1a572f57 100644
--- a/Library/Homebrew/test/rubocops/formula_desc_spec.rb
+++ b/Library/Homebrew/test/rubocops/formula_desc_spec.rb
@@ -48,7 +48,7 @@ describe RuboCop::Cop::FormulaAudit::DescLength do
   end
 end
 
-describe RuboCop::Cop::FormulaAuditStrict::Desc do
+describe RuboCop::Cop::FormulaAudit::Desc do
   subject(:cop) { described_class.new }
 
   context "When auditing formula desc" do