Remove `test_cask`, `fake_fetcher`, and `fake_response_for` methods.

2 files changed, 7 insertions, 17 deletions

diff --git a/Library/Homebrew/cask/test/cask/url_checker_test.rb b/Library/Homebrew/cask/test/cask/url_checker_test.rb
index 2dfed62d3..6871b4215 100644
--- a/Library/Homebrew/cask/test/cask/url_checker_test.rb
+++ b/Library/Homebrew/cask/test/cask/url_checker_test.rb
@@ -3,15 +3,17 @@ require "test_helper"
 describe Hbc::UrlChecker do
   describe "request processing" do
     it "adds an error if response is empty" do
-      cask = TestHelper.test_cask
-      TestHelper.fake_response_for(cask.url, "")
-      checker = Hbc::UrlChecker.new(cask, TestHelper.fake_fetcher)
+      cask = Hbc.load("basic-cask")
+      Hbc::FakeFetcher.fake_response_for(cask.url, "")
+      checker = Hbc::UrlChecker.new(cask, Hbc::FakeFetcher)
       checker.run
       checker.errors.must_include "timeout while requesting #{cask.url}"
     end
 
     it "properly populates the response code and headers from an http response" do
-      TestHelper.fake_response_for(TestHelper.test_cask.url, <<-EOS.undent)
+      cask = Hbc.load("basic-cask")
+
+      Hbc::FakeFetcher.fake_response_for(cask.url, <<-EOS.undent)
         HTTP/1.1 200 OK
         Content-Type: application/x-apple-diskimage
         ETag: "b4208f3e84967be4b078ecaa03fba941"
@@ -19,7 +21,7 @@ describe Hbc::UrlChecker do
         Last-Modified: Sun, 12 Aug 2012 21:17:21 GMT
       EOS
 
-      checker = Hbc::UrlChecker.new(TestHelper.test_cask, TestHelper.fake_fetcher)
+      checker = Hbc::UrlChecker.new(cask, Hbc::FakeFetcher)
       checker.run
       checker.response_status.must_equal "HTTP/1.1 200 OK"
       checker.headers.must_equal("Content-Type"   => "application/x-apple-diskimage",
diff --git a/Library/Homebrew/cask/test/test_helper.rb b/Library/Homebrew/cask/test/test_helper.rb
index b86ef59fa..67d2c698d 100644
--- a/Library/Homebrew/cask/test/test_helper.rb
+++ b/Library/Homebrew/cask/test/test_helper.rb
@@ -62,18 +62,6 @@ class TestHelper
     "file://" + local_binary_path(name)
   end
 
-  def self.test_cask
-    @test_cask ||= Hbc.load("basic-cask")
-  end
-
-  def self.fake_fetcher
-    Hbc::FakeFetcher
-  end
-
-  def self.fake_response_for(*args)
-    Hbc::FakeFetcher.fake_response_for(*args)
-  end
-
   def self.valid_alias?(candidate)
     return false unless candidate.symlink?
     candidate.readlink.exist?