Skip to content

Commit

Permalink
Fixing failing tests in Schema shell.
Browse files Browse the repository at this point in the history
  • Loading branch information
markstory committed Oct 14, 2010
1 parent 193721a commit f1ee467
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 2 deletions.
7 changes: 7 additions & 0 deletions cake/console/libs/schema.php
Original file line number Original file line Diff line number Diff line change
Expand Up @@ -40,6 +40,13 @@ class SchemaShell extends Shell {
*/ */
private $__dry = null; private $__dry = null;


/**
* Schema class being used.
*
* @var CakeSchema
*/
public $Schema;

/** /**
* Override initialize * Override initialize
* *
Expand Down
4 changes: 2 additions & 2 deletions cake/tests/cases/console/libs/schema.test.php
Original file line number Original file line Diff line number Diff line change
Expand Up @@ -146,7 +146,7 @@ public function testStartup() {
$this->assertEqual(strtolower($this->Shell->Schema->name), strtolower(APP_DIR)); $this->assertEqual(strtolower($this->Shell->Schema->name), strtolower(APP_DIR));
$this->assertEqual($this->Shell->Schema->file, 'schema.php'); $this->assertEqual($this->Shell->Schema->file, 'schema.php');


unset($this->Shell->Schema); $this->Shell->Schema = null;
$this->Shell->params = array( $this->Shell->params = array(
'name' => 'TestSchema' 'name' => 'TestSchema'
); );
Expand All @@ -156,7 +156,7 @@ public function testStartup() {
$this->assertEqual($this->Shell->Schema->connection, 'default'); $this->assertEqual($this->Shell->Schema->connection, 'default');
$this->assertEqual($this->Shell->Schema->path, APP . 'config' . DS . 'schema'); $this->assertEqual($this->Shell->Schema->path, APP . 'config' . DS . 'schema');


unset($this->Shell->Schema); $this->Shell->Schema = null;
$this->Shell->params = array( $this->Shell->params = array(
'file' => 'other_file.php', 'file' => 'other_file.php',
'connection' => 'test', 'connection' => 'test',
Expand Down

0 comments on commit f1ee467

Please sign in to comment.