Skip to content
Permalink
Browse files

Fixing failing test and adding skip for test that will fail in a non-…

…isolated case.
  • Loading branch information...
markstory committed Nov 21, 2010
1 parent a729d29 commit cb657b158b0e0c5a59132664ba01aeac0abcc36c
@@ -41,6 +41,7 @@ public function setUp() {
array('in', 'out', 'hr', 'help', 'error', 'err', '_stop', 'initialize', 'run', 'clear'),
array($out, $out, $in)
);
$this->Shell->OptionParser = $this->getMock('ConsoleOptionParser', array(), array(null, false));
}
/**
@@ -61,7 +62,7 @@ public function testAvailableWithEmptyList() {
$this->Shell->startup();
$this->Shell->args = array('unexistant-category');
$this->Shell->expects($this->at(0))->method('out')->with(__("No test cases available \n\n"));
$this->Shell->expects($this->once())->method('help');
$this->Shell->OptionParser->expects($this->once())->method('help');
$this->Shell->available();
}
@@ -192,6 +192,8 @@ function testHelperSettingMergingNoDuplication() {
* @return void
*/
function testHelperOrderPrecedence() {
$this->skipIf(defined('APP_CONTROLLER_EXISTS'), "APP_CONTROLLER_EXISTS cannot run {$this->name}");
$Controller =& new MergeVariablesController();
$Controller->helpers = array('Custom', 'Foo' => array('something'));
$Controller->constructClasses();

0 comments on commit cb657b1

Please sign in to comment.
You can’t perform that action at this time.