From 32dfd8233520261483bdf30f23425e3b50f05d17 Mon Sep 17 00:00:00 2001 From: Fabio Bas Date: Fri, 28 Feb 2014 10:39:25 +0100 Subject: Ported all tests from Selenium1 (RC) to Selenium2 (WebDriver) using a compatibility layer (cherry picked from commit 82774aa0a41562a325f31c901584ec01c8238573) Conflicts: tests/FunctionalTests/active-controls/tests/AutoCompleteTestCase.php tests/FunctionalTests/active-controls/tests/CustomTemplateTestCase.php tests/FunctionalTests/tickets/tests/Ticket220TestCase.php tests/FunctionalTests/tickets/tests/Ticket719TestCase.php tests/FunctionalTests/tickets/tests/Ticket769TestCase.php tests/FunctionalTests/validators/tests/DataTypeValidatorTestCase.php --- tests/test_tools/PradoGenericSeleniumTest.php | 50 --------------------------- 1 file changed, 50 deletions(-) delete mode 100644 tests/test_tools/PradoGenericSeleniumTest.php (limited to 'tests/test_tools/PradoGenericSeleniumTest.php') diff --git a/tests/test_tools/PradoGenericSeleniumTest.php b/tests/test_tools/PradoGenericSeleniumTest.php deleted file mode 100644 index c3d3f4f0..00000000 --- a/tests/test_tools/PradoGenericSeleniumTest.php +++ /dev/null @@ -1,50 +0,0 @@ - 'Firefox on OSX', - 'browser' => '*firefox', - 'host' => '127.0.0.1', - 'port' => 4444, - 'timeout' => 30000, - ), -*/ - array( - 'name' => 'Chrome on OSX', - 'browser' => '*googlechrome', - 'host' => '127.0.0.1', - 'port' => 4444, - 'timeout' => 30000, - ), -/* - array( - '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' => 4445, - ), -*/ - ); - - static $baseurl='http://192.168.44.82/prado-master/tests/FunctionalTests/'; - - protected function setUp() - { - $this->shareSession(true); - $this->setBrowserUrl(static::$baseurl); - } - - protected function tearDown() - { - } -} \ No newline at end of file -- cgit v1.2.3