Merge pull request #47 from iyzoer/master

Fix tests

.travis.yml

@@ -1,6 +1,13 @@
 language: php
 
-sudo: false
+addons:
+  apt:
+    packages:
+      - apache2
+      - libapache2-mod-fastcgi
+
+sudo: required
+dist: trusty
 
 php:
   - 5.6
@@ -19,6 +26,7 @@ matrix:
 
 before_script:
   - bash tests/bin/clone_prestashop.sh
+  - bash tests/bin/setup-apache.sh
   - bash tests/bin/before_script.sh
 
 script:

tests/bin/setup-apache.sh

@@ -0,0 +1,19 @@
+#!/bin/bash
+
+PRESTASHOP_DIR=$TRAVIS_BUILD_DIR/../PrestaShop
+
+cd $PRESTASHOP_DIR
+
+bash travis-scripts/setup-php-fpm.sh
+
+echo "* Preparing Apache ...";
+
+sudo a2enmod rewrite actions fastcgi alias
+
+# Use default config
+sudo cp -f tests/travis-ci-apache-vhost /etc/apache2/sites-available/000-default.conf
+sudo sed -e "s?%PRESTASHOP_DIR%?$(pwd)?g" --in-place /etc/apache2/sites-available/000-default.conf
+sudo chmod 777 -R $HOME
+
+# Starting Apache
+sudo service apache2 restart