From 65673d60c1ee8aa5c4776bef0dd4fa9d95f81474 Mon Sep 17 00:00:00 2001
From: Jack Nagel <jacknagel@gmail.com>
Date: Tue, 10 Jun 2014 20:03:37 -0500
Subject: [PATCH] Move updater mock into test class namespace

---
 Library/Homebrew/test/test_updater.rb | 46 +++++++++++++--------------
 1 file changed, 23 insertions(+), 23 deletions(-)

diff --git a/Library/Homebrew/test/test_updater.rb b/Library/Homebrew/test/test_updater.rb
index a7e4f3b467..91c7fee0f9 100644
--- a/Library/Homebrew/test/test_updater.rb
+++ b/Library/Homebrew/test/test_updater.rb
@@ -2,33 +2,33 @@ require 'testing_env'
 require 'cmd/update'
 require 'yaml'
 
-class UpdaterMock < Updater
-  def in_repo_expect(cmd, output = '')
-    @outputs  ||= Hash.new { |h,k| h[k] = [] }
-    @expected ||= []
-    @expected << cmd
-    @outputs[cmd] << output
-  end
+class UpdaterTests < Test::Unit::TestCase
+  class UpdaterMock < ::Updater
+    def in_repo_expect(cmd, output = '')
+      @outputs  ||= Hash.new { |h,k| h[k] = [] }
+      @expected ||= []
+      @expected << cmd
+      @outputs[cmd] << output
+    end
 
-  def `(cmd, *args)
-    cmd = "#{cmd} #{args*' '}".strip
-    if @expected.include?(cmd) and !@outputs[cmd].empty?
-      @called ||= []
-      @called << cmd
-      @outputs[cmd].shift
-    else
-      raise "#<#{self.class.name} #{object_id}> unexpectedly called backticks: `#{cmd}'"
+    def `(cmd, *args)
+      cmd = "#{cmd} #{args*' '}".strip
+      if @expected.include?(cmd) and !@outputs[cmd].empty?
+        @called ||= []
+        @called << cmd
+        @outputs[cmd].shift
+      else
+        raise "#{inspect} unexpectedly called backticks: `#{cmd}`"
+      end
+    end
+
+    alias safe_system ` #`
+
+    def expectations_met?
+      @expected == @called
     end
   end
 
-  alias safe_system ` #`
-
-  def expectations_met?
-    @expected == @called
-  end
-end
-
-class UpdaterTests < Test::Unit::TestCase
   def fixture(name)
     self.class.fixture_data[name]
   end