Test coverage for rate limiting middleware.

Signed-off-by: Jason Lewis <jason.lewis1991@gmail.com>

Author: jasonlewis

src/Http/Middleware/RateLimit.php

@@ -151,7 +151,7 @@ protected function exceededRateLimit()
 	 * 
 	 * @return bool
 	 */
-	protected function isRequestAuthenticated()
+	protected function isAuthenticatedRequest()
 	{
 		if ( ! is_null($this->authenticatedRequest))
 		{
@@ -171,7 +171,7 @@ protected function prepareConfig($request)
 	{
 		$this->config = array_merge($this->config, $this->container->make('config')->get('api::rate_limiting'));
 
-		if ($this->isRequestAuthenticated())
+		if ($this->isAuthenticatedRequest())
 		{
 			$this->config = array_merge(['exceeded' => $this->config['exceeded']], $this->config['authenticated']);
 		}

tests/HttpMiddlewareRateLimitTest.php

@@ -25,8 +25,6 @@ public function setUp()
 
 		$this->container->shouldReceive('boot')->atLeast()->once();
 		$this->container->shouldReceive('make')->once()->with('dingo.api.auth')->andReturn($this->auth);
-
-		$this->auth->shouldReceive('check')->once()->andReturn(false);
 	}
 
 
@@ -40,6 +38,8 @@ public function testWrappedKernelIsHandledForInternalRequests()
 	{
 		$request = InternalRequest::create('/', 'GET');
 
+		$this->auth->shouldReceive('check')->once()->andReturn(false);
+
 		$this->container->shouldReceive('make')->once()->with('config')->andReturn(m::mock(['get' => []]));
 		$this->app->shouldReceive('handle')->once()->with($request, HttpKernelInterface::MASTER_REQUEST, true)->andReturn(new Response('test'));
 		$this->assertEquals('test', $this->middleware->handle($request)->getContent());
@@ -50,6 +50,8 @@ public function testWrappedKernelIsHandledForRequestsNotTargettingTheApi()
 	{
 		$request = Request::create('/', 'GET');
 
+		$this->auth->shouldReceive('check')->once()->andReturn(false);
+
 		$this->container->shouldReceive('make')->once()->with('config')->andReturn(m::mock(['get' => []]));
 		$this->container->shouldReceive('make')->once()->with('router')->andReturn($this->router);
 
@@ -64,6 +66,8 @@ public function testWrappedKernelIsHandledForRequestsWhereRateLimitingIsDisabled
 	{
 		$request = Request::create('/', 'GET');
 
+		$this->auth->shouldReceive('check')->once()->andReturn(false);
+
 		$this->container->shouldReceive('make')->once()->with('config')->andReturn(m::mock(['get' => ['unauthenticated' => ['limit' => 0]]]));
 		$this->container->shouldReceive('make')->once()->with('router')->andReturn($this->router);
 
@@ -74,17 +78,34 @@ public function testWrappedKernelIsHandledForRequestsWhereRateLimitingIsDisabled
 	}
 
 
+	public function testAuthenticatedConfigurationIsUsedForAuthenticatedRequest()
+	{
+		$request = Request::create('/', 'GET');
+
+		$this->auth->shouldReceive('check')->once()->andReturn(true);
+
+		$this->container->shouldReceive('make')->once()->with('config')->andReturn(m::mock(['get' => ['authenticated' => ['limit' => 0]]]));
+		$this->container->shouldReceive('make')->once()->with('router')->andReturn($this->router);
+
+		$this->router->shouldReceive('requestTargettingApi')->once()->with($request)->andReturn(true);
+
+		$this->app->shouldReceive('handle')->once()->with($request, HttpKernelInterface::MASTER_REQUEST, true)->andReturn(new Response('test'));
+		$this->assertEquals('test', $this->middleware->handle($request)->getContent());
+	}
+
+
 	public function testWrappedKernelIsHandledWhenRateLimitHasNotBeenExceeded()
 	{
 		$request = Request::create('/', 'GET');
 
+		$this->auth->shouldReceive('check')->once()->andReturn(false);
+
 		$this->container->shouldReceive('make')->once()->with('config')->andReturn(m::mock(['get' => ['unauthenticated' => ['limit' => 1, 'reset' => 1]]]));
 		$this->container->shouldReceive('make')->once()->with('router')->andReturn($this->router);
 		$this->container->shouldReceive('make')->once()->with('cache')->andReturn($this->cache);
 
 		$this->router->shouldReceive('requestTargettingApi')->once()->with($request)->andReturn(true);
 
-
 		$ip = $request->getClientIp();
 
 		$this->cache->shouldReceive('add')->once()->with('dingo:api:requests:'.$ip, 0, 1);
@@ -105,6 +126,8 @@ public function testForbiddenResponseIsReturnedWhenRateLimitIsExceeded()
 	{
 		$request = Request::create('/', 'GET');
 
+		$this->auth->shouldReceive('check')->once()->andReturn(false);
+
 		$this->container->shouldReceive('make')->once()->with('config')->andReturn(m::mock(['get' => ['unauthenticated' => ['limit' => 1, 'reset' => 1]]]));
 		$this->container->shouldReceive('make')->once()->with('router')->andReturn($this->router);
 		$this->container->shouldReceive('make')->once()->with('cache')->andReturn($this->cache);