Merge pull request #15672 from cakephp/transaction-strategy

4.next - Start using Transaction strategy

tests/TestCase/Controller/ControllerTest.php

@@ -23,6 +23,7 @@ use Cake\Event\EventInterface;
 use Cake\Http\Response;
 use Cake\Http\ServerRequest;
 use Cake\Routing\Router;
+use Cake\TestSuite\Fixture\TransactionStrategy;
 use Cake\TestSuite\TestCase;
 use Laminas\Diactoros\Uri;
 use ReflectionFunction;
@@ -38,6 +39,11 @@ use TestPlugin\Controller\TestPluginController;
 class ControllerTest extends TestCase
 {
     /**
+     * @inheritDoc
+     */
+    protected $stateResetStrategy = TransactionStrategy::class;
+
+    /**
      * fixtures property
      *
      * @var array

tests/TestCase/Http/SessionTest.php

@@ -17,6 +17,7 @@ declare(strict_types=1);
 namespace Cake\Test\TestCase\Http;
 
 use Cake\Http\Session;
+use Cake\TestSuite\Fixture\TransactionStrategy;
 use Cake\TestSuite\TestCase;
 use InvalidArgumentException;
 use RuntimeException;
@@ -29,6 +30,11 @@ use TestApp\Http\Session\TestWebSession;
 class SessionTest extends TestCase
 {
     /**
+     * @inheritDoc
+     */
+    protected $stateResetStrategy = TransactionStrategy::class;
+
+    /**
      * Fixtures used in the SessionTest
      *
      * @var array

tests/TestCase/Utility/XmlTest.php

@@ -30,22 +30,6 @@ use TypeError;
 class XmlTest extends TestCase
 {
     /**
-     * autoFixtures property
-     *
-     * @var bool
-     */
-    public $autoFixtures = false;
-
-    /**
-     * fixtures property
-     *
-     * @var array
-     */
-    protected $fixtures = [
-        'core.Articles', 'core.Users',
-    ];
-
-    /**
      * setUp method
      */
     public function setUp(): void

tests/TestCase/View/Form/EntityContextTest.php

@@ -40,14 +40,6 @@ class EntityContextTest extends TestCase
     protected $fixtures = ['core.Articles', 'core.Comments', 'core.Tags', 'core.ArticlesTags'];
 
     /**
-     * setup method.
-     */
-    public function setUp(): void
-    {
-        parent::setUp();
-    }
-
-    /**
      * tests getRequiredMessage
      */
     public function testGetRequiredMessage(): void

tests/TestCase/View/Helper/FormHelperTest.php

@@ -25,6 +25,7 @@ use Cake\I18n\FrozenTime;
 use Cake\ORM\Entity;
 use Cake\ORM\Table;
 use Cake\Routing\Router;
+use Cake\TestSuite\Fixture\TransactionStrategy;
 use Cake\TestSuite\TestCase;
 use Cake\Utility\Security;
 use Cake\Validation\Validator;
@@ -46,6 +47,11 @@ use TestApp\Model\Table\ValidateUsersTable;
 class FormHelperTest extends TestCase
 {
     /**
+     * @inheritDoc
+     */
+    protected $stateResetStrategy = TransactionStrategy::class;
+
+    /**
      * Fixtures to be used
      *
      * @var array

tests/TestCase/View/ViewTest.php

@@ -24,6 +24,7 @@ use Cake\Core\Plugin;
 use Cake\Event\EventInterface;
 use Cake\Http\Response;
 use Cake\Http\ServerRequest;
+use Cake\TestSuite\Fixture\TransactionStrategy;
 use Cake\TestSuite\TestCase;
 use Cake\View\View;
 use RuntimeException;
@@ -41,6 +42,11 @@ use TestApp\View\TestViewEventListenerInterface;
 class ViewTest extends TestCase
 {
     /**
+     * @inheritDoc
+     */
+    protected $stateResetStrategy = TransactionStrategy::class;
+
+    /**
      * Fixtures used in this test.
      *
      * @var array