summaryrefslogtreecommitdiff
path: root/tests/test_tools/PradoGenericSelenium2Test.php
diff options
context:
space:
mode:
authorFabio Bas <ctrlaltca@gmail.com>2014-02-25 22:43:00 +0100
committerDavid <ottodavid@gmx.net>2014-08-21 17:26:44 +0200
commit3db08b4d991c02870d04f7198d65fd926805709c (patch)
tree8d98a63b4d51ababbb24eea9e3d7dab8150f068b /tests/test_tools/PradoGenericSelenium2Test.php
parent4b6d2eab3433bb42671b6b60c28a3ec0434d1983 (diff)
Ensure all tests have a proper doctype and html structure, to avoid browser's quirks mode
(cherry picked from commit a0d6864093cf13a96dafa8a47b5c43891b2b864f) Conflicts: tests/FunctionalTests/active-controls/protected/pages/ActivePanelTest.page tests/FunctionalTests/active-controls/protected/pages/PostLoadingTest.page
Diffstat (limited to 'tests/test_tools/PradoGenericSelenium2Test.php')
-rw-r--r--tests/test_tools/PradoGenericSelenium2Test.php22
1 files changed, 12 insertions, 10 deletions
diff --git a/tests/test_tools/PradoGenericSelenium2Test.php b/tests/test_tools/PradoGenericSelenium2Test.php
index b56fd9c8..77dd3ece 100644
--- a/tests/test_tools/PradoGenericSelenium2Test.php
+++ b/tests/test_tools/PradoGenericSelenium2Test.php
@@ -5,37 +5,39 @@ require_once 'PHPUnit/Extensions/Selenium2TestCase.php';
class PradoGenericSelenium2Test extends PHPUnit_Extensions_Selenium2TestCase
{
public static $browsers = array(
- /*
+/*
array(
'name' => 'Firefox on OSX',
- 'browser' => '*firefox',
+ 'browserName' => '*firefox',
'host' => '127.0.0.1',
'port' => 4444,
'timeout' => 30000,
),
+*/
array(
'name' => 'Chrome on OSX',
- 'browser' => '*chrome',
+ 'browserName' => '*googlechrome',
'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,
+ 'name' => 'Firefox on WindowsXP',
+ 'browserName' => '*firefox',
+ 'host' => '127.0.0.1',
+ 'port' => 4445,
),
- */
array(
'name' => 'Internet Explorer 8 on WindowsXP',
'browserName' => '*iehta',
'host' => '127.0.0.1',
- 'port' => 4444,
+ 'port' => 4445,
)
+*/
);
- static $baseurl='http://10.0.2.2/prado-master/tests/FunctionalTests/';
+ static $baseurl='http://192.168.44.82/prado-master/tests/FunctionalTests/';
static $timeout=5; //seconds
static $wait=1000; //msecs