From ba3c46d24fe6423845cc5e827eb94b3427d75a10 Mon Sep 17 00:00:00 2001
From: Mike McQuaid
Date: Sat, 22 Apr 2017 16:28:07 +0100
Subject: More deprecations.

Deprecate more methods. Internal APIs have been verified to be unused
elsewhere and removed. External APIs have had deprecation methods added.
Existing deprecations have been either upgraded to produce warnings or
no longer deprecated and the reasoning documented.
---
 Library/Homebrew/test/compiler_selector_spec.rb | 12 +-----
 Library/Homebrew/test/requirement_spec.rb       | 10 ++---
 Library/Homebrew/test/utils/shell_spec.rb       | 56 ++++++++++++-------------
 3 files changed, 32 insertions(+), 46 deletions(-)

(limited to 'Library/Homebrew/test')

diff --git a/Library/Homebrew/test/compiler_selector_spec.rb b/Library/Homebrew/test/compiler_selector_spec.rb
index 0f6f6b5f2..18efbfd42 100644
--- a/Library/Homebrew/test/compiler_selector_spec.rb
+++ b/Library/Homebrew/test/compiler_selector_spec.rb
@@ -3,7 +3,7 @@ require "software_spec"
 
 describe CompilerSelector do
   subject { described_class.new(software_spec, versions, compilers) }
-  let(:compilers) { [:clang, :gcc, :llvm, :gnu] }
+  let(:compilers) { [:clang, :gcc, :gnu] }
   let(:software_spec) { SoftwareSpec.new }
   let(:cc) { :clang }
   let(:versions) do
@@ -28,7 +28,6 @@ describe CompilerSelector do
   describe "#compiler" do
     it "raises an error if no matching compiler can be found" do
       software_spec.fails_with(:clang)
-      software_spec.fails_with(:llvm)
       software_spec.fails_with(:gcc)
       software_spec.fails_with(gcc: "4.8")
       software_spec.fails_with(gcc: "4.7")
@@ -45,11 +44,6 @@ describe CompilerSelector do
       expect(subject.compiler).to eq(:gcc)
     end
 
-    it "returns clang if it fails with llvm" do
-      software_spec.fails_with(:llvm)
-      expect(subject.compiler).to eq(:clang)
-    end
-
     it "returns clang if it fails with gcc" do
       software_spec.fails_with(:gcc)
       expect(subject.compiler).to eq(:clang)
@@ -68,13 +62,11 @@ describe CompilerSelector do
 
     it "returns gcc if it fails with clang and llvm" do
       software_spec.fails_with(:clang)
-      software_spec.fails_with(:llvm)
       expect(subject.compiler).to eq(:gcc)
     end
 
     it "returns clang if it fails with gcc and llvm" do
       software_spec.fails_with(:gcc)
-      software_spec.fails_with(:llvm)
       expect(subject.compiler).to eq(:clang)
     end
 
@@ -87,7 +79,6 @@ describe CompilerSelector do
     example "returns a lower version of gcc if it fails with the highest version" do
       software_spec.fails_with(:clang)
       software_spec.fails_with(:gcc)
-      software_spec.fails_with(:llvm)
       software_spec.fails_with(gcc: "4.8")
       expect(subject.compiler).to eq("gcc-4.7")
     end
@@ -102,7 +93,6 @@ describe CompilerSelector do
       allow(versions).to receive(:gcc_build_version).and_return(Version::NULL)
 
       software_spec.fails_with(:clang)
-      software_spec.fails_with(:llvm)
       software_spec.fails_with(gcc: "4.8")
       software_spec.fails_with(gcc: "4.7")
 
diff --git a/Library/Homebrew/test/requirement_spec.rb b/Library/Homebrew/test/requirement_spec.rb
index 110a7ac4f..959041cf4 100644
--- a/Library/Homebrew/test/requirement_spec.rb
+++ b/Library/Homebrew/test/requirement_spec.rb
@@ -146,17 +146,13 @@ describe Requirement do
   end
 
   describe "#build?" do
-    context "#build true is specified" do
-      let(:klass) do
-        Class.new(described_class) do
-          build true
-        end
-      end
+    context ":build tag is specified" do
+      subject { described_class.new([:build]) }
 
       it { is_expected.to be_a_build_requirement }
     end
 
-    context "#build ommitted" do
+    context "#build omitted" do
       it { is_expected.not_to be_a_build_requirement }
     end
   end
diff --git a/Library/Homebrew/test/utils/shell_spec.rb b/Library/Homebrew/test/utils/shell_spec.rb
index c44bd8253..d32f9928f 100644
--- a/Library/Homebrew/test/utils/shell_spec.rb
+++ b/Library/Homebrew/test/utils/shell_spec.rb
@@ -1,92 +1,92 @@
 require "utils/shell"
 
 describe Utils::Shell do
-  describe "::shell_profile" do
+  describe "::profile" do
     it "returns ~/.bash_profile by default" do
       ENV["SHELL"] = "/bin/another_shell"
-      expect(subject.shell_profile).to eq("~/.bash_profile")
+      expect(subject.profile).to eq("~/.bash_profile")
     end
 
     it "returns ~/.bash_profile for Sh" do
       ENV["SHELL"] = "/bin/another_shell"
-      expect(subject.shell_profile).to eq("~/.bash_profile")
+      expect(subject.profile).to eq("~/.bash_profile")
     end
 
     it "returns ~/.bash_profile for Bash" do
       ENV["SHELL"] = "/bin/bash"
-      expect(subject.shell_profile).to eq("~/.bash_profile")
+      expect(subject.profile).to eq("~/.bash_profile")
     end
 
     it "returns ~/.zshrc for Zsh" do
       ENV["SHELL"] = "/bin/zsh"
-      expect(subject.shell_profile).to eq("~/.zshrc")
+      expect(subject.profile).to eq("~/.zshrc")
     end
 
     it "returns ~/.kshrc for Ksh" do
       ENV["SHELL"] = "/bin/ksh"
-      expect(subject.shell_profile).to eq("~/.kshrc")
+      expect(subject.profile).to eq("~/.kshrc")
     end
   end
 
-  describe "::path_to_shell" do
+  describe "::from_path" do
     it "supports a raw command name" do
-      expect(subject.path_to_shell("bash")).to eq(:bash)
+      expect(subject.from_path("bash")).to eq(:bash)
     end
 
     it "supports full paths" do
-      expect(subject.path_to_shell("/bin/bash")).to eq(:bash)
+      expect(subject.from_path("/bin/bash")).to eq(:bash)
     end
 
     it "supports versions" do
-      expect(subject.path_to_shell("zsh-5.2")).to eq(:zsh)
+      expect(subject.from_path("zsh-5.2")).to eq(:zsh)
     end
 
     it "strips newlines" do
-      expect(subject.path_to_shell("zsh-5.2\n")).to eq(:zsh)
+      expect(subject.from_path("zsh-5.2\n")).to eq(:zsh)
     end
 
     it "returns nil when input is invalid" do
-      expect(subject.path_to_shell("")).to be nil
-      expect(subject.path_to_shell("@@@@@@")).to be nil
-      expect(subject.path_to_shell("invalid_shell-4.2")).to be nil
+      expect(subject.from_path("")).to be nil
+      expect(subject.from_path("@@@@@@")).to be nil
+      expect(subject.from_path("invalid_shell-4.2")).to be nil
     end
   end
 
   specify "::sh_quote" do
-    expect(subject.sh_quote("")).to eq("''")
-    expect(subject.sh_quote("\\")).to eq("\\\\")
-    expect(subject.sh_quote("\n")).to eq("'\n'")
-    expect(subject.sh_quote("$")).to eq("\\$")
-    expect(subject.sh_quote("word")).to eq("word")
+    expect(subject.send(:sh_quote, "")).to eq("''")
+    expect(subject.send(:sh_quote, "\\")).to eq("\\\\")
+    expect(subject.send(:sh_quote, "\n")).to eq("'\n'")
+    expect(subject.send(:sh_quote, "$")).to eq("\\$")
+    expect(subject.send(:sh_quote, "word")).to eq("word")
   end
 
   specify "::csh_quote" do
-    expect(subject.csh_quote("")).to eq("''")
-    expect(subject.csh_quote("\\")).to eq("\\\\")
+    expect(subject.send(:csh_quote, "")).to eq("''")
+    expect(subject.send(:csh_quote, "\\")).to eq("\\\\")
     # note this test is different than for sh
-    expect(subject.csh_quote("\n")).to eq("'\\\n'")
-    expect(subject.csh_quote("$")).to eq("\\$")
-    expect(subject.csh_quote("word")).to eq("word")
+    expect(subject.send(:csh_quote, "\n")).to eq("'\\\n'")
+    expect(subject.send(:csh_quote, "$")).to eq("\\$")
+    expect(subject.send(:csh_quote, "word")).to eq("word")
   end
 
-  describe "::prepend_path_in_shell_profile" do
+  describe "::prepend_path_in_profile" do
     let(:path) { "/my/path" }
 
     it "supports Tcsh" do
       ENV["SHELL"] = "/bin/tcsh"
-      expect(subject.prepend_path_in_shell_profile(path))
+      expect(subject.prepend_path_in_profile(path))
         .to start_with("echo 'setenv PATH #{path}:$")
     end
 
     it "supports Bash" do
       ENV["SHELL"] = "/bin/bash"
-      expect(subject.prepend_path_in_shell_profile(path))
+      expect(subject.prepend_path_in_profile(path))
         .to start_with("echo 'export PATH=\"#{path}:$")
     end
 
     it "supports Fish" do
       ENV["SHELL"] = "/usr/local/bin/fish"
-      expect(subject.prepend_path_in_shell_profile(path))
+      expect(subject.prepend_path_in_profile(path))
         .to start_with("echo 'set -g fish_user_paths \"#{path}\" $fish_user_paths' >>")
     end
   end
-- 
cgit v1.2.3