From 5f7653b0c72b6ffba36a48fc856054651536454d Mon Sep 17 00:00:00 2001
From: Carsten Brandt <mail@cebe.cc>
Date: Sun, 5 Jan 2014 12:49:37 +0100
Subject: [PATCH] run basic app functional tests within the main repo test
 chain

---
 .travis.yml            |  5 +++++
 apps/basic/.travis.yml | 12 ------------
 2 files changed, 5 insertions(+), 12 deletions(-)
 delete mode 100644 apps/basic/.travis.yml

diff --git a/.travis.yml b/.travis.yml
index 957efad..544f556 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -12,6 +12,7 @@ services:
   - mongodb
 
 install:
+# core framework:
   - composer self-update && composer --version
 #  - composer require satooshi/php-coveralls 0.6.* --dev --prefer-dist
   - composer install --prefer-dist
@@ -19,6 +20,9 @@ install:
   - tests/unit/data/travis/apc-setup.sh
   - tests/unit/data/travis/memcache-setup.sh
   - tests/unit/data/travis/cubrid-setup.sh
+# basic application:
+  - composer install --dev --prefer-dist -d apps/basic
+  - cd apps/basic && php vendor/bin/codecept build && cd ../..
 
 before_script:
   - echo 'elasticsearch version ' && curl http://localhost:9200/
@@ -29,6 +33,7 @@ before_script:
 
 script:
   - vendor/bin/phpunit --coverage-text --coverage-clover tests/unit/runtime/coveralls/clover.xml --verbose --exclude-group mssql,oci,wincache,xcache,zenddata,vendor
+  - cd apps/basic && php vendor/bin/codecept run functional && cd ../..
 
 #after_script:
 #  - php vendor/bin/coveralls
diff --git a/apps/basic/.travis.yml b/apps/basic/.travis.yml
deleted file mode 100644
index 0feafd5..0000000
--- a/apps/basic/.travis.yml
+++ /dev/null
@@ -1,12 +0,0 @@
-language: php
-
-php:
- - 5.5
- - 5.4
-
-before_script:
-  - composer install --dev --prefer-dist
-  - php vendor/bin/codecept build
-
-script:
-  - php vendor/bin/codecept run functional