PSR-2 to tests

santigarcor · Aug 27, 2017 · 3ba32b5 · 3ba32b5
1 parent 1712082
commit 3ba32b5
Show file tree

Hide file tree

Showing 9 changed files with 92 additions and 85 deletions.
diff --git a/tests/LaratrustRoleTest.php b/tests/LaratrustRoleTest.php
@@ -1,6 +1,5 @@
 <?php
 
-use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\SoftDeletes;
 use Illuminate\Support\Facades\Cache;
 use Illuminate\Support\Facades\Config;

diff --git a/tests/LaratrustTest.php b/tests/LaratrustTest.php
@@ -1,7 +1,6 @@
 <?php
 
 use Laratrust\Laratrust;
-use Illuminate\Support\Facades\Facade;
 use Mockery as m;
 
 class LaratrustTest extends PHPUnit_Framework_TestCase

diff --git a/tests/LaratrustUserAbilityTest.php b/tests/LaratrustUserAbilityTest.php
@@ -1,17 +1,11 @@
 <?php
 
-use Laratrust\Contracts\LaratrustUserInterface;
-use Laratrust\Traits\LaratrustUserTrait;
-use Illuminate\Cache\ArrayStore;
-use Illuminate\Database\Eloquent\Model;
-use Illuminate\Support\Facades\Config;
-use Illuminate\Support\Facades\Cache;
 use Laratrust\Permission;
 use Laratrust\Role;
 use Mockery as m;
 
-class LaratrustUserAbilityTest extends UserTest {
-
+class LaratrustUserAbilityTest extends UserTest
+{
     protected $permissions;
     protected $roles;
     protected $user;
@@ -389,4 +383,4 @@ function isExceptionThrown(
         $this->assertTrue(isExceptionThrown($user, ['RoleA'], ['manage_a'], ['return_type' => 'potato']));
         $this->assertTrue(isExceptionThrown($user, ['RoleA'], ['manage_a'], ['validate_all' => 'potato']));
     }
-}
+}
diff --git a/tests/LaratrustUserTest.php b/tests/LaratrustUserTest.php
@@ -299,7 +299,7 @@ public function testHasPermissionWithPlaceholderSupport()
         | Expectation
         |------------------------------------------------------------
         */
-       Config::shouldReceive('get')->with('laratrust.use_teams')->times(18)->andReturn(true)->ordered();
+        Config::shouldReceive('get')->with('laratrust.use_teams')->times(18)->andReturn(true)->ordered();
         $role->shouldReceive('cachedPermissions')->times(6)->andReturn($role->perms);
         Config::shouldReceive('get')->with('cache.ttl', 60)->times(16)->andReturn('1440');
         Config::shouldReceive('get')->with('laratrust.teams_strict_check')->times(16)->andReturn(false);
@@ -431,7 +431,6 @@ public function testAttachRole()
         // Not using teams
         $this->assertInstanceOf('HasRoleUser', $user->attachRole($role));
         $this->assertInstanceOf('HasRoleUser', $user->attachRole($role, 'TeamA'));
-
     }
 
     public function testDetachRole()
@@ -792,7 +791,7 @@ public function testDetachPermissions()
         | Assertion
         |------------------------------------------------------------
         */
-        $this->assertInstanceOf('HasRoleUser', $user->detachPermissions( [1, 2, 3]));
+        $this->assertInstanceOf('HasRoleUser', $user->detachPermissions([1, 2, 3]));
         $this->assertInstanceOf('HasRoleUser', $user->detachPermissions([]));
         $this->assertInstanceOf('HasRoleUser', $user->detachPermissions([1, 2, 3], 'TeamA'));
     }
@@ -1145,7 +1144,8 @@ public function getKey()
         return $this->id;
     }
 
-    public function publicMagicCan($method) {
+    public function publicMagicCan($method)
+    {
         return $this->handleMagicCan($method, []);
     }
 }

diff --git a/tests/Middleware/MiddlewareLaratrustAbilityTest.php b/tests/Middleware/MiddlewareLaratrustAbilityTest.php
@@ -36,7 +36,8 @@ public function testHandle_IsGuestWithNoAbility_ShouldAbort403()
         | Assertion
         |------------------------------------------------------------
         */
-        $middleware->handle($request, function () {}, 'admin|user', 'edit-users|update-users');
+        $middleware->handle($request, function () {
+        }, 'admin|user', 'edit-users|update-users');
         $this->assertAbortCode(403);
     }
 
@@ -76,13 +77,16 @@ public function testHandle_IsLoggedInWithNoAbility_ShouldAbort403()
         | Assertion
         |------------------------------------------------------------
         */
-        $middleware->handle($request, function () {}, 'admin|user', 'edit-users|update-users');
+        $middleware->handle($request, function () {
+        }, 'admin|user', 'edit-users|update-users');
         $this->assertAbortCode(403);
 
-        $middleware->handle($request, function () {}, 'admin|user', 'edit-users|update-users', 'require_all');
+        $middleware->handle($request, function () {
+        }, 'admin|user', 'edit-users|update-users', 'require_all');
         $this->assertAbortCode(403);
 
-        $middleware->handle($request, function () {}, 'admin|user', 'edit-users|update-users', 'TeamA', 'require_all');
+        $middleware->handle($request, function () {
+        }, 'admin|user', 'edit-users|update-users', 'TeamA', 'require_all');
         $this->assertAbortCode(403);
     }
 
@@ -119,13 +123,16 @@ public function testHandle_IsLoggedInWithAbility_ShouldNotAbort()
         |------------------------------------------------------------
         */
         $this->assertDidNotAbort();
-        $middleware->handle($request, function () {}, 'admin|user', 'edit-users|update-users');
+        $middleware->handle($request, function () {
+        }, 'admin|user', 'edit-users|update-users');
         $this->assertDidNotAbort();
 
-        $middleware->handle($request, function () {}, 'admin|user', 'edit-users|update-users', 'require_all');
+        $middleware->handle($request, function () {
+        }, 'admin|user', 'edit-users|update-users', 'require_all');
         $this->assertDidNotAbort();
 
-        $middleware->handle($request, function () {}, 'admin|user', 'edit-users|update-users', 'TeamA', 'require_all');
+        $middleware->handle($request, function () {
+        }, 'admin|user', 'edit-users|update-users', 'TeamA', 'require_all');
         $this->assertDidNotAbort();
     }
 

diff --git a/tests/Middleware/MiddlewareLaratrustPermissionTest.php b/tests/Middleware/MiddlewareLaratrustPermissionTest.php
@@ -36,7 +36,8 @@ public function testHandle_IsGuestWithNoPermission_ShouldAbort403()
         | Assertion
         |------------------------------------------------------------
         */
-        $middleware->handle($request, function () {}, 'users-create|users-update');
+        $middleware->handle($request, function () {
+        }, 'users-create|users-update');
         $this->assertAbortCode(403);
     }
 
@@ -75,13 +76,16 @@ public function testHandle_IsLoggedInWithNoPermission_ShouldAbort403()
         | Assertion
         |------------------------------------------------------------
         */
-        $middleware->handle($request, function () {}, 'users-create|users-update');
+        $middleware->handle($request, function () {
+        }, 'users-create|users-update');
         $this->assertAbortCode(403);
 
-        $middleware->handle($request, function () {}, 'users-create|users-update', 'require_all');
+        $middleware->handle($request, function () {
+        }, 'users-create|users-update', 'require_all');
         $this->assertAbortCode(403);
 
-        $middleware->handle($request, function () {}, 'users-create|users-update', 'TeamA', 'require_all');
+        $middleware->handle($request, function () {
+        }, 'users-create|users-update', 'TeamA', 'require_all');
         $this->assertAbortCode(403);
     }
 
@@ -117,13 +121,16 @@ public function testHandle_IsLoggedInWithPermission_ShouldNotAbort()
         |------------------------------------------------------------
         */
         $this->assertDidNotAbort();
-        $middleware->handle($request, function () {}, 'users-create|users-update');
+        $middleware->handle($request, function () {
+        }, 'users-create|users-update');
         $this->assertDidNotAbort();
 
-        $middleware->handle($request, function () {}, 'users-create|users-update', 'require_all');
+        $middleware->handle($request, function () {
+        }, 'users-create|users-update', 'require_all');
         $this->assertDidNotAbort();
 
-        $middleware->handle($request, function () {}, 'users-create|users-update', 'TeamA', 'require_all');
+        $middleware->handle($request, function () {
+        }, 'users-create|users-update', 'TeamA', 'require_all');
         $this->assertDidNotAbort();
     }
 }
diff --git a/tests/Middleware/MiddlewareLaratrustRoleTest.php b/tests/Middleware/MiddlewareLaratrustRoleTest.php
@@ -36,7 +36,8 @@ public function testHandle_IsGuestWithMismatchingRole_ShouldAbort403()
         | Assertion
         |------------------------------------------------------------
         */
-        $middleware->handle($request, function () {}, 'admin|user');
+        $middleware->handle($request, function () {
+        }, 'admin|user');
         $this->assertAbortCode(403);
     }
 
@@ -75,13 +76,16 @@ public function testHandle_IsLoggedInWithMismatchRole_ShouldAbort403()
         | Assertion
         |------------------------------------------------------------
         */
-        $middleware->handle($request, function () {}, 'admin|user');
+        $middleware->handle($request, function () {
+        }, 'admin|user');
         $this->assertAbortCode(403);
 
-        $middleware->handle($request, function () {}, 'admin|user', 'require_all');
+        $middleware->handle($request, function () {
+        }, 'admin|user', 'require_all');
         $this->assertAbortCode(403);
 
-        $middleware->handle($request, function () {}, 'admin|user', 'TeamA', 'require_all');
+        $middleware->handle($request, function () {
+        }, 'admin|user', 'TeamA', 'require_all');
         $this->assertAbortCode(403);
     }
 
@@ -117,13 +121,16 @@ public function testHandle_IsLoggedInWithMatchingRole_ShouldNotAbort()
         |------------------------------------------------------------
         */
         $this->assertDidNotAbort();
-        $middleware->handle($request, function () {}, 'admin|user');
+        $middleware->handle($request, function () {
+        }, 'admin|user');
         $this->assertDidNotAbort();
 
-        $middleware->handle($request, function () {}, 'admin|user', 'require_all');
+        $middleware->handle($request, function () {
+        }, 'admin|user', 'require_all');
         $this->assertDidNotAbort();
 
-        $middleware->handle($request, function () {}, 'admin|user', 'TeamA', 'require_all');
+        $middleware->handle($request, function () {
+        }, 'admin|user', 'TeamA', 'require_all');
         $this->assertDidNotAbort();
     }
 }
diff --git a/tests/Middleware/MiddlewareTest.php b/tests/Middleware/MiddlewareTest.php
@@ -5,7 +5,7 @@
 
 abstract class MiddlewareTest extends PHPUnit_Framework_TestCase
 {
-	public static $abortCode = null;
+    public static $abortCode = null;
 
     public function setUp()
     {
@@ -19,26 +19,26 @@ public function setUp()
         Config::swap($this->facadeMocks['config']);
     }
 
-	public static function setupBeforeClass()
-	{
-		if (! function_exists('abort')) {
-		    /**
-		     * Mimicks Laravel5's abort() helper function.
-		     *
-		     * Instead of calling \Illuminate\Foundation\Application::abort(),
+    public static function setupBeforeClass()
+    {
+        if (! function_exists('abort')) {
+            /**
+             * Mimicks Laravel5's abort() helper function.
+             *
+             * Instead of calling \Illuminate\Foundation\Application::abort(),
              * this function keeps track of the last abort called,
              * so the abort can be retrieved for test assertions.
-		     *
-		     * @param  int     $code
-		     * @param  string  $message
-		     * @param  array   $headers
-		     * @return void
-		     */
-		    function abort($code, $message = '', array $headers = [])
-		    {
-		        MiddlewareTest::$abortCode = $code;
-		    }
-		}
+             *
+             * @param  int     $code
+             * @param  string  $message
+             * @param  array   $headers
+             * @return void
+             */
+            function abort($code, $message = '', array $headers = [])
+            {
+                MiddlewareTest::$abortCode = $code;
+            }
+        }
 
         if (! function_exists('redirect')) {
             /**
@@ -60,33 +60,33 @@ function redirect($to = null, $status = 302, $headers = [], $secure = null)
                 MiddlewareTest::$abortCode = $url;
             }
         }
-	}
+    }
 
-	public function tearDown()
-	{
-		parent::tearDown();
+    public function tearDown()
+    {
+        parent::tearDown();
 
         m::close();
 
-		// Reset the abort code every end of test case, 
-		// so the result of previous test case does not pollute the next one.
+        // Reset the abort code every end of test case,
+        // so the result of previous test case does not pollute the next one.
         static::$abortCode = null;
-	}
-
-	public function assertAbortCode($code)
-	{
-		return $this->assertEquals($code, $this->getAbortCode());
-	}
-
-	public function assertDidNotAbort()
-	{
-		return $this->assertEquals(null, $this->getAbortCode());
-	}
-
-	public function getAbortCode()
-	{
-		return static::$abortCode;
-	}
+    }
+
+    public function assertAbortCode($code)
+    {
+        return $this->assertEquals($code, $this->getAbortCode());
+    }
+
+    public function assertDidNotAbort()
+    {
+        return $this->assertEquals(null, $this->getAbortCode());
+    }
+
+    public function getAbortCode()
+    {
+        return static::$abortCode;
+    }
 
     protected function mockRequest()
     {

diff --git a/tests/UserTest.php b/tests/UserTest.php
@@ -1,18 +1,12 @@
 <?php
 
-use Laratrust\Contracts\LaratrustUserInterface;
-use Laratrust\Traits\LaratrustUserTrait;
-use Illuminate\Cache\ArrayStore;
-use Illuminate\Database\Eloquent\Model;
 use Illuminate\Support\Facades\Config;
 use Illuminate\Support\Facades\Cache;
-use Laratrust\Permission;
-use Laratrust\Role;
 use Mockery as m;
 
 abstract class UserTest extends PHPUnit_Framework_TestCase
 {
-    private $facadeMocks = array();
+    private $facadeMocks = [];
 
     public function setUp()
     {
@@ -72,4 +66,4 @@ protected function mockTeam($teamName)
 
         return $teamMock;
     }
-}
+}