Skip to content
Browse files

Merge pull request #654 from jellehenkens/2.2-schema-shell-test

Fixing test assert for APP_DIR scenarios with non standard folder names
  • Loading branch information...
2 parents 07c901d + ef270b9 commit 405aacc0fc635757d37664dc148f7152b36c90b0 @markstory markstory committed
Showing with 2 additions and 2 deletions.
  1. +2 −2 lib/Cake/Test/Case/Console/Command/SchemaShellTest.php
View
4 lib/Cake/Test/Case/Console/Command/SchemaShellTest.php
@@ -135,7 +135,7 @@ public function testStartup() {
$this->Shell->startup();
$this->assertTrue(isset($this->Shell->Schema));
$this->assertTrue(is_a($this->Shell->Schema, 'CakeSchema'));
- $this->assertEquals(strtolower(APP_DIR), strtolower($this->Shell->Schema->name));
+ $this->assertEquals(Inflector::camelize(Inflector::slug(APP_DIR)), $this->Shell->Schema->name);
$this->assertEquals('schema.php', $this->Shell->Schema->file);
$this->Shell->Schema = null;
@@ -155,7 +155,7 @@ public function testStartup() {
'path' => '/test/path'
);
$this->Shell->startup();
- $this->assertEquals(strtolower(APP_DIR), strtolower($this->Shell->Schema->name));
+ $this->assertEquals(Inflector::camelize(Inflector::slug(APP_DIR)), $this->Shell->Schema->name);
$this->assertEquals('other_file.php', $this->Shell->Schema->file);
$this->assertEquals('test', $this->Shell->Schema->connection);
$this->assertEquals('/test/path', $this->Shell->Schema->path);

0 comments on commit 405aacc

Please sign in to comment.
Something went wrong with that request. Please try again.