summaryrefslogtreecommitdiff
path: root/tests/test_tools
diff options
context:
space:
mode:
Diffstat (limited to 'tests/test_tools')
-rw-r--r--tests/test_tools/PradoGenericSelenium2Test.php22
-rw-r--r--tests/test_tools/PradoGenericSeleniumTest.php24
2 files changed, 25 insertions, 21 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
diff --git a/tests/test_tools/PradoGenericSeleniumTest.php b/tests/test_tools/PradoGenericSeleniumTest.php
index 66502210..c3d3f4f0 100644
--- a/tests/test_tools/PradoGenericSeleniumTest.php
+++ b/tests/test_tools/PradoGenericSeleniumTest.php
@@ -4,7 +4,7 @@ require_once 'PHPUnit/Extensions/SeleniumTestCase.php';
class PradoGenericSeleniumTest extends PHPUnit_Extensions_SeleniumTestCase
{
public static $browsers = array(
- /*
+/*
array(
'name' => 'Firefox on OSX',
'browser' => '*firefox',
@@ -12,33 +12,35 @@ class PradoGenericSeleniumTest extends PHPUnit_Extensions_SeleniumTestCase
'port' => 4444,
'timeout' => 30000,
),
+*/
array(
'name' => 'Chrome on OSX',
- 'browser' => '*chrome',
+ 'browser' => '*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',
+ 'browser' => '*firefox',
+ 'host' => '127.0.0.1',
+ 'port' => 4445,
),
- */
array(
'name' => 'Internet Explorer 8 on WindowsXP',
'browser' => '*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/';
protected function setUp()
{
-// $this->shareSession(true);
+ $this->shareSession(true);
$this->setBrowserUrl(static::$baseurl);
}