Skip to content

Commit

Permalink
[Travis] Combined suites #1 and #2 into one
Browse files Browse the repository at this point in the history
  • Loading branch information
pamil committed Nov 18, 2015
1 parent 9551da2 commit 39a8cca
Show file tree
Hide file tree
Showing 5 changed files with 35 additions and 72 deletions.
21 changes: 7 additions & 14 deletions .travis.yml
Expand Up @@ -14,30 +14,23 @@ cache:

sudo: false

services:
- mongodb

matrix:
fast_finish: true

include:
- php: 5.6
env: TEST_SUITE=1
services: [mongodb]
- php: 5.6
env: TEST_SUITE=2

env: TEST_SUITE=no-javascript
- php: 5.6
env: TEST_SUITE=javascript
sudo: required

- php: 7.0
env: TEST_SUITE=1
- php: 7.0
env: TEST_SUITE=2

- php: 5.5
env: TEST_SUITE=1
services: [mongodb]
env: TEST_SUITE=no-javascript
- php: 5.5
env: TEST_SUITE=2
env: TEST_SUITE=no-javascript

before_install:
- mkdir -p $SYLIUS_CACHE_DIR
Expand All @@ -47,7 +40,7 @@ before_install:

- composer self-update

- if [ $TRAVIS_PHP_VERSION != "7.0" ] && [ $TEST_SUITE = 1 ]; then travis/prepare/prepare-mongodb; fi
- if [ $TRAVIS_PHP_VERSION != "7.0" ] && [ $TEST_SUITE = "no-javascript" ]; then travis/prepare/prepare-mongodb; fi

- composer install --prefer-source --no-interaction

Expand Down
1 change: 0 additions & 1 deletion src/Sylius/Bundle/CoreBundle/Resources/config/services.xml
Expand Up @@ -526,7 +526,6 @@
<argument type="service" id="sylius.sql_logger.purger" />
</service>


<!-- Data fetchers -->
<service id="sylius.form.type.data_fetcher.user_registration" class="%sylius.form.type.data_fetcher.user_registration.class%">
<tag name="form.type" alias="sylius_data_fetcher_user_registration" />
Expand Down
29 changes: 0 additions & 29 deletions travis/suites/suite-1

This file was deleted.

28 changes: 0 additions & 28 deletions travis/suites/suite-2

This file was deleted.

28 changes: 28 additions & 0 deletions travis/suites/suite-no-javascript
@@ -0,0 +1,28 @@
#!/bin/bash
bin/phpspec run -f dot

bin/behat --strict -f progress -s account
bin/behat --strict -f progress -s cart
bin/behat --strict -f progress -s currencies
bin/behat --strict -f progress -s dashboard
bin/behat --strict -f progress -s homepage
bin/behat --strict -f progress -s inventory
bin/behat --strict -f progress -s localization
bin/behat --strict -f progress -s oauth
bin/behat --strict -f progress -s reports
bin/behat --strict -f progress -s taxonomies
bin/behat --strict -f progress -s users
bin/behat --strict -f progress -s search
bin/behat --strict -f progress -s checkout
bin/behat --strict -f progress -s addressing
bin/behat --strict -f progress -s emails
bin/behat --strict -f progress -s orders
bin/behat --strict -f progress -s payments
bin/behat --strict -f progress -s pricing
bin/behat --strict -f progress -s settings
bin/behat --strict -f progress -s shipping
bin/behat --strict -f progress -s taxation
bin/behat --strict -f progress -s i18n
bin/behat --strict -f progress -s channels
bin/behat --strict -f progress -s products
bin/behat --strict -f progress -s promotions

0 comments on commit 39a8cca

Please sign in to comment.