Merge branch 'develop' into feature/exception-tests

tests/Unit/Http/Controllers/Server/Files/RemoteRequestControllerTest.php

@@ -79,7 +79,7 @@ class RemoteRequestControllerTest extends ControllerTestCase
     }
 
     /**
-     * Test that the controller properly handles an exception thrown by the daemon conneciton.
+     * Test that the controller properly handles an exception thrown by the daemon connection.
      */
     public function testExceptionThrownByDaemonConnectionIsHandledByDisplayController()
     {
@@ -125,7 +125,7 @@ class RemoteRequestControllerTest extends ControllerTestCase
     }
 
     /**
-     * Test that the controller properly handles an exception thrown by the daemon conneciton.
+     * Test that the controller properly handles an exception thrown by the daemon connection.
      */
     public function testExceptionThrownByDaemonConnectionIsHandledByStoreController()
     {

tests/Unit/Http/Middleware/API/AuthenticateIPAccessTest.php

@@ -36,7 +36,7 @@ class AuthenticateIPAccessTest extends MiddlewareTestCase
     /**
      * Test that a CIDR range can be used.
      */
-    public function testValidIPAganistCIDRRange()
+    public function testValidIPAgainstCIDRRange()
     {
         $model = factory(ApiKey::class)->make(['allowed_ips' => '["192.168.1.1/28"]']);
         $this->setRequestAttribute('api_key', $model);

tests/Unit/Http/Middleware/API/AuthenticateKeyTest.php

@@ -59,7 +59,7 @@ class AuthenticateKeyTest extends MiddlewareTestCase
     }
 
     /**
-     * Test that an invalid API identifer throws an exception.
+     * Test that an invalid API identifier throws an exception.
      *
      * @expectedException \Symfony\Component\HttpKernel\Exception\AccessDeniedHttpException
      */