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-02-17 18:23:31 +01:00
commit 85138a81df
2 changed files with 5 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
phpunit.xml.nocoverage
View File

@ -31,6 +31,7 @@
</testsuite>
<testsuite name="Selenium">
<file>test/selenium/PmaSeleniumLoginTest.php</file>
<file>test/selenium/PmaSeleniumXssTest.php</file>
<!--<directory suffix="Test.php">test/selenium</directory>-->
</testsuite>
</testsuites>

29
test/selenium/PmaSeleniumXssTest.php
View File

@ -7,7 +7,7 @@
* @subpackage Selenium
*/
require_once 'Helper.php';
require_once 'TestBase.php';
/**
* PmaSeleniumXSSTest class
@ -15,29 +15,8 @@ require_once 'Helper.php';
* @package PhpMyAdmin-test
* @subpackage Selenium
*/
class PmaSeleniumXSSTest extends PHPUnit_Extensions_Selenium2TestCase
class PmaSeleniumXSSTest extends PMA_SeleniumBase
{
/**
* Helper Object
*
* @var Helper
*/
private $_helper;
/**
* Setup the browser environment to run the selenium test case
*
* @return void
*/
public function setUp()
{
$this->_helper = new Helper($this);
$this->setBrowser($this->_helper->getBrowserString());
$this->setBrowserUrl(
TESTSUITE_PHPMYADMIN_HOST . TESTSUITE_PHPMYADMIN_URL
);
}
/**
* Tests the SQL query tab with a null query
*
@ -45,9 +24,9 @@ class PmaSeleniumXSSTest extends PHPUnit_Extensions_Selenium2TestCase
*/
public function testQueryTabWithNullValue()
{
$this->_helper->login(TESTSUITE_USER, TESTSUITE_PASSWORD);
$this->login(TESTSUITE_USER, TESTSUITE_PASSWORD);
$this->byLinkText("SQL")->click();
$this->_helper->waitForElement("byId", "queryboxf");
$this->waitForElement("byId", "queryboxf");
$this->byId("button_submit_query")->click();
$this->assertEquals("Missing value in the form!", $this->alertText());
}