From 02c3ed681b4d2ed1a59ba84f045bf4fce0ecfd43 Mon Sep 17 00:00:00 2001
From: Robert Sesek <rsesek@bluestatic.org>
Date: Mon, 14 Jan 2008 14:41:00 -0500
Subject: [PATCH] We now pass the installer test again, the issue was that
 InstallerTest->input wasn't being set. The circular ref to the rig in
 TestInstallerFixture was also cleaned up

* UnitTest/InstallerTest.php
---
 UnitTest/InstallerTest.php | 14 +++++---------
 1 file changed, 5 insertions(+), 9 deletions(-)

diff --git a/UnitTest/InstallerTest.php b/UnitTest/InstallerTest.php
index b6168a2..261eb11 100644
--- a/UnitTest/InstallerTest.php
+++ b/UnitTest/InstallerTest.php
@@ -11,10 +11,8 @@ class InstallerTest extends PHPUnit_Framework_TestCase
 	
 	public function setUp()
 	{
-		global $rig;
-		
-		$rig = $this;
-		BSApp::$input = new BSInput();
+		$this->input = BSApp::$input = new BSInput();
+		TestInstallerFixture::$rig = $this;
 	}
 	
 	private function _loadClass()
@@ -56,7 +54,7 @@ class InstallerTest extends PHPUnit_Framework_TestCase
 
 class TestInstallerFixture extends BSInstaller
 {
-	public $rig;
+	public static $rig;
 	
 	protected function _pageTitle()
 	{
@@ -75,14 +73,12 @@ class TestInstallerFixture extends BSInstaller
 	
 	public function step1()
 	{
-		global $rig;
-		$rig->stepCheck(1);
+		self::$rig->stepCheck(1);
 	}
 	
 	public function step2()
 	{
-		global $rig;
-		$rig->stepCheck(2);
+		self::$rig->stepCheck(2);
 	}
 }
 
-- 
2.22.5