Changeset 3098

Timestamp:

12/19/06 23:09:30 (2 years ago)

Author:

fabien

Message:

fixed cache decoration in dev environment for non HTML contents (closes #1246)

Files:

• trunk/lib/filter/sfCacheFilter.class.php (modified) (1 diff)
• trunk/test/functional/cacheTest.php (modified) (2 diffs)
• trunk/test/functional/fixtures/project/apps/cache/modules/cache/actions/actions.class.php (modified) (1 diff)
• trunk/test/functional/fixtures/project/apps/cache/modules/cache/config/cache.yml (modified) (1 diff)
• trunk/test/functional/fixtures/project/apps/cache/modules/cache/templates/imageSuccess.php (added)
• trunk/test/functional/fixtures/project/apps/cache/templates/image.php (added)

trunk/lib/filter/sfCacheFilter.class.php

@@ -247 +247 @@
-    if ($retval && sfConfig::get('sf_web_debug'))
-    {
-
-
-
+
+
+
+
-    }
-

trunk/test/functional/cacheTest.php

@@ -17 +17 @@
-class myTestBrowser extends sfTestBrowser
-{
+  function checkResponseContent($content, $message)
+  {
+    $this->test()->ok($this->getResponse()->getContent() == $content, $message);
+
+    return $this;
+  }
+
-  function getMultiAction($parameter = null)
-  {
@@ -263 +270 @@
-}
-
-// test with sfFileCache class (default)
-$b = new myTestBrowser();
-$b->initialize();
+
+// non HTML cache
+$image = file_get_contents($sf_symfony_data_dir.'/web/sf/sf_default/images/icons/ok48.png');
+sfConfig::set('sf_web_debug', true);
+$b->
+  get('/cache/imageWithLayoutCacheWithLayout')->
+  isCached(true, true)->
+  checkResponseContent($image, 'image (with layout/page cache) in cache is not decorated when web_debug is on')->
+  get('/cache/imageWithLayoutCacheWithLayout')->
+  isCached(true, true)->
+  checkResponseContent($image, 'image (with layout/page cache) in cache is not decorated when web_debug is on')->
+  get('/cache/imageWithLayoutCacheNoLayout')->
+  isCached(true)->
+  checkResponseContent($image, 'image (with layout/action cache) in cache is not decorated when web_debug is on')->
+  get('/cache/imageWithLayoutCacheNoLayout')->
+  isCached(true)->
+  checkResponseContent($image, 'image (with layout/action cache) in cache is not decorated when web_debug is on')->
+  get('/cache/imageNoLayoutCacheWithLayout')->
+  isCached(true, true)->
+  checkResponseContent($image, 'image (no layout/page cache) in cache is not decorated when web_debug is on')->
+  get('/cache/imageNoLayoutCacheWithLayout')->
+  isCached(true, true)->
+  checkResponseContent($image, 'image (no layout/page cache) in cache is not decorated when web_debug is on')->
+  get('/cache/imageNoLayoutCacheNoLayout')->
+  isCached(true)->
+  checkResponseContent($image, 'image (no layout/action cache) in cache is not decorated when web_debug is on')->
+  get('/cache/imageNoLayoutCacheNoLayout')->
+  isCached(true)->
+  checkResponseContent($image, 'image (no layout/action cache) in cache is not decorated when web_debug is on')
+;
+sfConfig::set('sf_web_debug', false);
+
+// test with sfFileCache class (default)
-$b->launch();
-

trunk/test/functional/fixtures/project/apps/cache/modules/cache/actions/actions.class.php

@@ -47 +47 @@
-    sfConfig::set('ACTION_EXECUTED', true);
-  }
+
+  public function executeImageWithLayoutCacheWithLayout()
+  {
+    $this->prepareImage();
+    $this->setLayout('image');
+  }
+
+  public function executeImageWithLayoutCacheNoLayout()
+  {
+    $this->prepareImage();
+    $this->setLayout('image');
+  }
+
+  public function executeImageNoLayoutCacheWithLayout()
+  {
+    $this->prepareImage();
+    $this->setLayout(false);
+  }
+
+  public function executeImageNoLayoutCacheNoLayout()
+  {
+    $this->prepareImage();
+    $this->setLayout(false);
+  }
+
+  protected function prepareImage()
+  {
+    $this->getResponse()->setContentType('image/png');
+    $this->image = file_get_contents(sfConfig::get('sf_symfony_data_dir').'/web/sf/sf_default/images/icons/ok48.png');
+    $this->setTemplate('image');
+  }
-}

trunk/test/functional/fixtures/project/apps/cache/modules/cache/config/cache.yml

@@ -42 +42 @@
-page:
-  with_layout: true
+
+imageWithLayoutCacheWithLayout:
+  with_layout: true
+
+imageWithLayoutCacheNoLayout:
+  with_layout: false
+
+imageNoLayoutCacheWithLayout:
+  with_layout: true
+
+imageNoLayoutCacheNoLayout:
+  with_layout: false