Update and improve Behat tests

* Bump Behat-version and add imbo/behat-api-extension
* Move behat.yml to the default location
* Add composer script for starting PHPs built in httpd for the Behat tests
* Rename Behat configuration file to .dist so developers can have local configuration files
* Install micheh/psr7-cache to easily check if a response is cacheable or not. This functionality was earlier present in Guzzle, but has been removed.
* Move the PHPUnit configuration files to root. Resolves #507

.gitignore

@@ -5,4 +5,6 @@ docs/_build
 .lintcache
 *.log
 public/.htaccess
-.idea
+.idea
+behat.yml
+phpunit.xml

.travis.yml

@@ -37,12 +37,16 @@ before_install:
 
 before_script:
   - phpenv config-rm xdebug.ini
+  - echo 'always_populate_raw_post_data = -1' >> ~/.phpenv/versions/$(phpenv version-name)/etc/conf.d/travis.ini
   - composer self-update
+  - composer lint
+  - composer prepare
   - composer install --prefer-dist
+  - composer start-httpd-for-behat-tests
 
 script:
-  - ./vendor/bin/phpunit --verbose -c tests/phpunit/phpunit.xml.travis
-  - ./vendor/bin/behat --strict --profile no-cc --config tests/behat/behat.yml
+  - ./vendor/bin/phpunit --verbose -c phpunit.xml.travis --stop-on-failure
+  - ./vendor/bin/behat --strict --stop-on-failure
 
 after_failure:
   - echo "Tests failed - httpd log follows"

CONTRIBUTING.md

@@ -8,28 +8,24 @@ If you wish to contribute to Imbo, please read the following resources first:
 
 ## Running tests
 
-Imbo has both [Behat](http://docs.behat.org/en/v2.5/) and [PHPUnit](https://phpunit.de/) tests, and when adding new features or fixing bugs you are required to add relevant test cases. Remember to install the development requirements using [Composer](https://getcomposer.org/) before running the tests:
+Imbo has both [Behat](http://behat.org) and [PHPUnit](https://phpunit.de/) tests, and when adding new features or fixing bugs you are required to add relevant test cases. Remember to install dependencies before running the tests:
 
 ```
-composer install --dev
+composer install
 ```
 
 ### Behat
 
 ```
-./vendor/bin/behat --strict --profile no-cc --config tests/behat/behat.yml
+./vendor/bin/behat --strict
 ```
 
-The `--profile no-cc` arguments will disable the generation of code coverage. If you skip these arguments you will get code covarage of the Behat tests.
-
 ### PHPUnit
 
 ```
 ./vendor/bin/phpunit --verbose -c tests/phpunit
 ```
 
-Include `--coverage-html <path>` if you want to generate code coverage report of the tests.
-
 ## Writing documentation
 
 Imbo uses [Read the docs](https://readthedocs.org/projects/imbo/) for documentation, and all docs are located in the `docs` dir. The docs are written using [Sphinx](http://sphinx-doc.org/), and if you are contributing new features please add relevant docs.

behat.yml.dist

@@ -0,0 +1,11 @@
+default:
+    autoload:
+        '': %paths.base%/tests/behat/features/bootstrap
+    suites:
+        default:
+            paths: [%paths.base%/tests/behat/features]
+
+    extensions:
+        Imbo\BehatApiExtension:
+            apiClient:
+                base_uri: http://localhost:8080

composer.json

@@ -36,15 +36,16 @@
   "require-dev": {
     "mikey179/vfsStream": "^1.5.0",
     "phpunit/phpunit": "^5.6",
-    "behat/behat": "^2.0",
-    "guzzle/guzzle": "^3.9.3",
+    "behat/behat": "^3.2",
     "phploc/phploc": "^3.0",
     "sebastian/phpcpd": "^2.0",
     "phpmd/phpmd": "^2.4",
     "squizlabs/php_codesniffer": "^2.7",
     "imbo/imbo-phpcs-standard": "^1.4",
     "phpdocumentor/phpdocumentor": "^2.9",
-    "cwhite92/b2-sdk-php": "^1.2"
+    "cwhite92/b2-sdk-php": "^1.2",
+    "imbo/behat-api-extension": "^2.0",
+    "micheh/psr7-cache": "^0.5"
   },
   "suggest": {
     "ext-mongo": "Enables usage of MongoDB and GridFS as database and store. Recommended version: >=1.4.0",
@@ -77,12 +78,11 @@
       "mkdir build",
       "mkdir build/coverage",
       "mkdir build/logs",
-      "mkdir build/docs",
-      "mkdir build/code-browser",
-      "mkdir build/pdepend"
+      "mkdir build/docs"
     ],
-    "test-phpunit": "vendor/bin/phpunit --verbose -c tests/phpunit",
-    "test-behat": "vendor/bin/behat --strict --config tests/behat/behat.yml",
+    "test-phpunit": "vendor/bin/phpunit --verbose",
+    "test-phpunit-coverage": "vendor/bin/phpunit --verbose --coverage-html build/coverage",
+    "test-behat": "vendor/bin/behat --strict",
     "test": [
       "@test-phpunit",
       "@test-behat"
@@ -107,6 +107,7 @@
     "docs": [
       "cd docs; make spelling",
       "cd docs; make html"
-    ]
+    ],
+    "start-httpd-for-behat-tests": "php -S localhost:8080 -t ./public tests/behat/router.php > build/logs/httpd.log 2>&1 &"
   }
 }