Copy env_proc when merging deps
This commit is contained in:
parent
9903e7cd92
commit
6b5e73a2c3
@ -100,7 +100,10 @@ class Dependency
|
|||||||
grouped = deps.group_by(&:name)
|
grouped = deps.group_by(&:name)
|
||||||
|
|
||||||
deps.uniq.map do |dep|
|
deps.uniq.map do |dep|
|
||||||
dep.class.new(dep.name, grouped.fetch(dep.name).map(&:tags).flatten)
|
tags = grouped.fetch(dep.name).map(&:tags).flatten
|
||||||
|
merged_dep = dep.class.new(dep.name, tags)
|
||||||
|
merged_dep.env_proc = dep.env_proc
|
||||||
|
merged_dep
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|||||||
@ -66,4 +66,9 @@ class DependencyExpansionTests < Test::Unit::TestCase
|
|||||||
deps = [@foo2, @bar, @baz2, @qux]
|
deps = [@foo2, @bar, @baz2, @qux]
|
||||||
assert_equal deps, Dependency.expand(@f)
|
assert_equal deps, Dependency.expand(@f)
|
||||||
end
|
end
|
||||||
|
|
||||||
|
def test_merger_preserves_env_proc
|
||||||
|
env_proc = @foo.env_proc = stub
|
||||||
|
assert_equal env_proc, Dependency.expand(@f).first.env_proc
|
||||||
|
end
|
||||||
end
|
end
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user