Merge pull request #96 from FriendsOfSymfony/add-missing-tests

add some missing tests for the security context

Author: ddeboer

Tests/Unit/EventListener/UserContextSubscriberTest.php

@@ -22,6 +22,18 @@
 
 class UserContextSubscriberTest extends \PHPUnit_Framework_TestCase
 {
+    /**
+     * @expectedException \InvalidArgumentException
+     */
+    public function testMisconfiguration()
+    {
+        new UserContextSubscriber(
+            \Mockery::mock('\Symfony\Component\HttpFoundation\RequestMatcherInterface'),
+            \Mockery::mock('\FOS\HttpCache\UserContext\HashGenerator'),
+            array()
+        );
+    }
+
     public function testOnKernelRequest()
     {
         $request = new Request();
@@ -45,6 +57,23 @@ public function testOnKernelRequest()
         $this->assertEquals('max-age=0, no-cache, private', $response->headers->get('Cache-Control'));
     }
 
+    public function testOnKernelRequestNonMaster()
+    {
+        $request = new Request();
+        $request->setMethod('HEAD');
+
+        $requestMatcher = $this->getRequestMatcher($request, true);
+        $hashGenerator = \Mockery::mock('\FOS\HttpCache\UserContext\HashGenerator');
+        $hashGenerator->shouldReceive('generateHash')->never();
+
+        $userContextSubscriber = new UserContextSubscriber($requestMatcher, $hashGenerator, array('X-SessionId'), 'X-Hash');
+        $event = $this->getKernelRequestEvent($request, HttpKernelInterface::SUB_REQUEST);
+
+        $userContextSubscriber->onKernelRequest($event);
+
+        $this->assertNull($event->getResponse());
+    }
+
     public function testOnKernelRequestCached()
     {
         $request = new Request();
@@ -103,6 +132,23 @@ public function testOnKernelResponse()
         $this->assertContains('X-Hash', $event->getResponse()->headers->get('Vary'));
     }
 
+    public function testOnKernelResponseNotMaster()
+    {
+        $request = new Request();
+        $request->setMethod('HEAD');
+        $request->headers->set('X-Hash', 'hash');
+
+        $requestMatcher = $this->getRequestMatcher($request, false);
+        $hashGenerator = \Mockery::mock('\FOS\HttpCache\UserContext\HashGenerator');
+
+        $userContextSubscriber = new UserContextSubscriber($requestMatcher, $hashGenerator, array('X-SessionId'), 'X-Hash');
+        $event = $this->getKernelResponseEvent($request, null, HttpKernelInterface::SUB_REQUEST);
+
+        $userContextSubscriber->onKernelResponse($event);
+
+        $this->assertFalse($event->getResponse()->headers->has('Vary'));
+    }
+
     /**
      * If there is no hash in the request, vary on the user identifier.
      */
@@ -122,21 +168,21 @@ public function testOnKernelResponseNotCached()
         $this->assertEquals('X-SessionId', $event->getResponse()->headers->get('Vary'));
     }
 
-    protected function getKernelRequestEvent(Request $request)
+    protected function getKernelRequestEvent(Request $request, $type = HttpKernelInterface::MASTER_REQUEST)
     {
         return new GetResponseEvent(
             \Mockery::mock('\Symfony\Component\HttpKernel\HttpKernelInterface'),
             $request,
-            HttpKernelInterface::MASTER_REQUEST
+            $type
         );
     }
 
-    protected function getKernelResponseEvent(Request $request, Response $response = null)
+    protected function getKernelResponseEvent(Request $request, Response $response = null, $type = HttpKernelInterface::MASTER_REQUEST)
     {
         return new FilterResponseEvent(
             \Mockery::mock('\Symfony\Component\HttpKernel\HttpKernelInterface'),
             $request,
-            HttpKernelInterface::MASTER_REQUEST,
+            $type,
             $response ?: new Response()
         );
     }

Tests/Unit/UserContext/RoleProviderTest.php

@@ -50,4 +50,13 @@ public function testProviderWithoutToken()
 
         $this->assertEmpty($userContext->getParameters());
     }
+
+    /**
+     * @expectedException \Symfony\Component\Config\Definition\Exception\InvalidConfigurationException
+     */
+    public function testNotUnderFirewall()
+    {
+        $roleProvider = new RoleProvider();
+        $roleProvider->updateUserContext(new UserContext());
+    }
 }