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 2017-07-17 13:40:08 +02:00
commit a52ec0b0bb
2 changed files with 30 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
test/README.rst
View File

@ -57,3 +57,31 @@ For example you can use following setup in ``phpunit.xml``::
<env name="TESTSUITE_SELENIUM_HOST" value="127.0.0.1" />
<env name="TESTSUITE_SELENIUM_PORT" value="4444" />
</php>
Using BrowserStack
------------------
We're using BrowserStack to run our tests on the Travis CI. If you are a team
member, you can be granted access to the team account, but you can register own
account there as well.
To run tests locally, you need to install BrowserStack tool to enable local
testing, see their website for instructions:
https://www.browserstack.com/local-testing#command-line
Following instructions use PHP's built in server for the testing::
# Export BrowserStack credentials in the environment:
export TESTSUITE_BROWSERSTACK_USER=your_username
export TESTSUITE_BROWSERSTACK_KEY=your_key
# Port where tests will be running
export TESTSUITE_PORT=9000
export TESTSUITE_URL=http://127.0.0.1:$TESTSUITE_PORT/
# Start PHP built in server
php --server 127.0.0.1:$TESTSUITE_PORT > php.log &
# Start BrowserStack Local client to forward the traffic
~/browserstack/BrowserStackLocal -localIdentifier Manual "$TESTSUITE_BROWSERSTACK_KEY" 127.0.0.1,$TESTSUITE_PORT,0 &

3
test/selenium/TestBase.php
View File

@ -57,11 +57,12 @@ abstract class PMA_SeleniumBase extends PHPUnit_Extensions_Selenium2TestCase
self::$_selenium_enabled = true;
$strategy = 'shared';
$build_local = false;
$build_local = true;
$build_id = 'Manual';
$project_name = 'phpMyAdmin';
if (getenv('BUILD_TAG')) {
$build_id = getenv('BUILD_TAG');
$build_local = false;
$strategy = 'isolated';
$project_name = 'phpMyAdmin (Jenkins)';
} elseif (getenv('TRAVIS_JOB_NUMBER')) {