Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Refactoring and updating footer element to use param based basePath.

Moving footer inclusion to CakeHtmlReporter.
  • Loading branch information...
commit b6e22704edb3ec071a3a1d2901d268db5bd766c2 1 parent 6b3e958
@markstory markstory authored
View
7 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();
}
View
2  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';
}
/**
View
2  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');
Please sign in to comment.
Something went wrong with that request. Please try again.