Merge pull request #150 from ezsystems/behat_platform_fix

[Travis] Update to use ezplatform and same updated approach that should ...

.travis.yml

@@ -16,30 +16,20 @@ branches:
   only:
     - master
 
-# Get ezpublish5 repo, and use it as the build dir
-before_install:
+# Setup system for behat testing
+before_script:
+  # Change local git repo to be a full one as we will reuse current checkout for composer install below
+  - git fetch --unshallow && git checkout -b tmp_travis_branch
   - export BRANCH_BUILD_DIR=$TRAVIS_BUILD_DIR
-  - export TRAVIS_BUILD_DIR="$HOME/build/ezpublish-community"
+  - export TRAVIS_BUILD_DIR="$HOME/build/ezplatform"
   - cd "$HOME/build"
 
-  # Change the branch and/or remote to use a different ezpublish-community branch
-  - git clone --depth 1 --single-branch --branch master https://github.com/ezsystems/ezpublish-community.git
-  - cd ezpublish-community
-
-  # Use this if you depend on another branch for a dependency (only works for the ezsystems remote)
-  # (note that packagist may take time to update the references, leading to errors. Just retrigger the build)
-  #- composer require --no-update dev-MyCustomBranch
-  - ./bin/.travis/prepare_system.sh
-  - ./bin/.travis/prepare_sahi.sh
-
-# setup requirements for running tests
-before_script:
-  - ./bin/.travis/prepare_ezpublish.sh
+  # Checkout meta repo, change the branch and/or remote to use a different ezpublish branch/distro
+  - git clone --depth 1 --single-branch --branch master https://github.com/ezsystems/ezplatform.git
+  - cd ezplatform
 
-  # Replace demobundle with the one from pull-request
-  - rm -rf vendor/ezsystems/demobundle/EzSystems/DemoBundle && mv "$BRANCH_BUILD_DIR" vendor/ezsystems/demobundle/EzSystems/DemoBundle
-  - php ezpublish/console cache:clear --env=behat --no-debug
-  - php ezpublish/console assetic:dump --env=behat --no-debug
+  # Install everything needed for behat testing, using our local branch of this repo
+  - ./bin/.travis/setup_from_external_repo.sh $BRANCH_BUILD_DIR "ezsystems/demobundle:dev-tmp_travis_branch"
 
 # execute behat as the script command
 script: