From 4ff23c60c20e4b77d50692bbd97b52474841bec6 Mon Sep 17 00:00:00 2001
From: Daniel Siepmann <coding@daniel-siepmann.de>
Date: Fri, 9 Dec 2016 20:00:42 +0100
Subject: [PATCH] WIP|FEATURE: Try to make functional tests work on travis

---
 .travis.yml | 18 +++++++++---------
 Makefile    |  2 +-
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index cef088d..9ad936a 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -2,14 +2,19 @@ language: php
 
 php:
   - 5.6
-  - 7.0
+  # Elastica is not compatible yet, see https://travis-ci.org/DanielSiepmann/search_core/jobs/182692743
+  # - 7.0
 
 env:
   global:
     - TYPO3_DATABASE_NAME="typo3_ci"
     - TYPO3_DATABASE_HOST="127.0.0.1"
-    - TYPO3_DATABASE_USERNAME="root"
+    - TYPO3_DATABASE_USERNAME="travis"
     - TYPO3_DATABASE_PASSWORD=""
+    - typo3DatabaseName="typo3_ci"
+    - typo3DatabaseHost="127.0.0.1"
+    - typo3DatabaseUsername="travis"
+    - typo3DatabasePassword=""
   matrix:
     - TYPO3_VERSION="~6.2"
     - TYPO3_VERSION="~7.6"
@@ -28,13 +33,8 @@ matrix:
       php: 5.6
 
 services:
-  - mysql-5.6
-  - elasticsearch-5.0
-
-before_install:
-  - composer self-update
-  - composer --version
-  - mysql -u root -e "SET PASSWORD FOR 'root'@'localhost' = PASSWORD('')"
+  - mysql
+  - elasticsearch
 
 install:
   - make install
diff --git a/Makefile b/Makefile
index 4424ee7..fbf1b18 100644
--- a/Makefile
+++ b/Makefile
@@ -12,7 +12,7 @@ typo3DatabaseHost ?= "127.0.0.1"
 .PHONY: install
 install:
 	rm -rf .Build
-	COMPOSER_PROCESS_TIMEOUT=1000 composer require -vvv --dev --prefer-source typo3/cms="$(TYPO3_VERSION)"
+	COMPOSER_PROCESS_TIMEOUT=1000 composer require -vv --dev --prefer-source typo3/cms="$(TYPO3_VERSION)"
 
 	git checkout composer.json
 	mkdir -p $(TYPO3_WEB_DIR)/uploads $(TYPO3_WEB_DIR)/typo3temp