Merge remote-tracking branch 'refs/remotes/pma/master'
This commit is contained in:
commit
4ebadff98e
10
.travis.yml
10
.travis.yml
@ -35,7 +35,7 @@ before_script:
|
||||
phpenv config-add test/travis.php.ini ;
|
||||
|
||||
pear channel-discover pear.phpunit.de ;
|
||||
pear -v install phpunit/PHPUnit_Selenium ;
|
||||
pear install phpunit/PHPUnit_Selenium ;
|
||||
|
||||
composer install --dev --no-interaction ;
|
||||
|
||||
@ -43,12 +43,10 @@ before_script:
|
||||
|
||||
if [[ ! -z "$SELENIUM" ]] ; then
|
||||
|
||||
find ~/.phpenv ;
|
||||
ln -s ~/.phpenv/versions/$(phpenv version-name)/bin/phpunit/phpunit/PHPUnit/Extensions/SeleniumCommon/phpunit_coverage.php . ;
|
||||
|
||||
ln -s ~/.phpenv/versions/$(phpenv version-name)/pear/PHPUnit/Extensions/SeleniumCommon/phpunit_coverage.php . ;
|
||||
|
||||
echo auto_prepend_file = ~/.phpenv/versions/$(phpenv version-name)/pear/PHPUnit/Extensions/SeleniumCommon/prepend.php >> ~/.phpenv/versions/$(phpenv version-name)/etc/php.ini ;
|
||||
echo auto_append_file = ~/.phpenv/versions/$(phpenv version-name)/pear/PHPUnit/Extensions/SeleniumCommon/append.php >> ~/.phpenv/versions/$(phpenv version-name)/etc/php.ini ;
|
||||
echo auto_prepend_file = ~/.phpenv/versions/$(phpenv version-name)/bin/phpunit/phpunit/PHPUnit/Extensions/SeleniumCommon/prepend.php >> ~/.phpenv/versions/$(phpenv version-name)/etc/php.ini ;
|
||||
echo auto_append_file = ~/.phpenv/versions/$(phpenv version-name)/bin/phpunit/phpunit/PHPUnit/Extensions/SeleniumCommon/append.php >> ~/.phpenv/versions/$(phpenv version-name)/etc/php.ini ;
|
||||
|
||||
php --server 127.0.0.1:8000 &
|
||||
wget http://www.browserstack.com/BrowserStackTunnel.jar ;
|
||||
|
||||
Loading…
Reference in New Issue
Block a user