Refactoring and updating footer element to use param based basePath.

Moving footer inclusion to CakeHtmlReporter.
cakephp · Jan 6, 2010 · b6e2270 · b6e2270
1 parent 6b3e958
commit b6e2270
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 4 deletions.
diff --git a/cake/tests/lib/cake_test_suite_dispatcher.php b/cake/tests/lib/cake_test_suite_dispatcher.php
@@ -102,7 +102,6 @@ function dispatch() {
 			$this->_groupTestList();
 		}
 
-		CakeTestMenu::footer();
 		$output = ob_get_clean();
 		echo $output;
 	}
@@ -114,7 +113,7 @@ function dispatch() {
  */
 	function _checkSimpleTest() {
 		if (!App::import('Vendor', 'simpletest' . DS . 'reporter')) {
-			$baseUrl = $this->_baseDir;
+			$basePath = $this->_baseDir;
 			include CAKE_TESTS_LIB . 'templates' . DS . 'simpletest.php';
 			exit();
 		}
@@ -128,7 +127,7 @@ function _checkSimpleTest() {
  */
 	function _checkXdebug() {
 		if (!extension_loaded('xdebug')) {
-			$baseUrl = $this->_baseDir;
+			$basePath = $this->_baseDir;
 			include CAKE_TESTS_LIB . 'templates' . DS . 'xdebug.php';
 			exit();
 		}
@@ -214,6 +213,8 @@ function _parseParams() {
 			require_once CAKE_TESTS_LIB . 'code_coverage_manager.php';
 			$this->_checkXdebug();
 		}
+		$this->params['baseUrl'] = $this->_baseUrl;
+		$this->params['baseDir'] = $this->_baseDir;
 		$this->getManager();
 	}
 

diff --git a/cake/tests/lib/reporter/cake_html_reporter.php b/cake/tests/lib/reporter/cake_html_reporter.php
@@ -155,6 +155,8 @@ function paintFooter($test_name) {
 		}
 		echo $this->_paintLinks();
 		echo '</div>';
+		$baseDir = $this->params['baseDir'];
+		include CAKE_TESTS_LIB . 'templates' . DS . 'footer.php';
 	}
 
 /**

diff --git a/cake/tests/lib/templates/footer.php b/cake/tests/lib/templates/footer.php
@@ -22,7 +22,7 @@
  		<div id="footer">
  			<!--PLEASE USE ONE OF THE POWERED BY CAKEPHP LOGO-->
  			<a href="http://www.cakephp.org/" target="_blank">
- 				<img src="<?php echo $baseUrl; ?>img/cake.power.gif" alt="CakePHP(tm) :: Rapid Development Framework" /></a></p>
+ 				<img src="<?php echo $baseDir; ?>img/cake.power.gif" alt="CakePHP(tm) :: Rapid Development Framework" /></a></p>
  		</div>
 		<?php
 			App::import('Core', 'View');