Attempt to fix travis

des1roer · Aug 16, 2014 · 3913d64 · 3913d64
1 parent c0a8314
commit 3913d64
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 6 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -27,12 +27,17 @@ addons:
 
 install:
   - composer self-update && composer --version
+  - export PATH="$HOME/.composer/vendor/bin:$PATH"
 # core framework:
   - composer install --prefer-dist
   - tests/unit/data/travis/mongodb-setup.sh
   - tests/unit/data/travis/apc-setup.sh
   - tests/unit/data/travis/memcache-setup.sh
   - tests/unit/data/travis/cubrid-setup.sh
+# codeception
+  - composer global require "codeception/codeception=2.0.*"
+  - composer global require "codeception/specify=*"
+  - composer global require "codeception/verify=*"
 # basic and advanced application:
   - tests/unit/data/travis/setup-apps.sh
 

diff --git a/tests/unit/data/travis/setup-apps.sh b/tests/unit/data/travis/setup-apps.sh
@@ -7,22 +7,20 @@ else
     # basic application:
 
     composer install --dev --prefer-dist -d apps/basic
-    cd apps/basic && composer require --dev codeception/codeception:2.0.* codeception/specify:* codeception/verify:*
     sed -i "s/'cookieValidationKey' => ''/'cookieValidationKey' => 'testkey'/" config/web.php
-    cd tests && php vendor/bin/codecept build && cd ../../..
+    cd tests && codecept build && cd ../../..
 
 
     # advanced application:
 
     composer install --dev --prefer-dist -d apps/advanced
-    cd apps/advanced && composer require --dev codeception/codeception:2.0.* codeception/specify:* codeception/verify:*
     ./init --env=Development
     sed -i s/root/travis/ common/config/main-local.php
     sed -i "s/'cookieValidationKey' => ''/'cookieValidationKey' => 'testkey'/" frontend/config/main.php
     sed -i "s/'cookieValidationKey' => ''/'cookieValidationKey' => 'testkey'/" backend/config/main.php
-    cd tests/codeception/backend && php ../../../vendor/bin/codecept build
-    cd ../../../common && php ../../../vendor/bin/codecept build
-    cd ../../../frontend && php ../../../vendor/bin/codecept build && cd ../../../../../..
+    cd tests/codeception/backend && codecept build
+    cd ../../../common && codecept build
+    cd ../../../frontend && codecept build && cd ../../../../../..
 
     # boot server
     cd apps && php -S localhost:8080 > /dev/null 2>&1 &