From 110536d5757545faa3118e24b8b40ceda29d59eb Mon Sep 17 00:00:00 2001 From: Jelle Henkens Date: Tue, 15 May 2012 21:41:11 +0100 Subject: [PATCH] Fixing CakeSchema to test APP_DIR with different names than all lowercase --- lib/Cake/Test/Case/Model/CakeSchemaTest.php | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/lib/Cake/Test/Case/Model/CakeSchemaTest.php b/lib/Cake/Test/Case/Model/CakeSchemaTest.php index 07265f5c5..47effcc14 100644 --- a/lib/Cake/Test/Case/Model/CakeSchemaTest.php +++ b/lib/Cake/Test/Case/Model/CakeSchemaTest.php @@ -510,12 +510,24 @@ class CakeSchemaTest extends CakeTestCase { */ public function testSchemaName() { $Schema = new CakeSchema(); - $this->assertEquals(strtolower(APP_DIR), strtolower($Schema->name)); + $this->assertEquals(Inflector::camelize(Inflector::slug(APP_DIR)), $Schema->name); Configure::write('App.dir', 'Some.name.with.dots'); $Schema = new CakeSchema(); $this->assertEquals('SomeNameWithDots', $Schema->name); + Configure::write('App.dir', 'Some-name-with-dashes'); + $Schema = new CakeSchema(); + $this->assertEquals('SomeNameWithDashes', $Schema->name); + + Configure::write('App.dir', 'Some name with spaces'); + $Schema = new CakeSchema(); + $this->assertEquals('SomeNameWithSpaces', $Schema->name); + + Configure::write('App.dir', 'Some,name;with&weird=characters'); + $Schema = new CakeSchema(); + $this->assertEquals('SomeNameWithWeirdCharacters', $Schema->name); + Configure::write('App.dir', 'app'); }