From 95b9408c86dcdf895792a37fac285f7436a92f6a Mon Sep 17 00:00:00 2001
From: Ingo Schommer <ingo@silverstripe.com>
Date: Wed, 19 Dec 2012 15:55:54 +0100
Subject: [PATCH] Using new and more flexible 'testsession' module instead of
 dev/tests/setdb

---
 composer.json                                     |  3 ++-
 .../Context/SilverStripeContext.php               | 15 +++++++++++----
 2 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/composer.json b/composer.json
index a818ab0..1734361 100644
--- a/composer.json
+++ b/composer.json
@@ -22,7 +22,8 @@
         "behat/mink": "1.4@stable",
         "behat/mink-extension": "1.0@stable",
         "behat/mink-selenium2-driver": "*",
-        "behat/mink-goutte-driver": "*"
+        "behat/mink-goutte-driver": "*",
+        "silverstripe/testsession": "*"
     },
 
     "autoload": {
diff --git a/src/SilverStripe/BehatExtension/Context/SilverStripeContext.php b/src/SilverStripe/BehatExtension/Context/SilverStripeContext.php
index d5de9f2..68da2dd 100644
--- a/src/SilverStripe/BehatExtension/Context/SilverStripeContext.php
+++ b/src/SilverStripe/BehatExtension/Context/SilverStripeContext.php
@@ -151,12 +151,19 @@ class SilverStripeContext extends MinkContext implements SilverStripeAwareContex
     public function before(ScenarioEvent $event)
     {
         if (!isset($this->databaseName)) {
-            throw new \LogicException('Context\'s $databaseName has to be set when implementing SilverStripeAwareContextInterface.');
+            throw new \LogicException(
+                'Context\'s $databaseName has to be set when implementing '
+                . 'SilverStripeAwareContextInterface.'
+            );
         }
 
-        $setdbUrl = $this->joinUrlParts($this->getBaseUrl(), '/dev/tests/setdb');
-        $setdbUrl = sprintf('%s?database=%s', $setdbUrl, $this->databaseName);
-        $this->getSession()->visit($setdbUrl);
+        $url = $this->joinUrlParts($this->getBaseUrl(), '/dev/testsession/start');
+        $params = array(
+            'database' => $this->databaseName,
+        );
+        $url .= '?' . http_build_query($params);
+
+        $this->getSession()->visit($url);
     }
 
     /**