gian/phpmyadmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
Weblate 2014-04-01 15:59:19 +02:00
commit 3ac957267e
3 changed files with 15 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
.travis.yml
View File

@ -18,6 +18,7 @@ env:
- TESTSUITE_BROWSERSTACK_USER=phpMyAdmin
- TESTSUITE_USER=root
- TESTSUITE_PASSWORD=root
- TESTSUITE_SELENIUM_COVERAGE=http://127.0.0.1:8000/phpunit_coverage.php
before_script:
- mysql -uroot -e "SET PASSWORD = PASSWORD('$TESTSUITE_PASSWORD')" ;
- if [[ -z "$LINT" ]] ; then
@ -42,6 +43,13 @@ before_script:
if [[ ! -z "$SELENIUM" ]] ; then
find ~/.phpenv/versions ;
ln -s ~/.phpenv/versions/$(phpenv version-name)/usr/share/php/PHPUnit/Extensions/SeleniumCommon/phpunit_coverage.php . ;
echo auto_prepend_file = ~/.phpenv/versions/$(phpenv version-name)/usr/share/php/PHPUnit/Extensions/SeleniumCommon/prepend.php >> ~/.phpenv/versions/$(phpenv version-name)/etc/php.ini ;
echo auto_append_file = ~/.phpenv/versions/$(phpenv version-name)/usr/share/php/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 ;
java -jar BrowserStackTunnel.jar -localIdentifier "travis-$TRAVIS_JOB_NUMBER" -onlyAutomate "$TESTSUITE_BROWSERSTACK_KEY" 127.0.0.1,8000,0 &

1
test/bootstrap-dist.php
View File

@ -29,6 +29,7 @@ $test_defaults = array(
'TESTSUITE_SELENIUM_HOST' => '',
'TESTSUITE_SELENIUM_PORT' => '4444',
'TESTSUITE_SELENIUM_BROWSER' => 'firefox',
'TESTSUITE_SELENIUM_COVERAGE' => '',
'TESTSUITE_BROWSERSTACK_USER' => '',
'TESTSUITE_BROWSERSTACK_KEY' => '',
'TESTSUITE_FULL' => '',

7
test/selenium/TestBase.php
View File

@ -157,7 +157,12 @@ abstract class PMA_SeleniumBase extends PHPUnit_Extensions_Selenium2TestCase
public function prepareSession()
{
$result = parent::prepareSession();
$this->url('');
if (! empty($GLOBALS['TESTSUITE_SELENIUM_COVERAGE'])) {
$this->coverageScriptUrl = $GLOBALS['TESTSUITE_SELENIUM_COVERAGE'];
$this->url($this->coverageScriptUrl);
} else {
$this->url('');
}
return $result;
}