Fixing tests and CS errors

cakephp · Jul 17, 2016 · eff2902 · eff2902
1 parent 3be1067
commit eff2902
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 5 deletions.
diff --git a/tests/TestCase/ORM/TableRegressionTest.php b/tests/TestCase/ORM/TableRegressionTest.php
@@ -52,15 +52,18 @@ public function tearDown()
      * in the afterSave callback
      *
      * @see https://github.com/cakephp/cakephp/issues/9079
-     * @expectedException \Cake\ORM\RolledbackTransactionException
+     * @expectedException Cake\ORM\Exception\RolledbackTransactionException
      * @return void
      */
     public function testAfterSaveRollbackTransaction()
     {
         $table = TableRegistry::get('Authors');
-        $table->eventManager()->on('Model.afterSave', function () use ($table) {
-            $table->connection()->rollback();
-        });
+        $table->eventManager()->on(
+            'Model.afterSave',
+            function () use ($table) {
+                $table->connection()->rollback();
+            }
+        );
         $entity = $table->newEntity(['name' => 'Jon']);
         $table->save($entity);
     }

diff --git a/tests/TestCase/ORM/TableTest.php b/tests/TestCase/ORM/TableTest.php
@@ -2427,7 +2427,7 @@ public function testAtomicSave()
         $config = ConnectionManager::config('test');
 
         $connection = $this->getMockBuilder('\Cake\Database\Connection')
-            ->setMethods(['begin', 'commit'])
+            ->setMethods(['begin', 'commit', 'inTransaction'])
             ->setConstructorArgs([$config])
             ->getMock();
         $connection->driver($this->connection->driver());
@@ -2441,6 +2441,7 @@ public function testAtomicSave()
 
         $connection->expects($this->once())->method('begin');
         $connection->expects($this->once())->method('commit');
+        $connection->expects($this->any())->method('inTransaction')->will($this->returnValue(true));
         $data = new \Cake\ORM\Entity([
             'username' => 'superuser',
             'created' => new Time('2013-10-10 00:00'),