Fix some more tests

Author: riasvdv

src/Database/Migrations/Install.php

@@ -623,14 +623,16 @@ public function createTables(): void
             $table->char('uid', 36)->default('0');
         });
 
-        Schema::create('sessions', function (Blueprint $table) {
-            $table->string('id')->primary();
-            $table->foreignId('user_id')->nullable()->index();
-            $table->string('ip_address', 45)->nullable();
-            $table->text('user_agent')->nullable();
-            $table->longText('payload');
-            $table->integer('last_activity')->index();
-        });
+        if (! Schema::hasTable('sessions')) {
+            Schema::create('sessions', function (Blueprint $table) {
+                $table->string('id')->primary();
+                $table->foreignId('user_id')->nullable()->index();
+                $table->string('ip_address', 45)->nullable();
+                $table->text('user_agent')->nullable();
+                $table->longText('payload');
+                $table->integer('last_activity')->index();
+            });
+        }
 
         Schema::create('shunnedmessages', function (Blueprint $table) {
             $table->integer('id', true);

tests/TestCase.php

@@ -83,7 +83,6 @@ protected function migrateDatabases()
         /** Drop Laravel migrations */
         Schema::drop('migrations');
         Schema::drop('cache');
-        Schema::drop('sessions');
         Schema::drop('users');
 
         $site = new Site(

yii2-adapter/tests/unit/web/twig/ExtensionTest.php

@@ -17,6 +17,7 @@
 use craft\web\View;
 use CraftCms\Cms\Cms;
 use CraftCms\Cms\Edition;
+use CraftCms\Cms\Element\Models\Element;
 use CraftCms\Cms\Entry\Models\EntryType;
 use CraftCms\Cms\Field\MissingField;
 use CraftCms\Cms\Field\PlainText;
@@ -71,11 +72,12 @@ public function test_globals(): void
     {
         // We want web for this part.
         Craft::$app->getRequest()->setIsConsoleRequest(false);
-        $user = new User([
+        $user = \CraftCms\Cms\User\Models\User::create([
+            'id' => Element::create(['type' => User::class])->id,
             'active' => true,
             'firstName' => 'John',
             'lastName' => 'Smith',
-        ]);
+        ])->asElement();
         Craft::$app->getUser()->setIdentity(new IdentityWrapper($user));
         Craft::$app->getRequest()->setRawBody('This is a raw body');