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-03-27 09:50:46 +01:00
commit 892311234b
1 changed files with 13 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
test/selenium/TestBase.php
View File

@ -138,6 +138,19 @@ abstract class PMA_SeleniumBase extends PHPUnit_Extensions_Selenium2TestCase
}
}
/**
* Sets session with setting URL to workaround phpunit-selenium issue
* https://github.com/sebastianbergmann/phpunit-selenium/issues/295
*
* @return session object
*/
public function prepareSession()
{
$result = parent::prerareSession();
$this->url('');
return $result;
}
/**
* Configures the selenium and database link.
*
@ -159,7 +172,6 @@ abstract class PMA_SeleniumBase extends PHPUnit_Extensions_Selenium2TestCase
parent::setUp();
$this->setBrowserUrl($GLOBALS['TESTSUITE_URL']);
$this->url('');
$this->_mysqli = new mysqli(
$GLOBALS['TESTSUITE_SERVER'],
$GLOBALS['TESTSUITE_USER'],