Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

dependency_collector: make resource dep available at test-time too #7123

Merged
merged 1 commit into from Mar 5, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion Library/Homebrew/dependency_collector.rb
Expand Up @@ -142,7 +142,7 @@ def parse_class_spec(spec, tags)
end

def resource_dep(spec, tags)
tags << :build
tags << :build << :test
strategy = spec.download_strategy

if strategy <= CurlDownloadStrategy
Expand Down
12 changes: 6 additions & 6 deletions Library/Homebrew/test/dependency_collector_spec.rb
Expand Up @@ -62,13 +62,13 @@ def find_requirement(klass)
it "creates a resource dependency from a CVS URL" do
resource = Resource.new
resource.url(":pserver:anonymous:@brew.sh:/cvsroot/foo/bar", using: :cvs)
expect(subject.add(resource)).to eq(Dependency.new("cvs", [:build]))
expect(subject.add(resource)).to eq(Dependency.new("cvs", [:build, :test]))
end

it "creates a resource dependency from a '.7z' URL" do
resource = Resource.new
resource.url("https://brew.sh/foo.7z")
expect(subject.add(resource)).to eq(Dependency.new("p7zip", [:build]))
expect(subject.add(resource)).to eq(Dependency.new("p7zip", [:build, :test]))
end

it "creates a resource dependency from a '.gz' URL" do
Expand All @@ -80,25 +80,25 @@ def find_requirement(klass)
it "creates a resource dependency from a '.lz' URL" do
resource = Resource.new
resource.url("https://brew.sh/foo.lz")
expect(subject.add(resource)).to eq(Dependency.new("lzip", [:build]))
expect(subject.add(resource)).to eq(Dependency.new("lzip", [:build, :test]))
end

it "creates a resource dependency from a '.lha' URL" do
resource = Resource.new
resource.url("https://brew.sh/foo.lha")
expect(subject.add(resource)).to eq(Dependency.new("lha", [:build]))
expect(subject.add(resource)).to eq(Dependency.new("lha", [:build, :test]))
end

it "creates a resource dependency from a '.lzh' URL" do
resource = Resource.new
resource.url("https://brew.sh/foo.lzh")
expect(subject.add(resource)).to eq(Dependency.new("lha", [:build]))
expect(subject.add(resource)).to eq(Dependency.new("lha", [:build, :test]))
end

it "creates a resource dependency from a '.rar' URL" do
resource = Resource.new
resource.url("https://brew.sh/foo.rar")
expect(subject.add(resource)).to eq(Dependency.new("unrar", [:build]))
expect(subject.add(resource)).to eq(Dependency.new("unrar", [:build, :test]))
end

it "raises a TypeError for unknown classes" do
Expand Down
6 changes: 3 additions & 3 deletions Library/Homebrew/test/os/linux/dependency_collector_spec.rb
Expand Up @@ -12,19 +12,19 @@
it "creates a resource dependency from a '.xz' URL" do
resource.url("https://brew.sh/foo.xz")
allow_any_instance_of(Object).to receive(:which).with("xz")
expect(subject.add(resource)).to eq(Dependency.new("xz", [:build]))
expect(subject.add(resource)).to eq(Dependency.new("xz", [:build, :test]))
end

it "creates a resource dependency from a '.zip' URL" do
resource.url("https://brew.sh/foo.zip")
allow_any_instance_of(Object).to receive(:which).with("unzip")
expect(subject.add(resource)).to eq(Dependency.new("unzip", [:build]))
expect(subject.add(resource)).to eq(Dependency.new("unzip", [:build, :test]))
end

it "creates a resource dependency from a '.bz2' URL" do
resource.url("https://brew.sh/foo.tar.bz2")
allow_any_instance_of(Object).to receive(:which).with("bzip2")
expect(subject.add(resource)).to eq(Dependency.new("bzip2", [:build]))
expect(subject.add(resource)).to eq(Dependency.new("bzip2", [:build, :test]))
end
end

Expand Down