fix failing test cases

Author: skie

src/Service/Action/Collection/DeleteAction.php

@@ -85,7 +85,7 @@ protected function _deleteMany(array $entities): array
             $errors = [];
             foreach ($entities as $index => $entity) {
                 /** @var \Cake\ORM\Entity $entity */
-                $entity->isNew(false);
+                $entity->setNew(false);
                 try {
                     $this->getTable()->deleteOrFail($entity, ['atomic' => false]);
                 } catch (\InvalidArgumentException $ex) {

src/TestSuite/IntegrationTestCase.php

@@ -30,6 +30,15 @@ class IntegrationTestCase extends \Cake\TestSuite\TestCase
 {
     use IntegrationTestTrait;
 
+    protected $fixtures = [
+        'plugin.CakeDC/Api.SocialAccounts',
+        'plugin.CakeDC/Api.Users',
+        'plugin.CakeDC/Api.Articles',
+        'plugin.CakeDC/Api.Authors',
+        'plugin.CakeDC/Api.Tags',
+        'plugin.CakeDC/Api.ArticlesTags',
+    ];
+
     /**
      * @var string|int Current logged in user
      */
@@ -86,9 +95,13 @@ protected function _userToken(?string $userId = null)
             $userId = $this->getDefaultUser();
         }
         $Users = TableRegistry::getTableLocator()->get('CakeDC/Users.Users');
-        $user = $Users->find()->where(['id' => $userId])->first();
-        if ($user instanceof EntityInterface) {
-            return $user['api_token'];
+        if ($userId) {
+            $user = $Users->find()
+                          ->where(['id' => $userId])
+                          ->first();
+            if ($user instanceof EntityInterface) {
+                return $user['api_token'];
+            }
         }
 
         return null;

src/TestSuite/TestCase.php

@@ -23,6 +23,15 @@
  */
 class TestCase extends BaseTestCase
 {
+    protected $fixtures = [
+        'plugin.CakeDC/Api.SocialAccounts',
+        'plugin.CakeDC/Api.Users',
+        'plugin.CakeDC/Api.Articles',
+        'plugin.CakeDC/Api.Authors',
+        'plugin.CakeDC/Api.Tags',
+        'plugin.CakeDC/Api.ArticlesTags',
+    ];
+
     /**
      * setUp
      *

tests/FixturesTrait.php

@@ -25,12 +25,19 @@ trait FixturesTrait
      *
      * @var array
      */
-    public $fixtures = [
+    public $defaultFixtures = [
         'plugin.CakeDC/Api.SocialAccounts',
         'plugin.CakeDC/Api.Users',
         'plugin.CakeDC/Api.Articles',
         'plugin.CakeDC/Api.Authors',
         'plugin.CakeDC/Api.Tags',
         'plugin.CakeDC/Api.ArticlesTags',
     ];
+    
+    public function mergeFixtures()
+    {
+        if (empty($this->fixtures)) {
+            $this->fixtures = $this->defaultFixtures;
+        }
+    }
 }

tests/TestCase/Auth/Authenticate/SocialAuthenticateTest.php

@@ -20,13 +20,11 @@
 use CakeDC\Api\Service\Auth\Authenticate\SocialAuthenticate;
 use CakeDC\Api\Service\FallbackService;
 use CakeDC\Api\Test\ConfigTrait;
-use CakeDC\Api\Test\FixturesTrait;
 use CakeDC\Api\TestSuite\TestCase;
 
 class SocialAuthenticateTest extends TestCase
 {
     use ConfigTrait;
-    use FixturesTrait;
 
     /**
      * @var SocialAuthenticate

tests/TestCase/Auth/Authenticate/TokenAuthenticateTest.php

@@ -20,13 +20,11 @@
 use CakeDC\Api\Service\Auth\Authenticate\TokenAuthenticate;
 use CakeDC\Api\Service\FallbackService;
 use CakeDC\Api\Test\ConfigTrait;
-use CakeDC\Api\Test\FixturesTrait;
 use CakeDC\Api\TestSuite\TestCase;
 
 class TokenAuthenticateTest extends TestCase
 {
     use ConfigTrait;
-    use FixturesTrait;
 
     /**
      * @var TokenAuthenticate

tests/TestCase/Auth/Authorize/SimpleRbacAuthorizeTest.php

@@ -24,6 +24,7 @@
 
 class SimpleRbacAuthorizeTest extends TestCase
 {
+
     /**
      * @var Service
      */

tests/TestCase/Integration/Service/Action/Auth/LoginActionTest.php

@@ -16,7 +16,6 @@
 use Cake\Core\Configure;
 use Cake\Utility\Hash;
 use CakeDC\Api\Test\ConfigTrait;
-use CakeDC\Api\Test\FixturesTrait;
 use CakeDC\Api\TestSuite\IntegrationTestCase;
 
 /**
@@ -27,7 +26,6 @@
 class LoginActionTest extends IntegrationTestCase
 {
     use ConfigTrait;
-    use FixturesTrait;
 
     /**
      * setUp

tests/TestCase/Integration/Service/Action/Auth/RegisterActionTest.php

@@ -17,7 +17,6 @@
 use Cake\Routing\Router;
 use Cake\Utility\Hash;
 use CakeDC\Api\Test\ConfigTrait;
-use CakeDC\Api\Test\FixturesTrait;
 use CakeDC\Api\TestSuite\IntegrationTestCase;
 
 /**
@@ -28,7 +27,6 @@
 class RegisterActionTest extends IntegrationTestCase
 {
     use ConfigTrait;
-    use FixturesTrait;
 
     /**
      * setUp

tests/TestCase/Integration/Service/Action/Auth/ResetPasswordActionTest.php

@@ -16,7 +16,6 @@
 use Cake\Core\Configure;
 use Cake\ORM\TableRegistry;
 use CakeDC\Api\Test\ConfigTrait;
-use CakeDC\Api\Test\FixturesTrait;
 use CakeDC\Api\Test\Settings;
 use CakeDC\Api\TestSuite\IntegrationTestCase;
 
@@ -28,7 +27,6 @@
 class ResetPasswordActionTest extends IntegrationTestCase
 {
     use ConfigTrait;
-    use FixturesTrait;
 
     /**
      * setUp