From bd2c4252bb1fd16b20c87725a33f7f53dce08f2f Mon Sep 17 00:00:00 2001
From: James Cole <thegrumpydictator@gmail.com>
Date: Mon, 15 Dec 2014 20:56:18 +0100
Subject: [PATCH] Attempt #2.

---
 codeception.yml            | 12 +++++++++++
 composer.json              |  3 ++-
 composer.lock              | 42 +++++++++++++++++++++++++++++++++++++-
 tests/acceptance.suite.yml |  2 +-
 4 files changed, 56 insertions(+), 3 deletions(-)

diff --git a/codeception.yml b/codeception.yml
index aeffebe66c..7c03445b98 100644
--- a/codeception.yml
+++ b/codeception.yml
@@ -8,6 +8,18 @@ settings:
     bootstrap: _bootstrap.php
     colors: true
     memory_limit: 1024M
+extensions:
+    enabled:
+        - Codeception\Extension\PhpBuiltinServer
+    config:
+        Codeception\Extension\PhpBuiltinServer:
+            hostname: localhost
+            port: 8000
+            documentRoot: public
+            startDelay: 1
+            phpIni: /etc/php5/fpm/php.ini
+
+
 modules:
   config:
     Db:
diff --git a/composer.json b/composer.json
index f551a8ccde..005a9d3189 100644
--- a/composer.json
+++ b/composer.json
@@ -37,7 +37,8 @@
         "codeception/codeception": "*",
         "codeception/c3": "2.*",
         "sebastian/phpcpd": "*",
-        "sebastian/phpdcd": "*"
+        "sebastian/phpdcd": "*",
+        "codeception/phpbuiltinserver": "*"
 
     },
     "autoload": {
diff --git a/composer.lock b/composer.lock
index 3408416d1b..95056f7d36 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,7 +4,7 @@
         "Read more about it at http://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file",
         "This file is @generated automatically"
     ],
-    "hash": "54b87a48702c03e0eef7f37449f7888a",
+    "hash": "9c8cafd9d3f40fa1e56b3a7cee419da5",
     "packages": [
         {
             "name": "classpreloader/classpreloader",
@@ -2063,6 +2063,46 @@
             ],
             "time": "2014-11-18 00:48:50"
         },
+        {
+            "name": "codeception/phpbuiltinserver",
+            "version": "v1.2.1",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/tiger-seo/PhpBuiltinServer.git",
+                "reference": "730206313b7e85d9ed4838ba02a0aee24fce1239"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/tiger-seo/PhpBuiltinServer/zipball/730206313b7e85d9ed4838ba02a0aee24fce1239",
+                "reference": "730206313b7e85d9ed4838ba02a0aee24fce1239",
+                "shasum": ""
+            },
+            "require": {
+                "codeception/codeception": ">=2.0.2",
+                "php": ">=5.4.0"
+            },
+            "type": "library",
+            "autoload": {
+                "psr-0": {
+                    "Codeception": "src"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "tiger-seo",
+                    "email": "tiger.seo@gmail.com"
+                }
+            ],
+            "description": "PhpBuiltinServer extension for Codeception",
+            "keywords": [
+                "codeception"
+            ],
+            "time": "2014-09-19 10:14:07"
+        },
         {
             "name": "doctrine/annotations",
             "version": "v1.2.1",
diff --git a/tests/acceptance.suite.yml b/tests/acceptance.suite.yml
index 2a45414938..cff7c7f657 100644
--- a/tests/acceptance.suite.yml
+++ b/tests/acceptance.suite.yml
@@ -11,4 +11,4 @@ modules:
         - AcceptanceHelper
     config:
         PhpBrowser:
-            url: 'http://localhost/'
+            url: 'http://localhost'