Skip to content

Commit

Permalink
MAGETWO-69379: use payment method name to make checkbox of agreements…
Browse files Browse the repository at this point in the history
… more unique #6207 #9717

 - Merge Pull Request #9717 from teamneusta/magento2:issue-6207
  • Loading branch information
ishakhsuvarov committed May 25, 2017
2 parents 34b0747 + 3fc2f9e commit 2880971
Show file tree
Hide file tree
Showing 206 changed files with 35,350 additions and 29,881 deletions.
11 changes: 7 additions & 4 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,12 @@ env:
- TEST_SUITE=integration INTEGRATION_INDEX=3
- TEST_SUITE=static
- TEST_SUITE=js
matrix:
exclude:
- php: 7.0
env: TEST_SUITE=static
- php: 7.0
env: TEST_SUITE=js
cache:
apt: true
directories:
Expand All @@ -33,7 +39,4 @@ cache:
before_install: ./dev/travis/before_install.sh
install: composer install --no-interaction --prefer-dist
before_script: ./dev/travis/before_script.sh
script:
- test $TEST_SUITE = "static" && TEST_FILTER='--filter "Magento\\Test\\Php\\LiveCodeTest"' || true
- if [ $TEST_SUITE != "js" ]; then phpunit -c dev/tests/$TEST_SUITE $TEST_FILTER; fi
- if [ $TEST_SUITE == "js" ]; then grunt spec; fi
script: ./dev/travis/script.sh
Loading

0 comments on commit 2880971

Please sign in to comment.