From 0e1c3a76f42ba7853ea4c5a872281f49e8a2e531 Mon Sep 17 00:00:00 2001
From: Dane Everitt <dane@daneeveritt.com>
Date: Sat, 26 Feb 2022 11:49:59 -0500
Subject: [PATCH] Test cleanup

---
 app/Http/Kernel.php                           |  1 -
 app/Http/Middleware/LanguageMiddleware.php    | 35 -----------
 .../Unit/Http/Middleware/AuthenticateTest.php | 39 -------------
 .../Middleware/LanguageMiddlewareTest.php     | 58 -------------------
 .../RequireTwoFactorAuthenticationTest.php    |  5 +-
 5 files changed, 1 insertion(+), 137 deletions(-)
 delete mode 100644 app/Http/Middleware/LanguageMiddleware.php
 delete mode 100644 tests/Unit/Http/Middleware/AuthenticateTest.php
 delete mode 100644 tests/Unit/Http/Middleware/LanguageMiddlewareTest.php

diff --git a/app/Http/Kernel.php b/app/Http/Kernel.php
index fd3cf0b95..8dc7ff877 100644
--- a/app/Http/Kernel.php
+++ b/app/Http/Kernel.php
@@ -62,7 +62,6 @@ class Kernel extends HttpKernel
             ShareErrorsFromSession::class,
             VerifyCsrfToken::class,
             SubstituteBindings::class,
-            LanguageMiddleware::class,
             RequireTwoFactorAuthentication::class,
         ],
         'api' => [
diff --git a/app/Http/Middleware/LanguageMiddleware.php b/app/Http/Middleware/LanguageMiddleware.php
deleted file mode 100644
index 914d4395f..000000000
--- a/app/Http/Middleware/LanguageMiddleware.php
+++ /dev/null
@@ -1,35 +0,0 @@
-<?php
-
-namespace Pterodactyl\Http\Middleware;
-
-use Closure;
-use Illuminate\Http\Request;
-use Illuminate\Foundation\Application;
-
-class LanguageMiddleware
-{
-    /**
-     * @var \Illuminate\Foundation\Application
-     */
-    private $app;
-
-    /**
-     * LanguageMiddleware constructor.
-     */
-    public function __construct(Application $app)
-    {
-        $this->app = $app;
-    }
-
-    /**
-     * Handle an incoming request and set the user's preferred language.
-     *
-     * @return mixed
-     */
-    public function handle(Request $request, Closure $next)
-    {
-        $this->app->setLocale($request->user()->language ?? config('app.locale', 'en'));
-
-        return $next($request);
-    }
-}
diff --git a/tests/Unit/Http/Middleware/AuthenticateTest.php b/tests/Unit/Http/Middleware/AuthenticateTest.php
deleted file mode 100644
index 828afc122..000000000
--- a/tests/Unit/Http/Middleware/AuthenticateTest.php
+++ /dev/null
@@ -1,39 +0,0 @@
-<?php
-
-namespace Pterodactyl\Tests\Unit\Http\Middleware;
-
-use Illuminate\Auth\AuthenticationException;
-use Pterodactyl\Http\Middleware\Authenticate;
-
-class AuthenticateTest extends MiddlewareTestCase
-{
-    /**
-     * Test that a logged in user validates correctly.
-     */
-    public function testLoggedInUser()
-    {
-        $this->request->shouldReceive('user')->withNoArgs()->once()->andReturn(true);
-
-        $this->getMiddleware()->handle($this->request, $this->getClosureAssertions());
-    }
-
-    /**
-     * Test that a logged out user results in an exception.
-     */
-    public function testLoggedOutUser()
-    {
-        $this->expectException(AuthenticationException::class);
-
-        $this->request->shouldReceive('user')->withNoArgs()->once()->andReturnNull();
-
-        $this->getMiddleware()->handle($this->request, $this->getClosureAssertions());
-    }
-
-    /**
-     * Return an instance of the middleware using mocked dependencies.
-     */
-    private function getMiddleware(): Authenticate
-    {
-        return new Authenticate();
-    }
-}
diff --git a/tests/Unit/Http/Middleware/LanguageMiddlewareTest.php b/tests/Unit/Http/Middleware/LanguageMiddlewareTest.php
deleted file mode 100644
index 569ef417a..000000000
--- a/tests/Unit/Http/Middleware/LanguageMiddlewareTest.php
+++ /dev/null
@@ -1,58 +0,0 @@
-<?php
-
-namespace Pterodactyl\Tests\Unit\Http\Middleware;
-
-use Mockery as m;
-use Pterodactyl\Models\User;
-use Illuminate\Foundation\Application;
-use Pterodactyl\Http\Middleware\LanguageMiddleware;
-
-class LanguageMiddlewareTest extends MiddlewareTestCase
-{
-    /**
-     * @var \Illuminate\Foundation\Application|\Mockery\Mock
-     */
-    private $appMock;
-
-    /**
-     * Setup tests.
-     */
-    public function setUp(): void
-    {
-        parent::setUp();
-
-        $this->appMock = m::mock(Application::class);
-    }
-
-    /**
-     * Test that a language is defined via the middleware for guests.
-     */
-    public function testLanguageIsSetForGuest()
-    {
-        $this->request->shouldReceive('user')->withNoArgs()->andReturnNull();
-        $this->appMock->shouldReceive('setLocale')->with('en')->once()->andReturnNull();
-
-        $this->getMiddleware()->handle($this->request, $this->getClosureAssertions());
-    }
-
-    /**
-     * Test that a language is defined via the middleware for a user.
-     */
-    public function testLanguageIsSetWithAuthenticatedUser()
-    {
-        $user = User::factory()->make(['language' => 'de']);
-
-        $this->request->shouldReceive('user')->withNoArgs()->andReturn($user);
-        $this->appMock->shouldReceive('setLocale')->with('de')->once()->andReturnNull();
-
-        $this->getMiddleware()->handle($this->request, $this->getClosureAssertions());
-    }
-
-    /**
-     * Return an instance of the middleware using mocked dependencies.
-     */
-    private function getMiddleware(): LanguageMiddleware
-    {
-        return new LanguageMiddleware($this->appMock);
-    }
-}
diff --git a/tests/Unit/Http/Middleware/RequireTwoFactorAuthenticationTest.php b/tests/Unit/Http/Middleware/RequireTwoFactorAuthenticationTest.php
index 53ecb0e85..74e9f438e 100644
--- a/tests/Unit/Http/Middleware/RequireTwoFactorAuthenticationTest.php
+++ b/tests/Unit/Http/Middleware/RequireTwoFactorAuthenticationTest.php
@@ -2,7 +2,6 @@
 
 namespace Pterodactyl\Tests\Unit\Http\Middleware;
 
-use Mockery as m;
 use Pterodactyl\Models\User;
 use Pterodactyl\Models\SecurityKey;
 use Pterodactyl\Exceptions\Http\TwoFactorAuthRequiredException;
@@ -10,8 +9,6 @@ use Pterodactyl\Http\Middleware\RequireTwoFactorAuthentication;
 
 class RequireTwoFactorAuthenticationTest extends MiddlewareTestCase
 {
-    private $alerts;
-
     public function testNoRequirementUserWithout2fa()
     {
         // Disable the 2FA requirement
@@ -301,6 +298,6 @@ class RequireTwoFactorAuthenticationTest extends MiddlewareTestCase
 
     private function getMiddleware(): RequireTwoFactorAuthentication
     {
-        return new RequireTwoFactorAuthentication($this->alerts);
+        return new RequireTwoFactorAuthentication();
     }
 }