Skip to content

Commit 2880971

Browse files
committed
MAGETWO-69379: use payment method name to make checkbox of agreements more unique #6207 #9717
- Merge Pull Request #9717 from teamneusta/magento2:issue-6207
2 parents 34b0747 + 3fc2f9e commit 2880971

File tree

206 files changed

+35350
-29881
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

206 files changed

+35350
-29881
lines changed

.travis.yml

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,12 @@ env:
2323
- TEST_SUITE=integration INTEGRATION_INDEX=3
2424
- TEST_SUITE=static
2525
- TEST_SUITE=js
26+
matrix:
27+
exclude:
28+
- php: 7.0
29+
env: TEST_SUITE=static
30+
- php: 7.0
31+
env: TEST_SUITE=js
2632
cache:
2733
apt: true
2834
directories:
@@ -33,7 +39,4 @@ cache:
3339
before_install: ./dev/travis/before_install.sh
3440
install: composer install --no-interaction --prefer-dist
3541
before_script: ./dev/travis/before_script.sh
36-
script:
37-
- test $TEST_SUITE = "static" && TEST_FILTER='--filter "Magento\\Test\\Php\\LiveCodeTest"' || true
38-
- if [ $TEST_SUITE != "js" ]; then phpunit -c dev/tests/$TEST_SUITE $TEST_FILTER; fi
39-
- if [ $TEST_SUITE == "js" ]; then grunt spec; fi
42+
script: ./dev/travis/script.sh

0 commit comments

Comments
 (0)