Changeset 8460

Timestamp:

04/15/08 01:17:55 (5 months ago)

Author:

fabien

Message:

cleanup format functional tests to have a better example on how to customize them

Files:

• branches/1.1/test/functional/fixtures/project/apps/frontend/config/frontendConfiguration.class.php (modified) (1 diff)
• branches/1.1/test/functional/fixtures/project/apps/frontend/modules/format/actions/actions.class.php (modified) (2 diffs)
• branches/1.1/test/functional/formatTest.php (modified) (2 diffs)

branches/1.1/test/functional/fixtures/project/apps/frontend/config/frontendConfiguration.class.php

@@ -5 +5 @@
-  public function configure()
-  {
+    $this->dispatcher->connect('view.configure_format', 'configure_format_foo');
+    $this->dispatcher->connect('request.filter_parameters', 'filter_parameters');
+    $this->dispatcher->connect('view.configure_format', 'configure_iphone_format');
-  }
-}

branches/1.1/test/functional/fixtures/project/apps/frontend/modules/format/actions/actions.class.php

@@ -11 +11 @@
-class formatActions extends sfActions
-{
-  static protected $registered = false;
-
-  public function executeIndex($request)
-  {
-    if (!self::$registered)
-    {
-      // in real code, register view.configure_format events in ProjectConfiguration or XXXApplicationConfiguration, not here!
-      self::$registered = true;
-      $this->getContext()->getEventDispatcher()->connect('view.configure_format', array($this, 'configureFormat'));
-    }
-
-    if ('xml' == $request->getRequestFormat())
-    {
@@ -42 +33 @@
-    $this->setTemplate('index');
-  }
-
-  public function configureFormat(sfEvent $event)
-  {
-    if ('foo' != $event['format'])
-    {
-      return;
-    }
-
-    $event['response']->setHttpHeader('x-foo', 'true');
-    $event->getSubject()->setExtension('.php');
-  }
-}

branches/1.1/test/functional/formatTest.php

@@ -84 +84 @@
-$b->test()->is($b->getResponse()->getContent(), 'A js file', 'response content is ok');
-
-$b->getContext()->getEventDispatcher()->connect('request.filter_parameters', 'filter_parameters');
-$b->getContext()->getEventDispatcher()->connect('view.configure_format', 'configure_iphone_format');
-$b->
-  setHttpHeader('User-Agent', 'Mozilla/5.0 (iPhone; U; CPU like Mac OS X; en) AppleWebKit/420+ (KHTML, like Gecko) Version/3.0 Mobile/1A543a Safari/419.3')->
@@ -116 +114 @@
-  }
-}
+
+function configure_format_foo(sfEvent $event)
+{
+  if ('foo' != $event['format'])
+  {
+    return;
+  }
+
+  $event['response']->setHttpHeader('x-foo', 'true');
+  $event->getSubject()->setExtension('.php');
+}