From f66b5ff20855956e3db0af4604628e47a656df2d Mon Sep 17 00:00:00 2001 From: Rylan Polster Date: Wed, 21 Sep 2022 02:42:14 -0400 Subject: [PATCH] Include test deps when loading a formula from the API --- Library/Homebrew/formulary.rb | 2 +- Library/Homebrew/test/formulary_spec.rb | 9 +++++---- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/Library/Homebrew/formulary.rb b/Library/Homebrew/formulary.rb index 1af4970828..c7d6a1adeb 100644 --- a/Library/Homebrew/formulary.rb +++ b/Library/Homebrew/formulary.rb @@ -194,7 +194,7 @@ module Formulary depends_on dep end - [:build, :recommended, :optional].each do |type| + [:build, :test, :recommended, :optional].each do |type| json_formula["#{type}_dependencies"].each do |dep| next if uses_from_macos_names.include? dep diff --git a/Library/Homebrew/test/formulary_spec.rb b/Library/Homebrew/test/formulary_spec.rb index 546d5fb87d..97985d2a7f 100644 --- a/Library/Homebrew/test/formulary_spec.rb +++ b/Library/Homebrew/test/formulary_spec.rb @@ -238,6 +238,7 @@ describe Formulary do }, "build_dependencies" => ["build_dep"], "dependencies" => ["dep"], + "test_dependencies" => ["test_dep"], "recommended_dependencies" => ["recommended_dep"], "optional_dependencies" => ["optional_dep"], "uses_from_macos" => ["uses_from_macos_dep"], @@ -291,9 +292,9 @@ describe Formulary do expect(formula).to be_a(Formula) expect(formula.keg_only_reason.reason).to eq :provided_by_macos if OS.mac? - expect(formula.deps.count).to eq 4 - elsif OS.linux? expect(formula.deps.count).to eq 5 + elsif OS.linux? + expect(formula.deps.count).to eq 6 end expect(formula.uses_from_macos_elements).to eq ["uses_from_macos_dep"] expect(formula.caveats).to eq "example caveat string" @@ -329,7 +330,7 @@ describe Formulary do formula = described_class.factory(formula_name) expect(formula).to be_a(Formula) - expect(formula.deps.count).to eq 5 + expect(formula.deps.count).to eq 6 expect(formula.deps.map(&:name).include?("variations_dep")).to be true end @@ -339,7 +340,7 @@ describe Formulary do formula = described_class.factory(formula_name) expect(formula).to be_a(Formula) - expect(formula.deps.count).to eq 5 + expect(formula.deps.count).to eq 6 expect(formula.deps.map(&:name).include?("uses_from_macos_dep")).to be true end end