Dump exception if dying on 500 during tests. (#1612)

LycheeOrg · Dec 5, 2022 · d87c867 · d87c867
1 parent 4fe60a1
commit d87c867
Show file tree

Hide file tree

Showing 22 changed files with 213 additions and 128 deletions.
diff --git a/tests/Feature/ApiTokenTest.php b/tests/Feature/ApiTokenTest.php
@@ -12,7 +12,6 @@
 
 namespace Tests\Feature;
 
-use App\Models\User;
 use Illuminate\Support\Facades\Auth;
 use Illuminate\Support\Facades\Session;
 use Tests\Feature\Lib\UsersUnitTest;
@@ -43,12 +42,12 @@ public function testAuthenticateWithTokenOnly(): void
 		$token = $this->resetAdminToken();
 
 		$response = $this->postJson('/api/User::getAuthenticatedUser');
-		$response->assertStatus(204);
+		$this->assertStatus($response, 204);
 
 		$response = $this->postJson('/api/User::getAuthenticatedUser', [], [
 			'Authorization' => $token,
 		]);
-		$response->assertStatus(200);
+		$this->assertStatus($response, 200);
 		$response->assertSee([
 			'id' => 0,
 		], false);
@@ -71,7 +70,7 @@ public function testChangeOfTokensWithoutSession(): void
 		$response = $this->postJson('/api/User::getAuthenticatedUser', [], [
 			'Authorization' => $adminToken,
 		]);
-		$response->assertStatus(200);
+		$this->assertStatus($response, 200);
 		$response->assertSee([
 			'id' => 0,
 		], false);
@@ -90,7 +89,7 @@ public function testChangeOfTokensWithoutSession(): void
 		$response = $this->postJson('/api/User::getAuthenticatedUser', [], [
 			'Authorization' => $userToken,
 		]);
-		$response->assertStatus(200);
+		$this->assertStatus($response, 200);
 		$response->assertSee([
 			'id' => $userId,
 		], false);
@@ -111,7 +110,7 @@ public function testForbiddenChangeOfTokensInSameSession(): void
 		$response = $this->postJson('/api/User::getAuthenticatedUser', [], [
 			'Authorization' => $adminToken,
 		]);
-		$response->assertStatus(200);
+		$this->assertStatus($response, 200);
 		$response->assertSee([
 			'id' => 0,
 		], false);
@@ -134,7 +133,7 @@ public function testForbiddenChangeOfTokensInSameSession(): void
 		$response = $this->postJson('/api/User::getAuthenticatedUser', [], [
 			'Authorization' => $userToken,
 		]);
-		$response->assertStatus(401);
+		$this->assertStatus($response, 401);
 	}
 
 	/**
@@ -153,7 +152,7 @@ public function testLoginAndLogoutWithToken(): void
 		$response = $this->postJson('/api/User::getAuthenticatedUser', [], [
 			'Authorization' => $userToken,
 		]);
-		$response->assertStatus(200);
+		$this->assertStatus($response, 200);
 		$response->assertSee([
 			'id' => $userId,
 		], false);
@@ -174,13 +173,13 @@ public function testLoginAndLogoutWithToken(): void
 		], [
 			'Authorization' => $userToken,
 		]);
-		$response->assertStatus(204);
+		$this->assertStatus($response, 204);
 
 		Auth::forgetGuards();
 
 		// Ensure that we are still logged in even without providing the token
 		$response = $this->postJson('/api/User::getAuthenticatedUser');
-		$response->assertStatus(200);
+		$this->assertStatus($response, 200);
 		$response->assertSee([
 			'id' => $userId,
 		], false);
@@ -191,13 +190,13 @@ public function testLoginAndLogoutWithToken(): void
 		$response = $this->postJson('/api/Session::logout', [], [
 			'Authorization' => $userToken,
 		]);
-		$response->assertStatus(204);
+		$this->assertStatus($response, 204);
 
 		Auth::forgetGuards();
 
 		// Ensure that we are logged out without the token
 		$response = $this->postJson('/api/User::getAuthenticatedUser');
-		$response->assertStatus(204);
+		$this->assertStatus($response, 204);
 	}
 
 	/**
@@ -217,7 +216,7 @@ public function testLoginWithDifferentUserThanToken(): void
 		], [
 			'Authorization' => $userToken2,
 		]);
-		$response->assertStatus(400);
+		$this->assertStatus($response, 400);
 	}
 
 	/**
@@ -236,9 +235,9 @@ public function testProvideDifferentTokenThanLogin(): void
 			'username' => 'user1',
 			'password' => 'pwd1',
 		]);
-		$response->assertStatus(204);
+		$this->assertStatus($response, 204);
 		$response = $this->postJson('/api/User::getAuthenticatedUser');
-		$response->assertStatus(200);
+		$this->assertStatus($response, 200);
 		$response->assertSee([
 			'id' => $userId1,
 		], false);
@@ -256,7 +255,7 @@ public function testProvideDifferentTokenThanLogin(): void
 		$response = $this->postJson('/api/User::getAuthenticatedUser', [], [
 			'Authorization' => $userToken2,
 		]);
-		$response->assertStatus(400);
+		$this->assertStatus($response, 400);
 	}
 
 	/**

diff --git a/tests/Feature/DemoTest.php b/tests/Feature/DemoTest.php
@@ -32,7 +32,7 @@ public function testDemo0(): void
 
 		// check redirection
 		$response = $this->get('/demo');
-		$response->assertStatus(302);
+		$this->assertStatus($response, 302);
 		$response->assertRedirect('/');
 
 		// set back to initial value
@@ -54,7 +54,7 @@ public function testDemo1()
 
 		// check redirection
 		$response = $this->get('/demo');
-		$response->assertOk();
+		$this->assertOk($response);
 		$response->assertViewIs('demo');
 
 		// set back to initial value

diff --git a/tests/Feature/DiagnosticsTest.php b/tests/Feature/DiagnosticsTest.php
@@ -27,20 +27,20 @@ class DiagnosticsTest extends TestCase
 	public function testDiagnostics(): void
 	{
 		$response = $this->get('/Diagnostics');
-		$response->assertOk(); // code 200 something
+		$this->assertOk($response); // code 200 something
 
 		Auth::loginUsingId(0);
 
 		$response = $this->get('/Diagnostics');
-		$response->assertOk(); // code 200 something
+		$this->assertOk($response); // code 200 something
 
 		Configs::query()->where('key', '=', 'lossless_optimization')->update(['value' => null]);
 
 		$response = $this->postJson('/api/Diagnostics::get');
-		$response->assertOk(); // code 200 something too
+		$this->assertOk($response); // code 200 something too
 
 		$response = $this->postJson('/api/Diagnostics::getSize');
-		$response->assertOk(); // code 200 something too
+		$this->assertOk($response); // code 200 something too
 
 		Configs::query()->where('key', '=', 'lossless_optimization')->update(['value' => '1']);
 

diff --git a/tests/Feature/IndexTest.php b/tests/Feature/IndexTest.php
@@ -30,10 +30,10 @@ public function testHome(): void
 		 * check if we can actually get a nice answer.
 		 */
 		$response = $this->get('/');
-		$response->assertOk();
+		$this->assertOk($response);
 
 		$response = $this->postJson('/api/Albums::get');
-		$response->assertOk();
+		$this->assertOk($response);
 	}
 
 	/**
@@ -47,7 +47,7 @@ public function testPhpInfo(): void
 		Session::flush();
 		// we don't want a non admin to access this
 		$response = $this->get('/phpinfo');
-		$response->assertForbidden();
+		$this->assertForbidden($response);
 	}
 
 	public function testLandingPage(): void
@@ -56,11 +56,11 @@ public function testLandingPage(): void
 		Configs::set('landing_page_enable', 1);
 
 		$response = $this->get('/');
-		$response->assertOk();
+		$this->assertOk($response);
 		$response->assertViewIs('landing');
 
 		$response = $this->get('/gallery');
-		$response->assertOk();
+		$this->assertOk($response);
 
 		Configs::set('landing_page_enable', $landing_on_off);
 	}

diff --git a/tests/Feature/InstallTest.php b/tests/Feature/InstallTest.php
@@ -36,7 +36,7 @@ public function testInstall(): void
 		$prevAppKey = config('app.key');
 		config(['app.key' => null]);
 		$response = $this->get('install/');
-		$response->assertOk();
+		$this->assertOk($response);
 		config(['app.key' => $prevAppKey]);
 
 		// TODO: Why does a `git pull` delete `installed.log`? This test needs to be discussed with @ildyria
@@ -47,7 +47,7 @@ public function testInstall(): void
 		 * No installed.log: we should not be redirected to install (case where we have not done the last migration).
 		 */
 		$response = $this->get('/');
-		$response->assertOk();
+		$this->assertOk($response);
 
 		/*
 		 * Clearing things up. We could do an Artisan migrate but this is more efficient.
@@ -88,35 +88,35 @@ public function testInstall(): void
 		 * No database: we should be redirected to install: default case.
 		 */
 		$response = $this->get('/');
-		$response->assertStatus(307);
+		$this->assertStatus($response, 307);
 		$response->assertRedirect('install/');
 
 		/**
 		 * Check the welcome page.
 		 */
 		$response = $this->get('install/');
-		$response->assertOk();
+		$this->assertOk($response);
 		$response->assertViewIs('install.welcome');
 
 		/**
 		 * Check the requirements page.
 		 */
 		$response = $this->get('install/req');
-		$response->assertOk();
+		$this->assertOk($response);
 		$response->assertViewIs('install.requirements');
 
 		/**
 		 * Check the permissions page.
 		 */
 		$response = $this->get('install/perm');
-		$response->assertOk();
+		$this->assertOk($response);
 		$response->assertViewIs('install.permissions');
 
 		/**
 		 * Check the env page.
 		 */
 		$response = $this->get('install/env');
-		$response->assertOk();
+		$this->assertOk($response);
 		$response->assertViewIs('install.env');
 
 		$env = file_get_contents(base_path('.env'));
@@ -125,28 +125,28 @@ public function testInstall(): void
 		 * POST '.env' the env page.
 		 */
 		$response = $this->post('install/env', ['envConfig' => $env]);
-		$response->assertOk();
+		$this->assertOk($response);
 		$response->assertViewIs('install.env');
 
 		/**
 		 * apply migration.
 		 */
 		$response = $this->get('install/migrate');
-		$response->assertOk();
+		$this->assertOk($response);
 		$response->assertViewIs('install.migrate');
 
 		/**
 		 * Re-Installation should be forbidden now.
 		 */
 		$response = $this->get('install/');
-		$response->assertForbidden();
+		$this->assertForbidden($response);
 
 		/**
 		 * We now should NOT be redirected.
 		 */
 		Configs::invalidateCache();
 		$response = $this->get('/');
-		$response->assertOk();
+		$this->assertOk($response);
 
 		$admin->save();
 		$admin->id = 0;