Skip to content

Commit 6b3121c

Browse files
authored
Merge pull request #15 from OpenBuildings/tests-update
Update tests configuration and build matrix
2 parents 7667492 + a055b59 commit 6b3121c

File tree

6 files changed

+32
-10
lines changed

6 files changed

+32
-10
lines changed

.gitignore

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,7 @@
11
.DS_Store
22

33
/vendor/
4-
/build/
4+
/build/
5+
6+
# Local configuration
7+
/phpunit.xml

.travis.yml

Lines changed: 23 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,29 @@ language: php
33
sudo: false
44

55
php:
6+
- 5.3
67
- 5.4
78
- 5.5
89
- 5.6
9-
- 7
10+
- 7.0
11+
- 7.1
1012
- hhvm
1113

14+
env:
15+
- DEPS=normal
16+
- DEPS=highest
17+
- DEPS=lowest
18+
19+
matrix:
20+
fast_finish: true
21+
exclude:
22+
- php: hhvm
23+
env: DEPS=lowest
24+
25+
branches:
26+
only:
27+
- master
28+
1229
cache:
1330
directories:
1431
- $HOME/.composer/cache
@@ -18,17 +35,18 @@ notifications:
1835
slack:
1936
secure: ixWu6kWtNIlzzdImpu4MdvGYpA6ZPp/dQpMAp6FDO2oHHB55J9ossBYtVtBXPCDs9OxqfQl2yqbE+TkhfIfkZqIbhvX2+CiIomvYSKZDvryUlCfbfV29behmSVIVYvg3b8Tba+nAyZeJA2guUyAy02WGr3n4I+PDgZC3Wa/mv94=
2037

21-
before_install:
22-
- composer selfupdate
38+
before_install: travis_retry composer selfupdate
2339

2440
install:
25-
- composer install
41+
- if [ "$DEPS" = "normal" ]; then travis_retry composer install --no-interaction; fi;
42+
- if [ "$DEPS" = "highest" ]; then travis_retry composer update --no-interaction; fi;
43+
- if [ "$DEPS" = "lowest" ]; then travis_retry composer update --no-interaction --prefer-lowest --prefer-stable; fi;
2644

2745
before_script:
2846
- mkdir -p build/logs
2947

3048
script:
31-
- ./vendor/bin/phpunit --coverage-clover build/logs/clover.xml
49+
- ./vendor/bin/phpunit --stop-on-error --stop-on-failure --coverage-clover build/logs/clover.xml
3250

3351
after_script:
3452
- test -e build/logs/clover.xml && wget https://scrutinizer-ci.com/ocular.phar

composer.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,8 @@
1515
"tijsverkoyen/css-to-inline-styles": "^1.5"
1616
},
1717
"require-dev" : {
18-
"phpunit/phpunit": "^4.0|^5.0"
18+
"phpunit/phpunit": "^4.0|^5.0",
19+
"symfony/css-selector": "^2.0.5|^3.0"
1920
},
2021
"autoload": {
2122
"psr-4": {

composer.lock

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.
File renamed without changes.

tests/src/CssInlinerPluginTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -113,7 +113,7 @@ public function testInjectedConverterIsUsedInsteadOfDefault()
113113
{
114114
$converterStub = $this
115115
->getMockBuilder('TijsVerkoyen\CssToInlineStyles\CssToInlineStyles')
116-
->setMethods(['convert', 'setUseInlineStylesBlock'])
116+
->setMethods(array('convert', 'setUseInlineStylesBlock'))
117117
->getMock();
118118

119119
// "our" converter should be used

0 commit comments

Comments
 (0)