From 4b6d2eab3433bb42671b6b60c28a3ec0434d1983 Mon Sep 17 00:00:00 2001 From: Fabio Bas Date: Mon, 24 Feb 2014 23:39:28 +0100 Subject: Cross-browser tests (cherry picked from commit b340ed9cc57f327785ebc0c1b8fb725ffb02d647) --- tests/test_tools/PradoGenericSelenium2Test.php | 36 ++++++++++++++++++++++--- tests/test_tools/PradoGenericSeleniumTest.php | 37 +++++++++++++++++++++++--- 2 files changed, 66 insertions(+), 7 deletions(-) (limited to 'tests') diff --git a/tests/test_tools/PradoGenericSelenium2Test.php b/tests/test_tools/PradoGenericSelenium2Test.php index d6cac6d1..b56fd9c8 100644 --- a/tests/test_tools/PradoGenericSelenium2Test.php +++ b/tests/test_tools/PradoGenericSelenium2Test.php @@ -4,14 +4,44 @@ require_once 'PHPUnit/Extensions/Selenium2TestCase.php'; // TODO: stub class PradoGenericSelenium2Test extends PHPUnit_Extensions_Selenium2TestCase { - static $browser='firefox'; - static $baseurl='http://127.0.0.1/prado-master/tests/FunctionalTests/'; + public static $browsers = array( + /* + array( + 'name' => 'Firefox on OSX', + 'browser' => '*firefox', + 'host' => '127.0.0.1', + 'port' => 4444, + 'timeout' => 30000, + ), + array( + 'name' => 'Chrome on OSX', + 'browser' => '*chrome', + 'host' => '127.0.0.1', + 'port' => 4444, + 'timeout' => 30000, + ), + array( + 'name' => 'Internet Explorer 11 on Windows8.1', + 'browser' => '*iexplore', + 'host' => '192.168.253.39', + 'port' => 4444, + ), + */ + array( + 'name' => 'Internet Explorer 8 on WindowsXP', + 'browserName' => '*iehta', + 'host' => '127.0.0.1', + 'port' => 4444, + ) + ); + + static $baseurl='http://10.0.2.2/prado-master/tests/FunctionalTests/'; + static $timeout=5; //seconds static $wait=1000; //msecs protected function setUp() { - $this->setBrowser(static::$browser); $this->setBrowserUrl(static::$baseurl); $this->setSeleniumServerRequestsTimeout(static::$timeout); } diff --git a/tests/test_tools/PradoGenericSeleniumTest.php b/tests/test_tools/PradoGenericSeleniumTest.php index 48702387..66502210 100644 --- a/tests/test_tools/PradoGenericSeleniumTest.php +++ b/tests/test_tools/PradoGenericSeleniumTest.php @@ -3,13 +3,42 @@ require_once 'PHPUnit/Extensions/SeleniumTestCase.php'; class PradoGenericSeleniumTest extends PHPUnit_Extensions_SeleniumTestCase { - static $browser='*firefox'; - static $baseurl='http://127.0.0.1/prado-master/tests/FunctionalTests/'; + public static $browsers = array( + /* + array( + 'name' => 'Firefox on OSX', + 'browser' => '*firefox', + 'host' => '127.0.0.1', + 'port' => 4444, + 'timeout' => 30000, + ), + array( + 'name' => 'Chrome on OSX', + 'browser' => '*chrome', + 'host' => '127.0.0.1', + 'port' => 4444, + 'timeout' => 30000, + ), + array( + 'name' => 'Internet Explorer 11 on Windows8.1', + 'browser' => '*iexplore', + 'host' => '192.168.253.39', + 'port' => 4444, + ), + */ + array( + 'name' => 'Internet Explorer 8 on WindowsXP', + 'browser' => '*iehta', + 'host' => '127.0.0.1', + 'port' => 4444, + ) + ); + + static $baseurl='http://10.0.2.2/prado-master/tests/FunctionalTests/'; protected function setUp() { - $this->shareSession(true); - $this->setBrowser(static::$browser); +// $this->shareSession(true); $this->setBrowserUrl(static::$baseurl); } -- cgit v1.2.3