From 32dfd8233520261483bdf30f23425e3b50f05d17 Mon Sep 17 00:00:00 2001
From: Fabio Bas <ctrlaltca@gmail.com>
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
---
 .../features/protected/pages/I18N/BasicI18N.php          | 16 ++++++++--------
 tests/FunctionalTests/features/tests/MyTestCase.php      |  4 ++--
 2 files changed, 10 insertions(+), 10 deletions(-)

(limited to 'tests/FunctionalTests/features')

diff --git a/tests/FunctionalTests/features/protected/pages/I18N/BasicI18N.php b/tests/FunctionalTests/features/protected/pages/I18N/BasicI18N.php
index d4a98e26..49a5db93 100755
--- a/tests/FunctionalTests/features/protected/pages/I18N/BasicI18N.php
+++ b/tests/FunctionalTests/features/protected/pages/I18N/BasicI18N.php
@@ -22,23 +22,23 @@ class BasicI18N extends TPage
  * @version $Revision: 1.66 $  $Date: ${DATE} ${TIME} $
  * @package ${package}
  *//*
-class BasicI18NTestCase extends PradoGenericSeleniumTest
+class BasicI18NTestCase extends PradoGenericSelenium2Test
 {
 	function setup()
 	{
 		$page = Prado::getApplication()->getTestPage(__FILE__);
-		$this->open($page);
+		$this->url($page);
 	}
 
 	function testI18N()
 	{
 		$this->verifyTitle("Basic I18N Test", "");
-		$this->verifyTextPresent("Hello", "");
-		$this->verifyTextPresent("US$10,000.00", "");
-		$this->verifyTextPresent("2006年1月15日 上午12时00分00秒", "");
-		$this->verifyTextPresent("None", "");
-		$this->verifyTextPresent("One thing.", "");
-		$this->verifyTextPresent("Many things.", "");
+		$this->assertTextPresent("Hello", "");
+		$this->assertTextPresent("US$10,000.00", "");
+		$this->assertTextPresent("2006年1月15日 上午12时00分00秒", "");
+		$this->assertTextPresent("None", "");
+		$this->assertTextPresent("One thing.", "");
+		$this->assertTextPresent("Many things.", "");
 	}
 }
 */
\ No newline at end of file
diff --git a/tests/FunctionalTests/features/tests/MyTestCase.php b/tests/FunctionalTests/features/tests/MyTestCase.php
index 92b0886a..682462fe 100755
--- a/tests/FunctionalTests/features/tests/MyTestCase.php
+++ b/tests/FunctionalTests/features/tests/MyTestCase.php
@@ -1,10 +1,10 @@
 <?php
 
-class MyTestCase extends PradoGenericSeleniumTest
+class MyTestCase extends PradoGenericSelenium2Test
 {
 	function test1()
 	{
-		$this->open('http://127.0.0.1');
+		$this->url('http://127.0.0.1');
 		$this->assertTextNotPresent('asd');
 	}
 }
-- 
cgit v1.2.3