Properly define tapped formulae in update

A tapped formula is a ruby file present:

  - in the root of the tap
  - in directory of the tap called Formula
  - in a directory of the tap called HomebrewFormula

And nowhere else. This corrects an overzealous definition of tapped
formula in the updater. (the correct definition has been in Pathname
since e613cbe5783cea2abb8100b56c22126a1ab6b9f2)

Refs #19743.
Closes #21087.

Signed-off-by: Jack Nagel <jacknagel@gmail.com>

1 files changed, 24 insertions, 0 deletions

diff --git a/Library/Homebrew/test/test_updater.rb b/Library/Homebrew/test/test_updater.rb
index 20aba015a..1464e1084 100644
--- a/Library/Homebrew/test/test_updater.rb
+++ b/Library/Homebrew/test/test_updater.rb
@@ -102,4 +102,28 @@ class UpdaterTests < Test::Unit::TestCase
       assert_equal %w{ shapelib }, report.select_formula(:R)
     end
   end
+
+  def test_update_homebrew_with_tapped_formula_changes
+    diff_output = fixture('update_git_diff_output_with_tapped_formulae_changes')
+    HOMEBREW_REPOSITORY.cd do
+      updater = UpdaterMock.new
+      updater.in_repo_expect("git checkout -q master")
+      updater.in_repo_expect("git rev-parse -q --verify HEAD", "1234abcd")
+      updater.in_repo_expect("git config core.autocrlf false")
+      updater.in_repo_expect("git pull -q origin refs/heads/master:refs/remotes/origin/master")
+      updater.in_repo_expect("git rev-parse -q --verify HEAD", "3456cdef")
+      updater.in_repo_expect("git diff-tree -r --raw -M85% 1234abcd 3456cdef", diff_output)
+      updater.pull!
+      report = Report.new
+      report.merge!(updater.report)
+
+      assert updater.expectations_met?
+      assert_equal [
+        Pathname('someuser-sometap/Formula/antiword.rb'),
+        Pathname('someuser-sometap/HomebrewFormula/lua.rb'),
+        Pathname('someuser-sometap/custom-formula.rb'),
+      ], report.tapped_formula_for(:A)
+    end
+
+  end
 end