From 0ef3e1e0dcbcd5aa55408fe81d23613e1c2c5e79 Mon Sep 17 00:00:00 2001
From: Alyssa Ross
Date: Sat, 3 Sep 2016 21:10:44 +0100
Subject: Preserve alias when installing formulae

Part of #567
---
 Library/Homebrew/test/test_formula.rb | 19 ++++++++++++++++++-
 1 file changed, 18 insertions(+), 1 deletion(-)

(limited to 'Library/Homebrew/test/test_formula.rb')

diff --git a/Library/Homebrew/test/test_formula.rb b/Library/Homebrew/test/test_formula.rb
index 7ebb17884..1ea1ff185 100644
--- a/Library/Homebrew/test/test_formula.rb
+++ b/Library/Homebrew/test/test_formula.rb
@@ -8,13 +8,30 @@ class FormulaTests < Homebrew::TestCase
     name = "formula_name"
     path = Formulary.core_path(name)
     spec = :stable
+    install_name = "formula_alias"
 
-    f = klass.new(name, path, spec)
+    f = klass.new(name, path, spec, install_name: install_name)
     assert_equal name, f.name
     assert_equal path, f.path
+    assert_equal install_name, f.install_name
     assert_raises(ArgumentError) { klass.new }
   end
 
+  def test_install_ref_with_alias
+    name = "formula_name"
+    path = Formulary.core_path(name)
+    spec = :stable
+    install_name = "formula_alias"
+
+    f = Testball.new(name, path, spec, install_name: install_name)
+    assert_equal f.install_name, f.install_ref
+  end
+
+  def test_install_ref_with_non_alias
+    f = Testball.new
+    assert_equal f.path, f.install_ref
+  end
+
   def test_prefix
     f = Testball.new
     assert_equal HOMEBREW_CELLAR/f.name/"0.1", f.prefix
-- 
cgit v1.2.3


From c17664b124a84c7b6f8373337b3623003ca30772 Mon Sep 17 00:00:00 2001
From: Alyssa Ross
Date: Sun, 4 Sep 2016 20:48:15 +0100
Subject: Switch to hash rockets

---
 Library/Homebrew/test/test_formula.rb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'Library/Homebrew/test/test_formula.rb')

diff --git a/Library/Homebrew/test/test_formula.rb b/Library/Homebrew/test/test_formula.rb
index 1ea1ff185..b70ecbb6f 100644
--- a/Library/Homebrew/test/test_formula.rb
+++ b/Library/Homebrew/test/test_formula.rb
@@ -10,7 +10,7 @@ class FormulaTests < Homebrew::TestCase
     spec = :stable
     install_name = "formula_alias"
 
-    f = klass.new(name, path, spec, install_name: install_name)
+    f = klass.new(name, path, spec, :install_name => install_name)
     assert_equal name, f.name
     assert_equal path, f.path
     assert_equal install_name, f.install_name
@@ -23,7 +23,7 @@ class FormulaTests < Homebrew::TestCase
     spec = :stable
     install_name = "formula_alias"
 
-    f = Testball.new(name, path, spec, install_name: install_name)
+    f = Testball.new(name, path, spec, :install_name => install_name)
     assert_equal f.install_name, f.install_ref
   end
 
-- 
cgit v1.2.3


From 65ee5408c3d000393c1b73bfe8fb731a651ee281 Mon Sep 17 00:00:00 2001
From: Alyssa Ross
Date: Mon, 5 Sep 2016 01:11:36 +0100
Subject: Replace install_name/install_ref with alias_path

---
 Library/Homebrew/test/test_formula.rb | 21 +++------------------
 1 file changed, 3 insertions(+), 18 deletions(-)

(limited to 'Library/Homebrew/test/test_formula.rb')

diff --git a/Library/Homebrew/test/test_formula.rb b/Library/Homebrew/test/test_formula.rb
index b70ecbb6f..ce1ac28b1 100644
--- a/Library/Homebrew/test/test_formula.rb
+++ b/Library/Homebrew/test/test_formula.rb
@@ -8,30 +8,15 @@ class FormulaTests < Homebrew::TestCase
     name = "formula_name"
     path = Formulary.core_path(name)
     spec = :stable
-    install_name = "formula_alias"
+    alias_path = "formula_alias"
 
-    f = klass.new(name, path, spec, :install_name => install_name)
+    f = klass.new(name, path, spec, :alias_path => alias_path)
     assert_equal name, f.name
     assert_equal path, f.path
-    assert_equal install_name, f.install_name
+    assert_equal alias_path, f.alias_path
     assert_raises(ArgumentError) { klass.new }
   end
 
-  def test_install_ref_with_alias
-    name = "formula_name"
-    path = Formulary.core_path(name)
-    spec = :stable
-    install_name = "formula_alias"
-
-    f = Testball.new(name, path, spec, :install_name => install_name)
-    assert_equal f.install_name, f.install_ref
-  end
-
-  def test_install_ref_with_non_alias
-    f = Testball.new
-    assert_equal f.path, f.install_ref
-  end
-
   def test_prefix
     f = Testball.new
     assert_equal HOMEBREW_CELLAR/f.name/"0.1", f.prefix
-- 
cgit v1.2.3


From 8bbcbfc0203cde999a0a6e10053ffc173ee73b06 Mon Sep 17 00:00:00 2001
From: Alyssa Ross
Date: Wed, 7 Sep 2016 21:47:53 +0100
Subject: More realistic alias_path test

---
 Library/Homebrew/test/test_formula.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'Library/Homebrew/test/test_formula.rb')

diff --git a/Library/Homebrew/test/test_formula.rb b/Library/Homebrew/test/test_formula.rb
index ce1ac28b1..63cefe9fa 100644
--- a/Library/Homebrew/test/test_formula.rb
+++ b/Library/Homebrew/test/test_formula.rb
@@ -8,7 +8,7 @@ class FormulaTests < Homebrew::TestCase
     name = "formula_name"
     path = Formulary.core_path(name)
     spec = :stable
-    alias_path = "formula_alias"
+    alias_path = CoreTap.instance.alias_dir/"formula_alias"
 
     f = klass.new(name, path, spec, :alias_path => alias_path)
     assert_equal name, f.name
-- 
cgit v1.2.3