aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJack Nagel2014-07-01 21:26:41 -0500
committerJack Nagel2014-07-01 21:26:41 -0500
commitfe3e802c500935f74d403dd7e7f0f740f89d44ba (patch)
tree794aadb0ee563534c722cea87b7d2f37772cae8c
parentfc2d403a825b187f9979e7808344aab7ed533900 (diff)
downloadbrew-fe3e802c500935f74d403dd7e7f0f740f89d44ba.tar.bz2
X11Dependency objects: fix hash equality
-rw-r--r--Library/Homebrew/requirements/x11_dependency.rb4
-rw-r--r--Library/Homebrew/test/test_x11_dependency.rb7
2 files changed, 11 insertions, 0 deletions
diff --git a/Library/Homebrew/requirements/x11_dependency.rb b/Library/Homebrew/requirements/x11_dependency.rb
index 7adc2a7cb..dae2101fc 100644
--- a/Library/Homebrew/requirements/x11_dependency.rb
+++ b/Library/Homebrew/requirements/x11_dependency.rb
@@ -34,4 +34,8 @@ class X11Dependency < Requirement
return unless X11Dependency === other
min_version <=> other.min_version
end
+
+ def eql?(other)
+ super && min_version == other.min_version
+ end
end
diff --git a/Library/Homebrew/test/test_x11_dependency.rb b/Library/Homebrew/test/test_x11_dependency.rb
index 9bbc578e7..fd0b25328 100644
--- a/Library/Homebrew/test/test_x11_dependency.rb
+++ b/Library/Homebrew/test/test_x11_dependency.rb
@@ -19,6 +19,13 @@ class X11DependencyTests < Homebrew::TestCase
assert !y.eql?(x)
end
+ def test_different_min_version
+ x = X11Dependency.new
+ y = X11Dependency.new("x11", %w[2.5])
+ refute x.eql?(y)
+ refute y.eql?(x)
+ end
+
def test_x_env
x = X11Dependency.new
x.stubs(:satisfied?).returns(true)