Allow multiple option_names in dep/reqs.

This means that dependencies can be merged but still maintain all
their option names.

Closes Homebrew/homebrew#46916.

Signed-off-by: Mike McQuaid <mike@mikemcquaid.com>

2 files changed, 8 insertions, 8 deletions

diff --git a/Library/Homebrew/test/test_dependency.rb b/Library/Homebrew/test/test_dependency.rb
index 8e647c1b0..f58a22fd8 100644
--- a/Library/Homebrew/test/test_dependency.rb
+++ b/Library/Homebrew/test/test_dependency.rb
@@ -49,13 +49,13 @@ class DependencyTests < Homebrew::TestCase
 
     foo_named_dep = merged.find {|d| d.name == "foo"}
     assert_equal [:build, "bar"], foo_named_dep.tags
-    assert_includes foo_named_dep.option_name, "foo"
-    assert_includes foo_named_dep.option_name, "foo2"
+    assert_includes foo_named_dep.option_names, "foo"
+    assert_includes foo_named_dep.option_names, "foo2"
 
     xyz_named_dep = merged.find {|d| d.name == "xyz"}
     assert_equal ["abc"], xyz_named_dep.tags
-    assert_includes xyz_named_dep.option_name, "foo"
-    refute_includes xyz_named_dep.option_name, "foo2"
+    assert_includes xyz_named_dep.option_names, "foo"
+    refute_includes xyz_named_dep.option_names, "foo2"
   end
 
   def test_equality
@@ -73,8 +73,8 @@ class DependencyTests < Homebrew::TestCase
 end
 
 class TapDependencyTests < Homebrew::TestCase
-  def test_option_name
+  def test_option_names
     dep = TapDependency.new("foo/bar/dog")
-    assert_equal "dog", dep.option_name
+    assert_equal %w[dog], dep.option_names
   end
 end
diff --git a/Library/Homebrew/test/test_requirement.rb b/Library/Homebrew/test/test_requirement.rb
index 2873ce048..0281ad70c 100644
--- a/Library/Homebrew/test/test_requirement.rb
+++ b/Library/Homebrew/test/test_requirement.rb
@@ -14,9 +14,9 @@ class RequirementTests < Homebrew::TestCase
     assert_equal %w[bar baz].sort, dep.tags.sort
   end
 
-  def test_option_name
+  def test_option_names
     dep = TestRequirement.new
-    assert_equal "test", dep.option_name
+    assert_equal %w[test], dep.option_names
   end
 
   def test_preserves_symbol_tags