From 759db2c70199ac7c9cdc3e0e870d50612de17561 Mon Sep 17 00:00:00 2001
From: Tim Nagel <tim@nagel.com.au>
Date: Fri, 6 Apr 2012 13:05:19 +1000
Subject: [PATCH 01/14] Skip tests when the ORM isn't installed

---
 Tests/Entity/CommentManagerTest.php | 4 ++++
 Tests/Entity/ThreadManagerTest.php  | 4 ++++
 Tests/Entity/VoteManagerTest.php    | 4 ++++
 3 files changed, 12 insertions(+)

diff --git a/Tests/Entity/CommentManagerTest.php b/Tests/Entity/CommentManagerTest.php
index 5616f120e..b7ae247be 100644
--- a/Tests/Entity/CommentManagerTest.php
+++ b/Tests/Entity/CommentManagerTest.php
@@ -29,6 +29,10 @@ class CommentManagerTest extends \PHPUnit_Framework_TestCase
 
     public function setUp()
     {
+        if (!class_exists('Doctrine\\ORM\\EntityManager')) {
+            $this->markTestSkipped('Doctrine ORM not installed');
+        }
+
         $this->dispatcher = $this->getMock('Symfony\Component\EventDispatcher\EventDispatcherInterface');
         $this->em = $this->getMockBuilder('Doctrine\ORM\EntityManager')
             ->disableOriginalConstructor()
diff --git a/Tests/Entity/ThreadManagerTest.php b/Tests/Entity/ThreadManagerTest.php
index 59edb06a3..032ba8405 100644
--- a/Tests/Entity/ThreadManagerTest.php
+++ b/Tests/Entity/ThreadManagerTest.php
@@ -28,6 +28,10 @@ class ThreadManagerTest extends \PHPUnit_Framework_TestCase
 
     public function setUp()
     {
+        if (!class_exists('Doctrine\\ORM\\EntityManager')) {
+            $this->markTestSkipped('Doctrine ORM not installed');
+        }
+
         $this->dispatcher = $this->getMock('Symfony\Component\EventDispatcher\EventDispatcherInterface');
         $this->em = $this->getMockBuilder('Doctrine\ORM\EntityManager')
             ->disableOriginalConstructor()
diff --git a/Tests/Entity/VoteManagerTest.php b/Tests/Entity/VoteManagerTest.php
index cd36b6c41..4cbc60c0d 100644
--- a/Tests/Entity/VoteManagerTest.php
+++ b/Tests/Entity/VoteManagerTest.php
@@ -28,6 +28,10 @@ class VoteManagerTest extends \PHPUnit_Framework_TestCase
 
     public function setUp()
     {
+        if (!class_exists('Doctrine\\ORM\\EntityManager')) {
+            $this->markTestSkipped('Doctrine ORM not installed');
+        }
+
         $this->dispatcher = $this->getMock('Symfony\Component\EventDispatcher\EventDispatcherInterface');
         $this->em = $this->getMockBuilder('Doctrine\ORM\EntityManager')
             ->disableOriginalConstructor()

From 30d1b6eee05df0bfe849f835eb9f9a8417178c5f Mon Sep 17 00:00:00 2001
From: Tim Nagel <tim@nagel.com.au>
Date: Fri, 6 Apr 2012 13:06:24 +1000
Subject: [PATCH 02/14] Added aksimet-bundle suggestion for the test suite

---
 composer.json | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/composer.json b/composer.json
index f1532985c..a4aa0ef81 100644
--- a/composer.json
+++ b/composer.json
@@ -30,7 +30,8 @@
     },
     "suggest": {
         "doctrine/orm": "2.2.*",
-        "friendsofsymfony/user-bundle": "*"
+        "friendsofsymfony/user-bundle": "*",
+        "ornicar/akismet-bundle": "*"
     },
     "autoload": {
         "psr-0": { "FOS\\CommentBundle": "" }

From 4b8867d5ddf81658cb571d725d2c8e4e3cd5bd4c Mon Sep 17 00:00:00 2001
From: Tim Nagel <tim@nagel.com.au>
Date: Fri, 6 Apr 2012 13:07:38 +1000
Subject: [PATCH 03/14] Added composer.phar to ignore

---
 .gitignore | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.gitignore b/.gitignore
index 6730d3983..c2f20c621 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,4 @@
 phpunit.xml
 Tests/autoload.php
-
+composer.phar
 vendor/*

From b3bc1e31f75b4e07eb663ee3513c68b3de466014 Mon Sep 17 00:00:00 2001
From: Tim Nagel <tim@nagel.com.au>
Date: Fri, 6 Apr 2012 16:52:32 +1000
Subject: [PATCH 04/14] Added Behat and Mink

---
 Features/Context/FeatureContext.php        | 65 ++++++++++++++++++++++
 Tests/Functional/SymfonyDriver.php         | 19 +++++++
 Tests/Functional/app/Basic/bundles.php     | 28 ++++++----
 Tests/Functional/app/Behat/bundles.php     | 32 +++++++++++
 Tests/Functional/app/Behat/config.yml      | 20 +++++++
 Tests/Functional/app/Behat/nginx.conf.dist | 50 +++++++++++++++++
 Tests/Functional/app/Behat/routing.yml     |  7 +++
 Tests/Functional/app/console               | 14 +++++
 Tests/Functional/web/app.php               | 21 +++++++
 composer.json                              |  4 +-
 10 files changed, 247 insertions(+), 13 deletions(-)
 create mode 100644 Features/Context/FeatureContext.php
 create mode 100644 Tests/Functional/SymfonyDriver.php
 create mode 100644 Tests/Functional/app/Behat/bundles.php
 create mode 100644 Tests/Functional/app/Behat/config.yml
 create mode 100644 Tests/Functional/app/Behat/nginx.conf.dist
 create mode 100644 Tests/Functional/app/Behat/routing.yml
 create mode 100644 Tests/Functional/app/console
 create mode 100644 Tests/Functional/web/app.php

diff --git a/Features/Context/FeatureContext.php b/Features/Context/FeatureContext.php
new file mode 100644
index 000000000..9fbc40cfc
--- /dev/null
+++ b/Features/Context/FeatureContext.php
@@ -0,0 +1,65 @@
+<?php
+
+namespace FOS\CommentBundle\Features\Context;
+
+use Behat\BehatBundle\Context\MinkContext;
+use Behat\Behat\Exception\PendingException;
+use Symfony\Component\HttpKernel\HttpKernelInterface;
+
+/**
+ * Feature context.
+ */
+class FeatureContext extends MinkContext
+{
+    /**
+     * @Given /^I have a thread identified by "([^"]*)" with a link of "([^"]*)"$/
+     */
+    public function iHaveAThreadIdentifiedBy($id, $link)
+    {
+        $thread = $this->getThreadManager()->createThread($id);
+        $thread->setPermalink($link);
+
+        $this->getThreadManager()->saveThread($thread);
+    }
+
+
+    /**
+     * @When /^I go to "([^"]*)"$/
+     */
+    public function iGoTo($url)
+    {
+        $this->visit($url);
+    }
+
+    /**
+     * @When /^I go to "([^"]*)" as "([^"]*)" identified by "([^"]*)"$/
+     */
+    public function iGoToAsIdentifiedBy($url)
+    {
+        throw new PendingException;
+    }
+
+    /**
+     * @Then /^I should see a thread with the identifier of "([^"]*)"$/
+     */
+    public function iShouldSeeAThreadWithTheIdentifierOf($argument1)
+    {
+        throw new PendingException();
+    }
+
+    /**
+     * @Then /^I should see a thread with the identifier to "([^"]*)"$/
+     */
+    public function iShouldSeeAThreadWithTheIdentifierTo($argument1)
+    {
+        throw new PendingException();
+    }
+
+    /**
+     * @return \FOS\CommentBundle\Model\ThreadManagerInterface
+     */
+    private function getThreadManager()
+    {
+        return $this->getContainer()->get('fos_comment.manager.thread');
+    }
+}
\ No newline at end of file
diff --git a/Tests/Functional/SymfonyDriver.php b/Tests/Functional/SymfonyDriver.php
new file mode 100644
index 000000000..588b402df
--- /dev/null
+++ b/Tests/Functional/SymfonyDriver.php
@@ -0,0 +1,19 @@
+<?php
+
+namespace FOS\CommentBundle\Tests\Functional;
+
+use Behat\MinkBundle\Driver\SymfonyDriver as BaseSymfonyDriver;
+use Symfony\Component\BrowserKit\Client;
+
+class SymfonyDriver extends BaseSymfonyDriver
+{
+    public function __construct(Client $client = null)
+    {
+        $class  = get_class($client->getKernel());
+        $kernel = new $class('Behat', 'config.yml', $client->getKernel()->getEnvironment(), $client->getKernel()->isDebug());
+        $kernel->boot();
+
+        $this->client = $kernel->getContainer()->get('test.client');
+        $this->client->followRedirects(true);
+    }
+}
\ No newline at end of file
diff --git a/Tests/Functional/app/Basic/bundles.php b/Tests/Functional/app/Basic/bundles.php
index af465f775..0a7d02eab 100644
--- a/Tests/Functional/app/Basic/bundles.php
+++ b/Tests/Functional/app/Basic/bundles.php
@@ -10,16 +10,20 @@
  */
 
 return array(
-    new \Symfony\Bundle\FrameworkBundle\FrameworkBundle(),
-    new \Symfony\Bundle\TwigBundle\TwigBundle(),
-    new \Symfony\Bundle\SecurityBundle\SecurityBundle(),
-    new \Sensio\Bundle\FrameworkExtraBundle\SensioFrameworkExtraBundle(),
-    new \Doctrine\Bundle\DoctrineBundle\DoctrineBundle(),
-    new \Symfony\Bundle\AsseticBundle\AsseticBundle(),
-
-    new \FOS\RestBundle\FOSRestBundle(),
-    new \FOS\CommentBundle\FOSCommentBundle(),
-    new \JMS\SerializerBundle\JMSSerializerBundle($this),
-
-    new \FOS\CommentBundle\Tests\Functional\Bundle\CommentBundle\CommentBundle(),
+    new Symfony\Bundle\FrameworkBundle\FrameworkBundle(),
+
+    new Symfony\Bundle\AsseticBundle\AsseticBundle(),
+    new Symfony\Bundle\SecurityBundle\SecurityBundle(),
+    new Symfony\Bundle\TwigBundle\TwigBundle(),
+
+    new Doctrine\Bundle\DoctrineBundle\DoctrineBundle(),
+
+    new FOS\RestBundle\FOSRestBundle(),
+    new FOS\CommentBundle\FOSCommentBundle(),
+
+    new JMS\SerializerBundle\JMSSerializerBundle($this),
+
+    new Sensio\Bundle\FrameworkExtraBundle\SensioFrameworkExtraBundle(),
+
+    new FOS\CommentBundle\Tests\Functional\Bundle\CommentBundle\CommentBundle(),
 );
diff --git a/Tests/Functional/app/Behat/bundles.php b/Tests/Functional/app/Behat/bundles.php
new file mode 100644
index 000000000..f1e3f40f1
--- /dev/null
+++ b/Tests/Functional/app/Behat/bundles.php
@@ -0,0 +1,32 @@
+<?php
+
+/**
+ * This file is part of the FOSCommentBundle package.
+ *
+ * (c) FriendsOfSymfony <http://friendsofsymfony.github.com/>
+ *
+ * This source file is subject to the MIT license that is bundled
+ * with this source code in the file LICENSE.
+ */
+
+return array(
+    new Symfony\Bundle\FrameworkBundle\FrameworkBundle(),
+
+    new Symfony\Bundle\AsseticBundle\AsseticBundle(),
+    new Symfony\Bundle\SecurityBundle\SecurityBundle(),
+    new Symfony\Bundle\TwigBundle\TwigBundle(),
+
+    new Behat\BehatBundle\BehatBundle(),
+    new Behat\MinkBundle\MinkBundle(),
+
+    new Doctrine\Bundle\DoctrineBundle\DoctrineBundle(),
+
+    new FOS\RestBundle\FOSRestBundle(),
+    new FOS\CommentBundle\FOSCommentBundle(),
+
+    new JMS\SerializerBundle\JMSSerializerBundle($this),
+
+    new Sensio\Bundle\FrameworkExtraBundle\SensioFrameworkExtraBundle(),
+
+    new FOS\CommentBundle\Tests\Functional\Bundle\CommentBundle\CommentBundle(),
+);
diff --git a/Tests/Functional/app/Behat/config.yml b/Tests/Functional/app/Behat/config.yml
new file mode 100644
index 000000000..b09268bac
--- /dev/null
+++ b/Tests/Functional/app/Behat/config.yml
@@ -0,0 +1,20 @@
+imports:
+    - { resource: ./../config/default.yml }
+
+fos_comment:
+    db_driver: orm
+    class:
+        model:
+            comment: FOS\CommentBundle\Tests\Functional\Bundle\CommentBundle\Entity\Comment
+            thread: FOS\CommentBundle\Tests\Functional\Bundle\CommentBundle\Entity\Thread
+            vote: FOS\CommentBundle\Tests\Functional\Bundle\CommentBundle\Entity\Vote
+
+mink:
+    base_url: http://127.0.0.1:8080/
+    default_session: zombie
+    javascript_session: zombie
+    zombie: ~
+    show_cmd: open %s
+
+parameters:
+    behat.mink.driver.symfony.class: FOS\CommentBundle\Tests\Functional\SymfonyDriver
\ No newline at end of file
diff --git a/Tests/Functional/app/Behat/nginx.conf.dist b/Tests/Functional/app/Behat/nginx.conf.dist
new file mode 100644
index 000000000..74ae556f9
--- /dev/null
+++ b/Tests/Functional/app/Behat/nginx.conf.dist
@@ -0,0 +1,50 @@
+events {
+    worker_connections 1024;
+}
+
+http {
+    include /etc/nginx/mime.types;
+
+    keepalive_timeout  65;
+
+    fastcgi_connect_timeout 60;
+    fastcgi_send_timeout 180;
+    fastcgi_read_timeout 180;
+    fastcgi_buffer_size 32k;
+    fastcgi_buffers 16 16k;
+    fastcgi_intercept_errors on;
+
+    upstream php {
+        server 127.0.0.1:9000;
+    }
+
+    access_log logs/access.log;
+    error_log logs/error.log debug;
+
+    server {
+        listen 8080 default_server;
+        server_name .localhost;
+
+        charset utf-8;
+
+        root Functional/web;
+
+        location / {
+                index app.php;
+                try_files $uri @rewriteapp;
+        }
+
+        location @rewriteapp {
+                rewrite ^(.*)$ /app.php/$1 last;
+        }
+
+        location ~^/app\.php(/|$) {
+                fastcgi_split_path_info ^(.+\.php)(.*)$;
+                fastcgi_pass php;
+                include /usr/local/etc/nginx/fastcgi_params;
+                fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name;
+                fastcgi_param HTTPS off;
+                fastcgi_param ENVIRONMENT 'test';
+        }
+    }
+}
diff --git a/Tests/Functional/app/Behat/routing.yml b/Tests/Functional/app/Behat/routing.yml
new file mode 100644
index 000000000..1b999730c
--- /dev/null
+++ b/Tests/Functional/app/Behat/routing.yml
@@ -0,0 +1,7 @@
+_commenttest:
+    resource: "@CommentBundle/Resources/config/routing.yml"
+
+FOSComentBundle:
+    resource: "@FOSCommentBundle/Resources/config/routing.yml"
+    type: rest
+    prefix: /comment_api
\ No newline at end of file
diff --git a/Tests/Functional/app/console b/Tests/Functional/app/console
new file mode 100644
index 000000000..801e148c5
--- /dev/null
+++ b/Tests/Functional/app/console
@@ -0,0 +1,14 @@
+#!/usr/bin/env php
+<?php
+
+set_time_limit(0);
+
+require_once __DIR__.'/AppKernel.php';
+
+use Symfony\Bundle\FrameworkBundle\Console\Application;
+
+use FOS\CommentBundle\Tests\Functional\AppKernel;
+
+$kernel = new AppKernel('Behat', 'config.yml', 'test', true);
+$application = new Application($kernel);
+$application->run();
diff --git a/Tests/Functional/web/app.php b/Tests/Functional/web/app.php
new file mode 100644
index 000000000..de0e87299
--- /dev/null
+++ b/Tests/Functional/web/app.php
@@ -0,0 +1,21 @@
+<?php
+
+/**
+ * This file is part of the FOSCommentBundle package.
+ *
+ * (c) FriendsOfSymfony <http://friendsofsymfony.github.com/>
+ *
+ * This source file is subject to the MIT license that is bundled
+ * with this source code in the file LICENSE.
+ */
+
+require_once __DIR__ . '/../app/AppKernel.php';
+
+use Symfony\Component\HttpFoundation\Request;
+use FOS\CommentBundle\Tests\Functional\AppKernel;
+
+$kernel = new AppKernel('Behat', 'config.yml', 'test', true);
+$request = Request::createFromGlobals();
+$response = $kernel->handle($request);
+$response->send();
+$kernel->terminate($request, $response);
diff --git a/composer.json b/composer.json
index a4aa0ef81..0fcd671cb 100644
--- a/composer.json
+++ b/composer.json
@@ -31,7 +31,9 @@
     "suggest": {
         "doctrine/orm": "2.2.*",
         "friendsofsymfony/user-bundle": "*",
-        "ornicar/akismet-bundle": "*"
+        "ornicar/akismet-bundle": "*",
+        "behat/behat-bundle": "*",
+        "behat/mink-bundle": "*"
     },
     "autoload": {
         "psr-0": { "FOS\\CommentBundle": "" }

From 51e2ad524fa49001902880bb016f05f35c461c87 Mon Sep 17 00:00:00 2001
From: Tim Nagel <tim@nagel.com.au>
Date: Fri, 6 Apr 2012 16:52:46 +1000
Subject: [PATCH 05/14] Moved configuration of the Sensio view listener to
 default.yml

---
 Tests/Functional/app/Basic/config.yml   | 3 ---
 Tests/Functional/app/config/default.yml | 3 +++
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/Tests/Functional/app/Basic/config.yml b/Tests/Functional/app/Basic/config.yml
index 93db49cd5..5ba497c49 100644
--- a/Tests/Functional/app/Basic/config.yml
+++ b/Tests/Functional/app/Basic/config.yml
@@ -8,6 +8,3 @@ fos_comment:
             comment: FOS\CommentBundle\Tests\Functional\Bundle\CommentBundle\Entity\Comment
             thread: FOS\CommentBundle\Tests\Functional\Bundle\CommentBundle\Entity\Thread
             vote: FOS\CommentBundle\Tests\Functional\Bundle\CommentBundle\Entity\Vote
-
-sensio_framework_extra:
-    view: { annotations: false }
diff --git a/Tests/Functional/app/config/default.yml b/Tests/Functional/app/config/default.yml
index 3d3597ef7..76adb8ffc 100644
--- a/Tests/Functional/app/config/default.yml
+++ b/Tests/Functional/app/config/default.yml
@@ -48,6 +48,9 @@ security:
         ROLE_ADMIN:       ROLE_USER
         ROLE_SUPER_ADMIN: [ROLE_USER, ROLE_ADMIN, ROLE_ALLOWED_TO_SWITCH]
 
+sensio_framework_extra:
+    view: { annotations: false }
+
 twig:
     debug: %kernel.debug%
     strict_variables: %kernel.debug%

From cba0abce9798127aed0c37c7b19d845edbcd257f Mon Sep 17 00:00:00 2001
From: Tim Nagel <tim@nagel.com.au>
Date: Fri, 6 Apr 2012 17:00:06 +1000
Subject: [PATCH 06/14] Allow the ThreadPermalinkListener to skip if the
 Request scope is not available (CLI)

---
 EventListener/ThreadPermalinkListener.php | 18 +++++++++++-------
 Resources/config/events.xml               |  4 ++--
 2 files changed, 13 insertions(+), 9 deletions(-)

diff --git a/EventListener/ThreadPermalinkListener.php b/EventListener/ThreadPermalinkListener.php
index 3d93b9928..0b71d2fd2 100644
--- a/EventListener/ThreadPermalinkListener.php
+++ b/EventListener/ThreadPermalinkListener.php
@@ -15,8 +15,8 @@
 use FOS\CommentBundle\Event\ThreadEvent;
 use FOS\CommentBundle\Model\ThreadInterface;
 use FOS\CommentBundle\Model\ThreadManagerInterface;
+use Symfony\Component\DependencyInjection\ContainerInterface;
 use Symfony\Component\EventDispatcher\EventSubscriberInterface;
-use Symfony\Component\HttpFoundation\Request;
 
 /**
  * Responsible for setting a permalink for each new Thread object.
@@ -26,18 +26,18 @@
 class ThreadPermalinkListener implements EventSubscriberInterface
 {
     /**
-     * @var Request
+     * @var ContainerInterface
      */
-    protected $request;
+    protected $container;
 
     /**
      * Constructor.
      *
-     * @param Request $request
+     * @param ContainerInterface $container
      */
-    public function __construct(Request $request)
+    public function __construct(ContainerInterface $container)
     {
-        $this->request       = $request;
+        $this->container = $container;
     }
 
     /**
@@ -47,8 +47,12 @@ public function __construct(Request $request)
      */
     public function onThreadCreate(ThreadEvent $event)
     {
+        if (!$this->container->isScopeActive('request')) {
+            return;
+        }
+
         $thread = $event->getThread();
-        $thread->setPermalink($this->request->getUri());
+        $thread->setPermalink($this->container->get('request')->getUri());
     }
 
     static public function getSubscribedEvents()
diff --git a/Resources/config/events.xml b/Resources/config/events.xml
index 69a543703..c97c9f721 100644
--- a/Resources/config/events.xml
+++ b/Resources/config/events.xml
@@ -24,8 +24,8 @@
             <tag name="kernel.event_listener" event="fos_comment.comment.pre_persist" method="onCommentPersist" />
         </service>
 
-        <service id="fos_comment.listener.thread_permalink" class="FOS\CommentBundle\EventListener\ThreadPermalinkListener" scope="request">
-            <argument type="service" id="request" />
+        <service id="fos_comment.listener.thread_permalink" class="FOS\CommentBundle\EventListener\ThreadPermalinkListener">
+            <argument type="service" id="service_container" />
             <!-- TODO: 2.1 <tag name="kernel.event_subscriber" /> -->
             <tag name="kernel.event_listener" event="fos_comment.thread.create" method="onThreadCreate" />
         </service>

From 28a11850712bde94f91f2d9aa4d3909a3ab31a91 Mon Sep 17 00:00:00 2001
From: Tim Nagel <tim@nagel.com.au>
Date: Fri, 6 Apr 2012 17:47:08 +1000
Subject: [PATCH 07/14] Added initial Behat feature

---
 Features/Context/FeatureContext.php | 39 ++++-------------------------
 Features/EmbedThread.feature        | 12 +++++++++
 Tests/run_behat.sh                  |  6 +++++
 3 files changed, 23 insertions(+), 34 deletions(-)
 create mode 100644 Features/EmbedThread.feature
 create mode 100644 Tests/run_behat.sh

diff --git a/Features/Context/FeatureContext.php b/Features/Context/FeatureContext.php
index 9fbc40cfc..774328bbd 100644
--- a/Features/Context/FeatureContext.php
+++ b/Features/Context/FeatureContext.php
@@ -16,45 +16,16 @@ class FeatureContext extends MinkContext
      */
     public function iHaveAThreadIdentifiedBy($id, $link)
     {
-        $thread = $this->getThreadManager()->createThread($id);
+        $thread = $this->getThreadManager()->findThreadById($id);
+        if (!$thread) {
+            $thread = $this->getThreadManager()->createThread($id);
+        }
+
         $thread->setPermalink($link);
 
         $this->getThreadManager()->saveThread($thread);
     }
 
-
-    /**
-     * @When /^I go to "([^"]*)"$/
-     */
-    public function iGoTo($url)
-    {
-        $this->visit($url);
-    }
-
-    /**
-     * @When /^I go to "([^"]*)" as "([^"]*)" identified by "([^"]*)"$/
-     */
-    public function iGoToAsIdentifiedBy($url)
-    {
-        throw new PendingException;
-    }
-
-    /**
-     * @Then /^I should see a thread with the identifier of "([^"]*)"$/
-     */
-    public function iShouldSeeAThreadWithTheIdentifierOf($argument1)
-    {
-        throw new PendingException();
-    }
-
-    /**
-     * @Then /^I should see a thread with the identifier to "([^"]*)"$/
-     */
-    public function iShouldSeeAThreadWithTheIdentifierTo($argument1)
-    {
-        throw new PendingException();
-    }
-
     /**
      * @return \FOS\CommentBundle\Model\ThreadManagerInterface
      */
diff --git a/Features/EmbedThread.feature b/Features/EmbedThread.feature
new file mode 100644
index 000000000..440597f2e
--- /dev/null
+++ b/Features/EmbedThread.feature
@@ -0,0 +1,12 @@
+Feature: Embed a thread on a page
+
+Background:
+  Given I have a thread identified by "test" with a link of "test"
+
+Scenario: Embed a thread inline
+  When I go to "inline/test"
+  Then I should see a "#fos_comment_thread[data-thread=test]" element
+
+Scenario: Embed a thread async
+  When I go to "async/test"
+  Then I should see a "#fos_comment_thread[data-thread=test]" element
diff --git a/Tests/run_behat.sh b/Tests/run_behat.sh
new file mode 100644
index 000000000..8c5cd7d7e
--- /dev/null
+++ b/Tests/run_behat.sh
@@ -0,0 +1,6 @@
+#!/usr/bin/env sh
+
+Functional/app/console assets:install --symlink Functional/web
+Functional/app/console doctrine:database:create
+Functional/app/console doctrine:schema:create
+Functional/app/console behat
\ No newline at end of file

From 3c9625484cafcf7e533204b3e88c593bdaed28e3 Mon Sep 17 00:00:00 2001
From: Tim Nagel <tim@nagel.com.au>
Date: Fri, 6 Apr 2012 17:47:26 +1000
Subject: [PATCH 08/14] Fixed inline test

---
 .../CommentBundle/Resources/views/Comment/inline.html.twig      | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Tests/Functional/Bundle/CommentBundle/Resources/views/Comment/inline.html.twig b/Tests/Functional/Bundle/CommentBundle/Resources/views/Comment/inline.html.twig
index 3b8ba8bc7..77ed7f1ff 100644
--- a/Tests/Functional/Bundle/CommentBundle/Resources/views/Comment/inline.html.twig
+++ b/Tests/Functional/Bundle/CommentBundle/Resources/views/Comment/inline.html.twig
@@ -1,7 +1,7 @@
 {% extends "::base.html.twig" %}
 
 {% block body %}
-<div id="fos_comment_thread"></div>
+<div id="fos_comment_thread" data-thread="{{ thread.id }}"></div>
 
 {% include 'FOSCommentBundle:Thread:comments.html.twig' with {
     'comments': comments,

From 43ea03ff3fac76935aaad6c0f02135ad8d16b49e Mon Sep 17 00:00:00 2001
From: Tim Nagel <tim@nagel.com.au>
Date: Fri, 6 Apr 2012 17:48:31 +1000
Subject: [PATCH 09/14] Added jQuery to tests

---
 .../Bundle/CommentBundle/Resources/views/Comment/async.html.twig | 1 +
 .../CommentBundle/Resources/views/Comment/inline.html.twig       | 1 +
 2 files changed, 2 insertions(+)

diff --git a/Tests/Functional/Bundle/CommentBundle/Resources/views/Comment/async.html.twig b/Tests/Functional/Bundle/CommentBundle/Resources/views/Comment/async.html.twig
index f90de584e..01a9420dc 100644
--- a/Tests/Functional/Bundle/CommentBundle/Resources/views/Comment/async.html.twig
+++ b/Tests/Functional/Bundle/CommentBundle/Resources/views/Comment/async.html.twig
@@ -1,5 +1,6 @@
 {% extends "::base.html.twig"%}
 
 {% block body %}
+<script type="text/javascript" src="http://ajax.googleapis.com/ajax/libs/jquery/1.7.1/jquery.min.js"></script>
 {% include 'FOSCommentBundle:Thread:async.html.twig' with { 'id': id } %}
 {% endblock body %}
diff --git a/Tests/Functional/Bundle/CommentBundle/Resources/views/Comment/inline.html.twig b/Tests/Functional/Bundle/CommentBundle/Resources/views/Comment/inline.html.twig
index 77ed7f1ff..364d758b3 100644
--- a/Tests/Functional/Bundle/CommentBundle/Resources/views/Comment/inline.html.twig
+++ b/Tests/Functional/Bundle/CommentBundle/Resources/views/Comment/inline.html.twig
@@ -14,6 +14,7 @@
 
 {% block javascript %}
 {% javascripts '@FOSCommentBundle/Resources/assets/js/comments.js' %}
+<script type="text/javascript" src="http://ajax.googleapis.com/ajax/libs/jquery/1.7.1/jquery.min.js"></script>
 <script type="text/javascript" src="{{ asset_url }}">
 // URI identifier for the thread comments
 var fos_comment_thread_id = '{{ path('fos_comment_get_thread_comments', {'id': thread.id}) }}';

From 5bec19af7e0fc56ad545cfdc266dfafa08aab369 Mon Sep 17 00:00:00 2001
From: Tim Nagel <tim@nagel.com.au>
Date: Fri, 6 Apr 2012 17:57:00 +1000
Subject: [PATCH 10/14] Travis configuration

---
 .gitignore                                 |  6 ++-
 .travis.yml                                | 14 +++++-
 Tests/Functional/ThreadTest.php            | 52 ----------------------
 Tests/Functional/app/Behat/nginx.conf.dist |  8 ++--
 Tests/Functional/app/console               |  0
 Tests/run_behat.sh                         |  6 ---
 run_tests.sh                               | 13 ++++++
 7 files changed, 34 insertions(+), 65 deletions(-)
 delete mode 100644 Tests/Functional/ThreadTest.php
 mode change 100644 => 100755 Tests/Functional/app/console
 delete mode 100644 Tests/run_behat.sh
 create mode 100755 run_tests.sh

diff --git a/.gitignore b/.gitignore
index c2f20c621..2ac02e93b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,6 @@
+composer.phar
 phpunit.xml
 Tests/autoload.php
-composer.phar
-vendor/*
+Tests/Functional/app/Behat/nginx.conf
+Tests/Functional/web/bundles
+vendor
diff --git a/.travis.yml b/.travis.yml
index bf65d2cca..8d0e2d091 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -5,9 +5,21 @@ php:
   - 5.4
 
 before_script:
-  - curl -s http://getcomposer.org/installer | php
+  - sudo apt-get -qq install nginx > /dev/null 2>&1
+  - node -v
+  - curl --silent http://npmjs.org/install.sh | sh > /dev/null 2>&1
+  - npm -v
+  - npm install --silent -g zombie > /dev/null
+  - export NODE_PATH=/home/vagrant/.nvm/v0.4.12/lib/node_modules:/usr/local/lib/node_modules
+  - curl --silent http://getcomposer.org/installer | php
+  - php-cgi -v
+  - php-cgi -b 127.0.0.1:9000 &
+  - nginx -v
+  - sudo nginx -c app/Behat/nginx.conf.dist -p ./Tests/Functional
   - php composer.phar install --install-suggests --quiet
 
+script: ./run_tests.sh
+
 notifications:
   email:
     - friendsofsymfony-dev@googlegroups.com
diff --git a/Tests/Functional/ThreadTest.php b/Tests/Functional/ThreadTest.php
deleted file mode 100644
index 9168b8f9c..000000000
--- a/Tests/Functional/ThreadTest.php
+++ /dev/null
@@ -1,52 +0,0 @@
-<?php
-
-/**
- * This file is part of the FOSCommentBundle package.
- *
- * (c) FriendsOfSymfony <http://friendsofsymfony.github.com/>
- *
- * This source file is subject to the MIT license that is bundled
- * with this source code in the file LICENSE.
- */
-
-namespace FOS\CommentBundle\Tests\Functional;
-
-use Doctrine\ORM\Tools\SchemaTool;
-
-/**
- * Basic functional testing of usual methods used to include a
- * comment thread inside another page.
- *
- * @author Tim Nagel <tim@nagel.com.au>
- * @group functional
- */
-class ThreadTest extends WebTestCase
-{
-    protected function setUp()
-    {
-        $this->client = self::createClient(array(
-            'test_case' => 'Basic',
-            'root_config' => 'config.yml'
-        ), array(
-            'PHP_AUTH_USER' => 'user',
-            'PHP_AUTH_PW' => 'user'
-        ));
-
-        parent::setUp();
-    }
-
-    public function testAsync()
-    {
-        $crawler = $this->client->request('GET', '/async/test');
-
-        $this->assertCount(1, $crawler->filter('#fos_comment_thread'));
-        $this->assertContains('fos_comment_script.src', $crawler->filter('script')->text());
-    }
-
-    public function testInline()
-    {
-        $crawler = $this->client->request('GET', '/inline/test');
-
-        $this->assertCount(1, $crawler->filter('#fos_comment_thread'));
-    }
-}
diff --git a/Tests/Functional/app/Behat/nginx.conf.dist b/Tests/Functional/app/Behat/nginx.conf.dist
index 74ae556f9..9a8af812d 100644
--- a/Tests/Functional/app/Behat/nginx.conf.dist
+++ b/Tests/Functional/app/Behat/nginx.conf.dist
@@ -18,8 +18,8 @@ http {
         server 127.0.0.1:9000;
     }
 
-    access_log logs/access.log;
-    error_log logs/error.log debug;
+    access_log /var/log/nginx/access.log;
+    error_log /var/log/nginx/error.log;
 
     server {
         listen 8080 default_server;
@@ -27,7 +27,7 @@ http {
 
         charset utf-8;
 
-        root Functional/web;
+        root web;
 
         location / {
                 index app.php;
@@ -41,7 +41,7 @@ http {
         location ~^/app\.php(/|$) {
                 fastcgi_split_path_info ^(.+\.php)(.*)$;
                 fastcgi_pass php;
-                include /usr/local/etc/nginx/fastcgi_params;
+                include /etc/nginx/fastcgi_params;
                 fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name;
                 fastcgi_param HTTPS off;
                 fastcgi_param ENVIRONMENT 'test';
diff --git a/Tests/Functional/app/console b/Tests/Functional/app/console
old mode 100644
new mode 100755
diff --git a/Tests/run_behat.sh b/Tests/run_behat.sh
deleted file mode 100644
index 8c5cd7d7e..000000000
--- a/Tests/run_behat.sh
+++ /dev/null
@@ -1,6 +0,0 @@
-#!/usr/bin/env sh
-
-Functional/app/console assets:install --symlink Functional/web
-Functional/app/console doctrine:database:create
-Functional/app/console doctrine:schema:create
-Functional/app/console behat
\ No newline at end of file
diff --git a/run_tests.sh b/run_tests.sh
new file mode 100755
index 000000000..d1e03c3d1
--- /dev/null
+++ b/run_tests.sh
@@ -0,0 +1,13 @@
+#!/usr/bin/env bash
+
+set -e
+set -o pipefail
+
+phpunit
+
+Tests/Functional/app/console assets:install --symlink Tests/Functional/web
+Tests/Functional/app/console doctrine:database:drop --force
+Tests/Functional/app/console doctrine:database:create
+Tests/Functional/app/console doctrine:schema:create
+
+Tests/Functional/app/console behat

From e919897b7fa489511ada3a6ec7e4404130a8a053 Mon Sep 17 00:00:00 2001
From: Tim Nagel <tim@nagel.com.au>
Date: Fri, 6 Apr 2012 19:04:25 +1000
Subject: [PATCH 11/14] Fixed async behat test

---
 Resources/assets/js/comments.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/Resources/assets/js/comments.js b/Resources/assets/js/comments.js
index 14d544394..4128ffd9e 100644
--- a/Resources/assets/js/comments.js
+++ b/Resources/assets/js/comments.js
@@ -96,6 +96,7 @@
                 {permalink: encodeURIComponent(permalink)},
                 function(data) {
                     FOS_COMMENT.thread_container.html(data);
+                    FOS_COMMENT.thread_container.attr('data-thread', identifier);
                 }
             );
         },

From 1cc5b106fb0e3371aae7e2747b36a4f7d2702ea8 Mon Sep 17 00:00:00 2001
From: Tim Nagel <tim@nagel.com.au>
Date: Fri, 6 Apr 2012 20:32:11 +1000
Subject: [PATCH 12/14] Moved set up to before_script

---
 .travis.yml  | 4 ++++
 run_tests.sh | 6 ------
 2 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 8d0e2d091..4c2dbfdef 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -17,6 +17,10 @@ before_script:
   - nginx -v
   - sudo nginx -c app/Behat/nginx.conf.dist -p ./Tests/Functional
   - php composer.phar install --install-suggests --quiet
+  - ./Tests/Functional/app/console assets:install --symlink Tests/Functional/web
+  - ./Tests/Functional/app/console doctrine:database:drop --force
+  - ./Tests/Functional/app/console doctrine:database:create
+  - ./Tests/Functional/app/console doctrine:schema:create
 
 script: ./run_tests.sh
 
diff --git a/run_tests.sh b/run_tests.sh
index d1e03c3d1..1a1470859 100755
--- a/run_tests.sh
+++ b/run_tests.sh
@@ -4,10 +4,4 @@ set -e
 set -o pipefail
 
 phpunit
-
-Tests/Functional/app/console assets:install --symlink Tests/Functional/web
-Tests/Functional/app/console doctrine:database:drop --force
-Tests/Functional/app/console doctrine:database:create
-Tests/Functional/app/console doctrine:schema:create
-
 Tests/Functional/app/console behat

From b5a6a286d8d13f3208bc8b59fde2d95e37eec419 Mon Sep 17 00:00:00 2001
From: Tim Nagel <tim@nagel.com.au>
Date: Fri, 6 Apr 2012 20:43:17 +1000
Subject: [PATCH 13/14] Simplify the inline test controller action

---
 .../Bundle/CommentBundle/Controller/CommentController.php    | 3 ---
 .../CommentBundle/Resources/views/Comment/inline.html.twig   | 5 +----
 2 files changed, 1 insertion(+), 7 deletions(-)

diff --git a/Tests/Functional/Bundle/CommentBundle/Controller/CommentController.php b/Tests/Functional/Bundle/CommentBundle/Controller/CommentController.php
index 63e591a79..136b92bd9 100644
--- a/Tests/Functional/Bundle/CommentBundle/Controller/CommentController.php
+++ b/Tests/Functional/Bundle/CommentBundle/Controller/CommentController.php
@@ -44,10 +44,7 @@ public function inlineAction(Request $request, $id)
 
         return $this->render('CommentBundle:Comment:inline.html.twig', array(
             'comments' => $comments,
-            'displayDepth' => null,
-            'sorter' => null,
             'thread' => $thread,
-            'view' => 'tree',
         ));
     }
 }
diff --git a/Tests/Functional/Bundle/CommentBundle/Resources/views/Comment/inline.html.twig b/Tests/Functional/Bundle/CommentBundle/Resources/views/Comment/inline.html.twig
index 364d758b3..18e096476 100644
--- a/Tests/Functional/Bundle/CommentBundle/Resources/views/Comment/inline.html.twig
+++ b/Tests/Functional/Bundle/CommentBundle/Resources/views/Comment/inline.html.twig
@@ -5,10 +5,7 @@
 
 {% include 'FOSCommentBundle:Thread:comments.html.twig' with {
     'comments': comments,
-    'displayDepth': displayDepth,
-    'sorter': sorter,
-    'thread': thread,
-    'view': view
+    'thread': thread
 } %}
 {% endblock body %}
 

From 8c7619844215561cdf0e459cc32d22b68f412c58 Mon Sep 17 00:00:00 2001
From: Tim Nagel <tim@nagel.com.au>
Date: Mon, 9 Apr 2012 11:45:02 +1000
Subject: [PATCH 14/14] Changed Zombie.js to Sahi

---
 .travis.yml                                   |  23 ++--
 Features/EmbedThread.feature                  |   8 ++
 Resources/doc/11-running_the_test_suite.md    |   4 +-
 .../Bundle/CommentBundle/Entity/Comment.php   |   2 +-
 Tests/Functional/SymfonyDriver.php            | 122 +++++++++++++++++-
 Tests/Functional/app/Behat/config.yml         |   5 +-
 composer.json                                 |   3 +-
 run_tests.sh                                  |   2 +-
 8 files changed, 141 insertions(+), 28 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 4c2dbfdef..9330f48f5 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -5,26 +5,19 @@ php:
   - 5.4
 
 before_script:
+  - export DISPLAY=:99.0 && sh -e /etc/init.d/xvfb start
+  - wget --quiet -O sahi.zip http://sourceforge.net/projects/sahi/files/sahi-v35/20110719/sahi_20110719.zip/download && unzip -qq sahi.zip
+  - export SAHI_HOME=sahi && sh sahi/bin/sahi.sh > /dev/null &
+  - curl --silent http://getcomposer.org/installer | php > /dev/null && php composer.phar install --install-suggests --quiet
   - sudo apt-get -qq install nginx > /dev/null 2>&1
-  - node -v
-  - curl --silent http://npmjs.org/install.sh | sh > /dev/null 2>&1
-  - npm -v
-  - npm install --silent -g zombie > /dev/null
-  - export NODE_PATH=/home/vagrant/.nvm/v0.4.12/lib/node_modules:/usr/local/lib/node_modules
-  - curl --silent http://getcomposer.org/installer | php
-  - php-cgi -v
+  - nginx -v && sudo nginx -c app/Behat/nginx.conf.dist -p ./Tests/Functional
+  - for file in `find /home/vagrant/.phpenv -name 'xdebug.ini'`; do echo "xdebug.max_nesting_level=200" >> $file; done;
   - php-cgi -b 127.0.0.1:9000 &
-  - nginx -v
-  - sudo nginx -c app/Behat/nginx.conf.dist -p ./Tests/Functional
-  - php composer.phar install --install-suggests --quiet
-  - ./Tests/Functional/app/console assets:install --symlink Tests/Functional/web
-  - ./Tests/Functional/app/console doctrine:database:drop --force
-  - ./Tests/Functional/app/console doctrine:database:create
-  - ./Tests/Functional/app/console doctrine:schema:create
+  - ./Tests/Functional/app/console assets:install --symlink Tests/Functional/web > /dev/null && ./Tests/Functional/app/console doctrine:database:drop --force > /dev/null && ./Tests/Functional/app/console doctrine:database:create > /dev/null && ./Tests/Functional/app/console doctrine:schema:create
 
 script: ./run_tests.sh
 
 notifications:
   email:
     - friendsofsymfony-dev@googlegroups.com
-    - tim+build@nagel.com.au
\ No newline at end of file
+    - tim+build@nagel.com.au
diff --git a/Features/EmbedThread.feature b/Features/EmbedThread.feature
index 440597f2e..14236bef8 100644
--- a/Features/EmbedThread.feature
+++ b/Features/EmbedThread.feature
@@ -7,6 +7,14 @@ Scenario: Embed a thread inline
   When I go to "inline/test"
   Then I should see a "#fos_comment_thread[data-thread=test]" element
 
+@javascript
 Scenario: Embed a thread async
   When I go to "async/test"
   Then I should see a "#fos_comment_thread[data-thread=test]" element
+
+@javascript
+Scenario: Reply to a thread
+  When I go to "async/test"
+  And I fill in "fos_comment_comment_body" with "I am replying to a comment"
+  And I press "fos_comment_comment_new_submit"
+  Then I should see "I am replying to a comment" in the ".fos_comment_comment_body" element
\ No newline at end of file
diff --git a/Resources/doc/11-running_the_test_suite.md b/Resources/doc/11-running_the_test_suite.md
index 5710071d2..06b71a853 100644
--- a/Resources/doc/11-running_the_test_suite.md
+++ b/Resources/doc/11-running_the_test_suite.md
@@ -25,8 +25,8 @@ Functional tests have more dependencies.
 
  * vendors set up by [Composer](http://getcomposer.org)
    * `php composer.phar install --install-suggests`
- * [Node.js](http://nodejs.org/)
- * [Zombie.js](https://github.com/assaf/zombie)
+ * Sahi
+ * A browser supported by Sahi (headless or otherwise)
  * A webserver with ability to parse PHP
  * Once vendors are installed, a few commands must be run to set up the environment
    * ./Tests/Functional/app/console assets:install --symlink Tests/Functional/web
diff --git a/Tests/Functional/Bundle/CommentBundle/Entity/Comment.php b/Tests/Functional/Bundle/CommentBundle/Entity/Comment.php
index f2ce89aed..37c2ddcab 100644
--- a/Tests/Functional/Bundle/CommentBundle/Entity/Comment.php
+++ b/Tests/Functional/Bundle/CommentBundle/Entity/Comment.php
@@ -42,7 +42,7 @@ class Comment extends BaseComment implements SignedCommentInterface, VotableComm
     protected $thread;
 
     /**
-     * @ORM\Column(type="string")
+     * @ORM\Column(type="string", nullable=true)
      * @var string
      */
     protected $author;
diff --git a/Tests/Functional/SymfonyDriver.php b/Tests/Functional/SymfonyDriver.php
index 588b402df..7af0ea13c 100644
--- a/Tests/Functional/SymfonyDriver.php
+++ b/Tests/Functional/SymfonyDriver.php
@@ -2,18 +2,130 @@
 
 namespace FOS\CommentBundle\Tests\Functional;
 
-use Behat\MinkBundle\Driver\SymfonyDriver as BaseSymfonyDriver;
+use Behat\Mink\Driver\GoutteDriver;
 use Symfony\Component\BrowserKit\Client;
 
-class SymfonyDriver extends BaseSymfonyDriver
+/*
+ * This file has been duplicated from Behat, a private $client
+ * does not allow us to overwrite the "new $class()" call because
+ * our kernel has different parameters to the normal Kernel.
+ */
+
+/**
+ * Symfony2 Mink driver.
+ *
+ * @author      Konstantin Kudryashov <ever.zet@gmail.com>
+ */
+class SymfonyDriver extends GoutteDriver
 {
+    /**
+     * Initializes Goutte driver.
+     *
+     * @param   Symfony\Component\BrowserKit\Client $client     BrowserKit client instance
+     */
     public function __construct(Client $client = null)
     {
+        // create new kernel, that could be easily rebooted
         $class  = get_class($client->getKernel());
         $kernel = new $class('Behat', 'config.yml', $client->getKernel()->getEnvironment(), $client->getKernel()->isDebug());
         $kernel->boot();
 
-        $this->client = $kernel->getContainer()->get('test.client');
-        $this->client->followRedirects(true);
+        parent::__construct($kernel->getContainer()->get('test.client'));
+    }
+
+    /**
+     * {@inheritdoc}
+     *
+     * removes "*.php/" from urls and then passes it to GoutteDriver::visit().
+     */
+    public function visit($url)
+    {
+        $url = preg_replace('/^(https?\:\/\/[^\/]+)(\/[^\/]+\.php)?/', '$1', $url);
+        parent::visit($url);
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function reset()
+    {
+        parent::reset();
+
+        $this->getClient()->getKernel()->shutdown();
+        $this->getClient()->getKernel()->boot();
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function setBasicAuth($user, $password)
+    {
+        $this->getClient()->setServerParameter('PHP_AUTH_USER', $user);
+        $this->getClient()->setServerParameter('PHP_AUTH_PW', $password);
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function setRequestHeader($name, $value)
+    {
+        switch (strtolower($name)) {
+            case 'accept':
+                $name = 'HTTP_ACCEPT';
+                break;
+            case 'accept-charset':
+                $name = 'HTTP_ACCEPT_CHARSET';
+                break;
+            case 'accept-encoding':
+                $name = 'HTTP_ACCEPT_ENCODING';
+                break;
+            case 'accept-language':
+                $name = 'HTTP_ACCEPT_LANGUAGE';
+                break;
+            case 'connection':
+                $name = 'HTTP_CONNECTION';
+                break;
+            case 'host':
+                $name = 'HTTP_HOST';
+                break;
+            case 'user-agent':
+                $name = 'HTTP_USER_AGENT';
+                break;
+            case 'authorization':
+                $name = 'PHP_AUTH_DIGEST';
+                break;
+        }
+
+        $this->getClient()->setServerParameter($name, $value);
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function getResponseHeaders()
+    {
+        $headers         = array();
+        $responseHeaders = trim($this->getClient()->getResponse()->headers->__toString());
+
+        foreach (explode("\r\n", $responseHeaders) as $header) {
+            list($name, $value) = array_map('trim', explode(':', $header, 2));
+
+            if (isset($headers[$name])) {
+                $headers[$name]   = array($headers[$name]);
+                $headers[$name][] = $value;
+            } else {
+                $headers[$name] = $value;
+            }
+        }
+
+        return $headers;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getStatusCode()
+    {
+        return $this->getClient()->getResponse()->getStatusCode();
     }
-}
\ No newline at end of file
+}
diff --git a/Tests/Functional/app/Behat/config.yml b/Tests/Functional/app/Behat/config.yml
index b09268bac..059ca5f0b 100644
--- a/Tests/Functional/app/Behat/config.yml
+++ b/Tests/Functional/app/Behat/config.yml
@@ -11,9 +11,8 @@ fos_comment:
 
 mink:
     base_url: http://127.0.0.1:8080/
-    default_session: zombie
-    javascript_session: zombie
-    zombie: ~
+    javascript_session: sahi
+    sahi: ~
     show_cmd: open %s
 
 parameters:
diff --git a/composer.json b/composer.json
index 0fcd671cb..c0c8dc070 100644
--- a/composer.json
+++ b/composer.json
@@ -33,7 +33,8 @@
         "friendsofsymfony/user-bundle": "*",
         "ornicar/akismet-bundle": "*",
         "behat/behat-bundle": "*",
-        "behat/mink-bundle": "*"
+        "behat/mink-bundle": "*",
+        "behat/sahi-client": "*"
     },
     "autoload": {
         "psr-0": { "FOS\\CommentBundle": "" }
diff --git a/run_tests.sh b/run_tests.sh
index 1a1470859..2975986f8 100755
--- a/run_tests.sh
+++ b/run_tests.sh
@@ -4,4 +4,4 @@ set -e
 set -o pipefail
 
 phpunit
-Tests/Functional/app/console behat
+Tests/Functional/app/console behat --format=progress