mirror of
https://github.com/kamilwylegala/cakephp2-php8.git
synced 2024-11-15 11:28:25 +00:00
Merge branch '2.0-phpunit' of github.com:cakephp/cakephp into 2.0-phpunit
Conflicts: cake/console/libs/testsuite.php
This commit is contained in:
commit
ab6e3eecd9
1 changed files with 3 additions and 6 deletions
|
@ -74,11 +74,8 @@ class TestSuiteShell extends Shell {
|
||||||
if (isset($this->args[1])) {
|
if (isset($this->args[1])) {
|
||||||
$params['case'] = Inflector::underscore($this->args[1]);
|
$params['case'] = Inflector::underscore($this->args[1]);
|
||||||
}
|
}
|
||||||
if (isset($this->args[2]) && $this->args[2] == 'cov') {
|
if (isset($this->params['filter'])) {
|
||||||
$params['codeCoverage'] = true;
|
$this->params['-filter'] = $this->params['filter'];
|
||||||
}
|
|
||||||
if (isset($this->params['coverage'])) {
|
|
||||||
$params['codeCoverage'] = true;
|
|
||||||
}
|
}
|
||||||
return $params;
|
return $params;
|
||||||
}
|
}
|
||||||
|
@ -183,7 +180,7 @@ class TestSuiteShell extends Shell {
|
||||||
$this->out('CakePHP Testsuite:');
|
$this->out('CakePHP Testsuite:');
|
||||||
$this->hr();
|
$this->hr();
|
||||||
|
|
||||||
$this->out('The CakPHP Testsuite allows you to run test cases from the comman line');
|
$this->out('The CakPHP Testsuite allows you to run test cases from the command line');
|
||||||
$this->out('If run with no command line arguments, a list of available core test cases will be shown');
|
$this->out('If run with no command line arguments, a list of available core test cases will be shown');
|
||||||
$this->hr();
|
$this->hr();
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue