admin/brew
1
0
Fork 0
Code Issues Packages Projects Releases 6 Wiki Activity

Make from: required, fix flaky test

Browse Source
This commit is contained in:
Ben Muschol 2019-02-15 14:15:34 -05:00
parent ac005fa4ce
commit c745738c55
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Library/Homebrew/cli_parser.rb
View File

@ -52,7 +52,7 @@ module Homebrew
end end
process_option(*names, description) process_option(*names, description)
@parser.on(*names, *wrap_option_desc(description)) do @parser.on(*names, *wrap_option_desc(description)) do
enable_switch(*names) enable_switch(*names, from: :args)
end end
names.each do |name| names.each do |name|
@ -173,7 +173,7 @@ module Homebrew
private private
def enable_switch(*names, from: :arg) def enable_switch(*names, from:)
names.each do |name| names.each do |name|
@switch_sources[option_to_name(name)] = from @switch_sources[option_to_name(name)] = from
Homebrew.args["#{option_to_name(name)}?"] = true Homebrew.args["#{option_to_name(name)}?"] = true

1
Library/Homebrew/test/cli_parser_spec.rb
View File

@ -181,6 +181,7 @@ describe Homebrew::CLI::Parser do
it "prioritizes cli arguments over env vars when they conflict" do it "prioritizes cli arguments over env vars when they conflict" do
allow(ENV).to receive(:[]).with("HOMEBREW_SWITCH_A").and_return("1") allow(ENV).to receive(:[]).with("HOMEBREW_SWITCH_A").and_return("1")
allow(ENV).to receive(:[]).with("HOMEBREW_SWITCH_B").and_return("0") allow(ENV).to receive(:[]).with("HOMEBREW_SWITCH_B").and_return("0")
allow(ENV).to receive(:[])
parser.parse(["--switch-b"]) parser.parse(["--switch-b"])
expect(Homebrew.args.switch_a?).to be_falsy expect(Homebrew.args.switch_a?).to be_falsy
expect(Homebrew.args.switch_b?).to be true expect(Homebrew.args.switch_b?).to be true