From d06e5f25b00b119d583bcc31efe7f57c090015b4 Mon Sep 17 00:00:00 2001 From: Marcus Moore Date: Thu, 23 May 2024 11:51:08 -0700 Subject: [PATCH 1/8] Remove old trait from test --- tests/Feature/Settings/BrandingSettingsTest.php | 3 --- 1 file changed, 3 deletions(-) diff --git a/tests/Feature/Settings/BrandingSettingsTest.php b/tests/Feature/Settings/BrandingSettingsTest.php index ef98d8559..a27a5d1ef 100644 --- a/tests/Feature/Settings/BrandingSettingsTest.php +++ b/tests/Feature/Settings/BrandingSettingsTest.php @@ -3,13 +3,10 @@ namespace Tests\Feature\Settings; use App\Models\User; -use Tests\Support\InteractsWithSettings; use Tests\TestCase; class BrandingSettingsTest extends TestCase { - use InteractsWithSettings; - public function testSiteNameIsRequired() { $this->actingAs(User::factory()->superuser()->create()) From ef95ede83329786f1db5ae9988f1bd6746ab8e21 Mon Sep 17 00:00:00 2001 From: Marcus Moore Date: Thu, 23 May 2024 12:32:34 -0700 Subject: [PATCH 2/8] Add Install Passport step --- .github/workflows/tests-sqlite.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/workflows/tests-sqlite.yml b/.github/workflows/tests-sqlite.yml index 405dc9213..2bfd4b5f1 100644 --- a/.github/workflows/tests-sqlite.yml +++ b/.github/workflows/tests-sqlite.yml @@ -49,6 +49,9 @@ jobs: - name: Generate key run: php artisan key:generate + - name: Install Passport + run: php artisan passport:install + - name: Directory Permissions run: chmod -R 777 storage bootstrap/cache From a130033480e72bd352721a40273fcebf89ca8d7c Mon Sep 17 00:00:00 2001 From: Marcus Moore Date: Thu, 23 May 2024 12:45:38 -0700 Subject: [PATCH 3/8] Revert "Add Install Passport step" This reverts commit ef95ede83329786f1db5ae9988f1bd6746ab8e21. --- .github/workflows/tests-sqlite.yml | 3 --- 1 file changed, 3 deletions(-) diff --git a/.github/workflows/tests-sqlite.yml b/.github/workflows/tests-sqlite.yml index 2bfd4b5f1..405dc9213 100644 --- a/.github/workflows/tests-sqlite.yml +++ b/.github/workflows/tests-sqlite.yml @@ -49,9 +49,6 @@ jobs: - name: Generate key run: php artisan key:generate - - name: Install Passport - run: php artisan passport:install - - name: Directory Permissions run: chmod -R 777 storage bootstrap/cache From 51f72daba104b7f9a6d1918e391309e5c377bdd4 Mon Sep 17 00:00:00 2001 From: Marcus Moore Date: Thu, 23 May 2024 13:55:03 -0700 Subject: [PATCH 4/8] Debugging step --- .github/workflows/tests-sqlite.yml | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/.github/workflows/tests-sqlite.yml b/.github/workflows/tests-sqlite.yml index 405dc9213..df0608920 100644 --- a/.github/workflows/tests-sqlite.yml +++ b/.github/workflows/tests-sqlite.yml @@ -46,11 +46,14 @@ jobs: - name: Install Dependencies run: composer install -q --no-ansi --no-interaction --no-scripts --no-progress --prefer-dist + - name: Directory Permissions + run: chmod -R 777 storage bootstrap/cache + - name: Generate key run: php artisan key:generate - - name: Directory Permissions - run: chmod -R 777 storage bootstrap/cache + - name: Debug Passport + run: ls -la storage - name: Execute tests (Unit and Feature tests) via PHPUnit env: From fa6e170feb01d78aae9039643dceabaa67dce3fe Mon Sep 17 00:00:00 2001 From: Marcus Moore Date: Thu, 23 May 2024 14:01:06 -0700 Subject: [PATCH 5/8] Install passport --- .github/workflows/tests-sqlite.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/workflows/tests-sqlite.yml b/.github/workflows/tests-sqlite.yml index df0608920..230e192f9 100644 --- a/.github/workflows/tests-sqlite.yml +++ b/.github/workflows/tests-sqlite.yml @@ -52,6 +52,9 @@ jobs: - name: Generate key run: php artisan key:generate + - name: Install Passport + run: php artisan passport:install + - name: Debug Passport run: ls -la storage From 4ce86a061fd1ecc47dd794c0d341cb382ae26099 Mon Sep 17 00:00:00 2001 From: Marcus Moore Date: Thu, 23 May 2024 15:43:59 -0700 Subject: [PATCH 6/8] Set DB_CONNECTION --- .github/workflows/tests-sqlite.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/tests-sqlite.yml b/.github/workflows/tests-sqlite.yml index 230e192f9..fcad5ae98 100644 --- a/.github/workflows/tests-sqlite.yml +++ b/.github/workflows/tests-sqlite.yml @@ -53,6 +53,8 @@ jobs: run: php artisan key:generate - name: Install Passport + env: + DB_CONNECTION: sqlite_testing run: php artisan passport:install - name: Debug Passport From e03b5754a8629909306fc5d8dd3a83e75550b7af Mon Sep 17 00:00:00 2001 From: Marcus Moore Date: Thu, 23 May 2024 15:54:32 -0700 Subject: [PATCH 7/8] Combine steps --- .github/workflows/tests-sqlite.yml | 17 ++++++----------- 1 file changed, 6 insertions(+), 11 deletions(-) diff --git a/.github/workflows/tests-sqlite.yml b/.github/workflows/tests-sqlite.yml index fcad5ae98..85817319e 100644 --- a/.github/workflows/tests-sqlite.yml +++ b/.github/workflows/tests-sqlite.yml @@ -46,19 +46,14 @@ jobs: - name: Install Dependencies run: composer install -q --no-ansi --no-interaction --no-scripts --no-progress --prefer-dist - - name: Directory Permissions - run: chmod -R 777 storage bootstrap/cache - - - name: Generate key - run: php artisan key:generate - - - name: Install Passport + - name: Setup Laravel env: DB_CONNECTION: sqlite_testing - run: php artisan passport:install - - - name: Debug Passport - run: ls -la storage + run: | + php artisan key:generate + php artisan migrate --force + php artisan passport:install + chmod -R 777 storage bootstrap/cache - name: Execute tests (Unit and Feature tests) via PHPUnit env: From 639cbf6d53e92ca1706088b521ad236af76a4fbe Mon Sep 17 00:00:00 2001 From: Marcus Moore Date: Thu, 23 May 2024 15:56:58 -0700 Subject: [PATCH 8/8] Remove passport:install command --- .github/workflows/tests-sqlite.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/tests-sqlite.yml b/.github/workflows/tests-sqlite.yml index 85817319e..ec2ef8b78 100644 --- a/.github/workflows/tests-sqlite.yml +++ b/.github/workflows/tests-sqlite.yml @@ -52,7 +52,6 @@ jobs: run: | php artisan key:generate php artisan migrate --force - php artisan passport:install chmod -R 777 storage bootstrap/cache - name: Execute tests (Unit and Feature tests) via PHPUnit