Update tests

Author: riasvdv

src/Config/ConstAdapter.php

@@ -5,6 +5,7 @@
 namespace CraftCms\Cms\Config;
 
 use Dotenv\Repository\Adapter\AdapterInterface;
+use Override;
 use PhpOption\Option;
 use PhpOption\Some;
 
@@ -22,8 +23,8 @@ private function __construct() {}
      *
      * @return Option<AdapterInterface>
      */
-    #[\Override]
-    public static function create()
+    #[Override]
+    public static function create(): Option
     {
         /** @var Option<AdapterInterface> */
         return Some::create(new self);
@@ -35,8 +36,8 @@ public static function create()
      * @param  non-empty-string  $name
      * @return Option<string>
      */
-    #[\Override]
-    public function read(string $name)
+    #[Override]
+    public function read(string $name): Option
     {
         return Option::fromValue(defined($name) ? constant($name) : null);
     }
@@ -45,10 +46,9 @@ public function read(string $name)
      * Write to an environment variable, if possible.
      *
      * @param  non-empty-string  $name
-     * @return bool
      */
-    #[\Override]
-    public function write(string $name, string $value)
+    #[Override]
+    public function write(string $name, string $value): bool
     {
         define($name, $value);
 
@@ -59,10 +59,9 @@ public function write(string $name, string $value)
      * Delete an environment variable, if possible.
      *
      * @param  non-empty-string  $name
-     * @return bool
      */
-    #[\Override]
-    public function delete(string $name)
+    #[Override]
+    public function delete(string $name): bool
     {
         return false;
     }

src/Database/Migrations/Install.php

@@ -33,6 +33,7 @@
 use CraftCms\Cms\Support\Facades\Sites;
 use CraftCms\Cms\Support\Str;
 use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Auth;
 use Illuminate\Support\Facades\DB;
 use Illuminate\Support\Facades\Event;
 use Illuminate\Support\Facades\Schema;
@@ -74,6 +75,7 @@ public function up(): void
                 $this->insertDefaultData();
             } catch (Throwable $e) {
                 $this->components->error("Error inserting default data: {$e->getMessage()}");
+                $this->getOutput()->info($e->getTraceAsString());
             }
         });
 
@@ -1130,8 +1132,8 @@ public function insertDefaultData(): void
                 'language' => $this->site->getLanguage(),
             ]);
 
-            if (! Craft::$app->getRequest()->getIsConsoleRequest()) {
-                Craft::$app->getUser()->login($user, Cms::config()->userSessionDuration);
+            if (! app()->runningInConsole()) {
+                Auth::guard('craft')->loginUsingId($user->id);
             }
         });
     }

src/Database/Queries/Concerns/QueriesDraftsAndRevisions.php

@@ -8,7 +8,7 @@
 use CraftCms\Cms\Database\Queries\ElementQuery;
 use CraftCms\Cms\Database\Table;
 use CraftCms\Cms\Support\Arr;
-use CraftCms\Cms\User\Models\User;
+use CraftCms\Cms\User\Elements\User;
 use Illuminate\Database\Query\Builder;
 use Illuminate\Support\Collection;
 use InvalidArgumentException;

src/Utility/Utilities/ClearCaches.php

@@ -96,6 +96,13 @@ public static function contentHtml(): string
      */
     public static function cacheOptions(): array
     {
+        /**
+         * TODO: Remove this when dependency on app('Craft') is gone.
+         */
+        if (app()->runningUnitTests()) {
+            return [];
+        }
+
         $pathService = app('Craft')->getPath();
 
         $options = [

tests/Announcement/AnnouncementsTest.php

@@ -13,7 +13,7 @@
 });
 
 it('can get announcements for a user', function () {
-    $user = User::find();
+    $user = User::find()->one();
 
     $announcement = Announcement::factory()
         ->unread()
@@ -29,7 +29,7 @@
 });
 
 it('can mark announcements as read', function () {
-    $user = User::first();
+    $user = User::find()->one();
 
     $announcement = Announcement::factory()
         ->unread()

tests/Dashboard/DashboardTest.php

@@ -11,15 +11,15 @@
 use CraftCms\Cms\Dashboard\Widgets\CraftSupport;
 use CraftCms\Cms\Dashboard\Widgets\Feed;
 use CraftCms\Cms\Dashboard\Widgets\Widget;
-use CraftCms\Cms\User\Models\User;
+use CraftCms\Cms\User\Elements\User;
 use Illuminate\Support\Facades\Event;
 
 use function Pest\Laravel\actingAs;
 
 beforeEach(function () {
     $this->dashboard = app(Dashboard::class);
 
-    actingAs(User::first());
+    actingAs(User::find()->one());
 
     WidgetModel::all()->each->delete();
 });

tests/Dashboard/Widgets/CraftSupportTest.php

@@ -4,13 +4,14 @@
 
 use CraftCms\Cms\Dashboard\Dashboard;
 use CraftCms\Cms\Dashboard\Widgets\CraftSupport;
-use CraftCms\Cms\User\Models\User;
+use CraftCms\Cms\User\Elements\User;
+use CraftCms\Cms\User\Models\User as UserModel;
 use Illuminate\Support\Facades\Session;
 
 use function Pest\Laravel\actingAs;
 
 it('can render', function () {
-    actingAs(User::first());
+    actingAs(User::find()->one());
     Session::start();
 
     $dashboard = app(Dashboard::class);
@@ -20,15 +21,15 @@
 });
 
 it('is only selectable by admins', function () {
-    User::first()->update(['admin' => false]);
+    UserModel::first()->update(['admin' => false]);
 
-    actingAs(User::first());
+    actingAs(User::find()->one());
     Session::start();
 
     expect(CraftSupport::isSelectable())->toBeFalse();
 
-    User::first()->update(['admin' => true]);
-    actingAs(User::first());
+    UserModel::first()->update(['admin' => true]);
+    actingAs(User::find()->one());
 
     expect(CraftSupport::isSelectable())->toBeTrue();
 });

tests/Dashboard/Widgets/FeedTest.php

@@ -4,13 +4,13 @@
 
 use CraftCms\Cms\Dashboard\Dashboard;
 use CraftCms\Cms\Dashboard\Widgets\Feed;
-use CraftCms\Cms\User\Models\User;
+use CraftCms\Cms\User\Elements\User;
 use Illuminate\Support\Facades\Session;
 
 use function Pest\Laravel\actingAs;
 
 it('can render', function () {
-    actingAs(User::first());
+    actingAs(User::find()->one());
     Session::start();
 
     $dashboard = app(Dashboard::class);

tests/Dashboard/Widgets/MyDraftsTest.php

@@ -4,13 +4,13 @@
 
 use CraftCms\Cms\Dashboard\Dashboard;
 use CraftCms\Cms\Dashboard\Widgets\MyDrafts;
-use CraftCms\Cms\User\Models\User;
+use CraftCms\Cms\User\Elements\User;
 use Illuminate\Support\Facades\Session;
 
 use function Pest\Laravel\actingAs;
 
 it('can render', function () {
-    actingAs(User::first());
+    actingAs(User::find()->one());
     Session::start();
 
     $dashboard = app(Dashboard::class);

tests/Dashboard/Widgets/QuickPostTest.php

@@ -4,13 +4,13 @@
 
 use CraftCms\Cms\Dashboard\Dashboard;
 use CraftCms\Cms\Dashboard\Widgets\QuickPost;
-use CraftCms\Cms\User\Models\User;
+use CraftCms\Cms\User\Elements\User;
 use Illuminate\Support\Facades\Session;
 
 use function Pest\Laravel\actingAs;
 
 it('can render', function () {
-    actingAs(User::first());
+    actingAs(User::find()->one());
     Session::start();
 
     $dashboard = app(Dashboard::class);