Merge branch '1.1' into 1.1-Mailer

cakephp · Jul 1, 2015 · 9b3b3f3 · 9b3b3f3
2 parents a8dbc01 + 7fd20ec
commit 9b3b3f3
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/tests/TestCase/Shell/Task/ModelTaskTest.php b/tests/TestCase/Shell/Task/ModelTaskTest.php
@@ -1253,9 +1253,9 @@ public function testSkipTablesAndAll()
         $this->Task->connection = 'test';
         $this->Task->skipTables = ['articles_tags', 'bake_tags', 'counter_cache_posts'];
 
-        $this->Task->Fixture->expects($this->exactly(9))
+        $this->Task->Fixture->expects($this->atLeast(9))
             ->method('bake');
-        $this->Task->Test->expects($this->exactly(9))
+        $this->Task->Test->expects($this->atLeast(9))
             ->method('bake');
 
         $filename = $this->_normalizePath(APP . 'Model/Entity/BakeArticle.php');