From 06f681017b58fdc5b23739b5ae501c7bfa4cda37 Mon Sep 17 00:00:00 2001 From: antograssiot Date: Thu, 10 Jul 2014 23:17:25 +0200 Subject: [PATCH] fixes _tests_ directory --- .../Console/Command/Task/FixtureTaskTest.php | 20 +++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/tests/TestCase/Console/Command/Task/FixtureTaskTest.php b/tests/TestCase/Console/Command/Task/FixtureTaskTest.php index 38f59413e31..c23b472a173 100644 --- a/tests/TestCase/Console/Command/Task/FixtureTaskTest.php +++ b/tests/TestCase/Console/Command/Task/FixtureTaskTest.php @@ -85,7 +85,7 @@ public function testInitializeCopyConnection() { * @return void */ public function testGetPath() { - $this->assertPathEquals(ROOT . '/Test/Fixture/', $this->Task->getPath()); + $this->assertPathEquals(ROOT . '/tests/Fixture/', $this->Task->getPath()); } /** @@ -193,7 +193,7 @@ public function testImportRecordsNoEscaping() { public function testMainWithTableOption() { $this->Task->connection = 'test'; $this->Task->params = ['table' => 'comments']; - $filename = $this->_normalizePath(ROOT . '/Test/Fixture/ArticleFixture.php'); + $filename = $this->_normalizePath(ROOT . '/tests/Fixture/ArticleFixture.php'); $this->Task->expects($this->at(0)) ->method('createFile') @@ -231,12 +231,12 @@ public function testMainIntoAll() { ->method('listAll') ->will($this->returnValue(array('articles', 'comments'))); - $filename = $this->_normalizePath(ROOT . '/Test/Fixture/ArticleFixture.php'); + $filename = $this->_normalizePath(ROOT . '/tests/Fixture/ArticleFixture.php'); $this->Task->expects($this->at(0)) ->method('createFile') ->with($filename, $this->stringContains('class ArticleFixture')); - $filename = $this->_normalizePath(ROOT . '/Test/Fixture/CommentFixture.php'); + $filename = $this->_normalizePath(ROOT . '/tests/Fixture/CommentFixture.php'); $this->Task->expects($this->at(1)) ->method('createFile') ->with($filename, $this->stringContains('class CommentFixture')); @@ -256,12 +256,12 @@ public function testAllWithCountAndRecordsFlags() { $this->Task->Model->expects($this->any())->method('listAll') ->will($this->returnValue(array('Articles', 'comments'))); - $filename = $this->_normalizePath(ROOT . '/Test/Fixture/ArticleFixture.php'); + $filename = $this->_normalizePath(ROOT . '/tests/Fixture/ArticleFixture.php'); $this->Task->expects($this->at(0)) ->method('createFile') ->with($filename, $this->stringContains("'title' => 'Third Article'")); - $filename = $this->_normalizePath(ROOT . '/Test/Fixture/CommentFixture.php'); + $filename = $this->_normalizePath(ROOT . '/tests/Fixture/CommentFixture.php'); $this->Task->expects($this->at(1)) ->method('createFile') ->with($filename, $this->stringContains("'comment' => 'First Comment for First Article'")); @@ -282,11 +282,11 @@ public function testAllWithSchemaImport() { $this->Task->Model->expects($this->any())->method('listAll') ->will($this->returnValue(array('Articles', 'comments'))); - $filename = $this->_normalizePath(ROOT . '/Test/Fixture/ArticleFixture.php'); + $filename = $this->_normalizePath(ROOT . '/tests/Fixture/ArticleFixture.php'); $this->Task->expects($this->at(0))->method('createFile') ->with($filename, $this->stringContains("public \$import = ['model' => 'Articles'")); - $filename = $this->_normalizePath(ROOT . '/Test/Fixture/CommentFixture.php'); + $filename = $this->_normalizePath(ROOT . '/tests/Fixture/CommentFixture.php'); $this->Task->expects($this->at(1))->method('createFile') ->with($filename, $this->stringContains("public \$import = ['model' => 'Comments'")); $this->Task->expects($this->exactly(2))->method('createFile'); @@ -306,7 +306,7 @@ public function testMainNoArgs() { ->method('listAll') ->will($this->returnValue(['articles', 'comments'])); - $filename = $this->_normalizePath(ROOT . '/Test/Fixture/ArticleFixture.php'); + $filename = $this->_normalizePath(ROOT . '/tests/Fixture/ArticleFixture.php'); $this->Task->expects($this->never()) ->method('createFile'); @@ -372,7 +372,7 @@ public function testRecordGenerationForBinaryAndFloat() { */ public function testGenerateFixtureFile() { $this->Task->connection = 'test'; - $filename = $this->_normalizePath(ROOT . '/Test/Fixture/ArticleFixture.php'); + $filename = $this->_normalizePath(ROOT . '/tests/Fixture/ArticleFixture.php'); $this->Task->expects($this->at(0)) ->method('createFile')