Add tag_expressions functional test (ref #120)

Author: ddeboer

Resources/doc/reference/configuration/tags.rst

@@ -81,6 +81,6 @@ tag ``articles-123`` with the following configuration:
                     match:
                         path: ^/articles
                     tags: [articles]
-                    tag_expressions: ["article-"~id]
+                    tag_expressions: ["'article-'~id"]
 
 You can combine ``tags`` and ``tag_expression`` in one rule.

Tests/Functional/EventListener/CacheControlSubscriberTest.php

@@ -19,7 +19,7 @@ public function testIsCached()
     {
         $client = static::createClient();
 
-        $client->request('GET', '/cached');
+        $client->request('GET', '/cached/42');
         $response = $client->getResponse();
         $this->assertEquals('public', $response->headers->get('Cache-Control'));
     }

Tests/Functional/EventListener/TagSubscriberTest.php

@@ -63,9 +63,9 @@ public function testConfigurationTagsAreSet()
     {
         $client = static::createClient();
 
-        $client->request('GET', '/cached');
+        $client->request('GET', '/cached/51');
         $response = $client->getResponse();
-        $this->assertEquals('area', $response->headers->get('X-Cache-Tags'));
+        $this->assertEquals('area,area-51', $response->headers->get('X-Cache-Tags'));
     }
 
     public function testConfigurationTagsAreInvalidated()
@@ -76,11 +76,11 @@ public function testConfigurationTagsAreInvalidated()
             'fos_http_cache.cache_manager',
             '\FOS\HttpCacheBundle\CacheManager'
         )
-            ->shouldReceive('invalidateTags')->once()->with(array('area'))
+            ->shouldReceive('invalidateTags')->once()->with(array('area', 'area-51'))
             ->shouldReceive('flush')->once()
         ;
 
-        $client->request('POST', '/cached');
+        $client->request('PUT', '/cached/51');
     }
 
     protected function tearDown()

Tests/Functional/Fixtures/Controller/TestController.php

@@ -47,8 +47,8 @@ public function errorAction()
         return new Response('Forbidden', 403);
     }
 
-    public function contentAction()
+    public function contentAction($id = null)
     {
-        return new Response('content');
+        return new Response('content ' . $id);
     }
 }

Tests/Functional/Fixtures/app/config/config.yml

@@ -23,6 +23,7 @@ fos_http_cache:
         match:
           path: ^/cached
         tags: [area]
+        tag_expressions: ["'area-'~id"]
   user_context:
     user_identifier_headers:
       - Cookie

Tests/Functional/Fixtures/app/config/routing.yml

@@ -1,24 +1,25 @@
 test_list:
-  pattern:   /test/list
-  defaults:  { _controller: FOS\HttpCacheBundle\Tests\Functional\Fixtures\Controller\TestController::listAction }
+  pattern:  /test/list
+  defaults: { _controller: FOS\HttpCacheBundle\Tests\Functional\Fixtures\Controller\TestController::listAction }
   methods:  [GET]
 
 test_error:
-  pattern:   /test/error
-  defaults:  { _controller: FOS\HttpCacheBundle\Tests\Functional\Fixtures\Controller\TestController::errorAction }
+  pattern:  /test/error
+  defaults: { _controller: FOS\HttpCacheBundle\Tests\Functional\Fixtures\Controller\TestController::errorAction }
 
 test_one:
-  pattern:   /test/{id}
-  defaults:  { _controller: FOS\HttpCacheBundle\Tests\Functional\Fixtures\Controller\TestController::itemAction }
+  pattern:  /test/{id}
+  defaults: { _controller: FOS\HttpCacheBundle\Tests\Functional\Fixtures\Controller\TestController::itemAction }
   methods:  [GET,POST]
 
 test_cached:
-  pattern:  /cached
-  defaults:  { _controller: FOS\HttpCacheBundle\Tests\Functional\Fixtures\Controller\TestController::contentAction }
+  pattern:  /cached/{id}
+  defaults: { _controller: FOS\HttpCacheBundle\Tests\Functional\Fixtures\Controller\TestController::contentAction }
+  methods:  [GET,PUT]
 
 test_noncached:
   pattern:  /noncached
-  defaults:  { _controller: FOS\HttpCacheBundle\Tests\Functional\Fixtures\Controller\TestController::contentAction }
+  defaults: { _controller: FOS\HttpCacheBundle\Tests\Functional\Fixtures\Controller\TestController::contentAction }
 
 test_logout:
   pattern:  /secured_area/logout