ComparableSet#merge returns self

Set#merge is supposed to return self, and Formula#recursive_requirements
depended on this being true.

Signed-off-by: Jack Nagel <jacknagel@gmail.com>
This commit is contained in:
Jack Nagel 2012-10-25 15:45:42 -05:00
parent 07d9adc295
commit 762c355b30
2 changed files with 2 additions and 1 deletions

View File

@ -20,5 +20,6 @@ class ComparableSet < Set
def merge enum
enum.is_a?(Enumerable) or raise ArgumentError, "value must be enumerable"
enum.each { |o| add(o) }
self
end
end

View File

@ -33,7 +33,7 @@ class ComparableSetTests < Test::Unit::TestCase
@set << X11Dependency.new
@set << Requirement.new
reqs = Set.new [X11Dependency.new('2.6'), Requirement.new]
@set.merge reqs
assert_same @set, @set.merge(reqs)
assert_equal @set.count, 2
assert_equal @set.find {|r| r.is_a? X11Dependency}, X11Dependency.new('2.6')