All FunctionalTests are working in IE and FF

2 files changed, 8 insertions, 8 deletions

diff --git a/tests/FunctionalTests/quickstart_tests/Advanced/I18N.php b/tests/FunctionalTests/quickstart_tests/Advanced/I18N.php
index a0c8953f..3917b76d 100644
--- a/tests/FunctionalTests/quickstart_tests/Advanced/I18N.php
+++ b/tests/FunctionalTests/quickstart_tests/Advanced/I18N.php
@@ -5,43 +5,43 @@ class I18NTestCase extends SeleniumTestCase
 {

 	function test ()

 	{

-		$this->open("../../demos/quickstart/index.php?page=Advanced.Samples.I18N.Home", "");

+		$this->open("../../demos/quickstart/index.php?page=Advanced.Samples.I18N.Home&lang=en&functionaltest=true", "");

 		$this->verifyTitle("Internationlization in PRADO", "");

 		$this->verifyTextPresent("46.412,42 €", "");

 		$this->verifyTextPresent("$12.40", "");

 		$this->verifyTextPresent("€100.00", "");

 		$this->verifyTextPresent("December 6, 2004", "");

-		$this->clickAndWait("link=中文简体", "");

+		$this->open("../../demos/quickstart/index.php?page=Advanced.Samples.I18N.Home&lang=zh&functionaltest=true", "");

 		$this->verifyTitle("PRADO 国际化", "");

 		$this->verifyTextPresent("2004 十二月", "");

 		$this->verifyTextPresent("US$ 12.40", "");

 		$this->verifyTextPresent("46.412,42 €", "");

 		$this->verifyTextPresent("€100.00 ", "");

-		$this->clickAndWait("link=中文繁體", "");

+		$this->open("../../demos/quickstart/index.php?page=Advanced.Samples.I18N.Home&lang=zh_TW&functionaltest=true", "");

 		$this->verifyTitle("PRADO 國際化", "");

 		$this->verifyTextPresent("2004年12月6日", "");

 		$this->verifyTextPresent("US$12.40", "");

 		$this->verifyTextPresent("46.412,42 €", "");

 		$this->verifyTextPresent("€100.00", "");

-		$this->clickAndWait("link=Deutsch", "");

+		$this->open("../../demos/quickstart/index.php?page=Advanced.Samples.I18N.Home&lang=de&functionaltest=true", "");

 		$this->verifyTitle("Internationalisierung in PRADO", "");

 		$this->verifyTextPresent("6. Dezember 2004 ", "");

 		$this->verifyTextPresent("$ 12,40", "");

 		$this->verifyTextPresent("46.412,42 €", "");

 		$this->verifyTextPresent("€100.00", "");

-		$this->clickAndWait("link=Español", "");

+		$this->open("../../demos/quickstart/index.php?page=Advanced.Samples.I18N.Home&lang=es&functionaltest=true", "");

 		$this->verifyTitle("Internationlization en PRADO", "");

 		$this->verifyTextPresent("6 de diciembre de 2004", "");

 		$this->verifyTextPresent("US$12.40", "");

 		$this->verifyTextPresent("46.412,42 €", "");

 		$this->verifyTextPresent("€100.00", "");

-		$this->clickAndWait("link=Français", "");

+		$this->open("../../demos/quickstart/index.php?page=Advanced.Samples.I18N.Home&lang=fr&functionaltest=true", "");

 		$this->verifyTitle("Internationalisation dans PRADO", "");

 		$this->verifyTextPresent("6 décembre 2004", "");

 		$this->verifyTextPresent("12,40 $", "");

 		$this->verifyTextPresent("46.412,42 €", "");

 		$this->verifyTextPresent("€100.00", "");

-		$this->clickAndWait("link=Polska", "");

+		$this->open("../../demos/quickstart/index.php?page=Advanced.Samples.I18N.Home&lang=pl&functionaltest=true", "");

 		$this->verifyTitle("Internacjonalizacja w PRADO", "");

 		$this->verifyTextPresent("6 grudnia 2004", "");

 		$this->verifyTextPresent("US$ 12,40", "");

diff --git a/tests/FunctionalTests/quickstart_tests/Controls/RadioButtonTestCase.php b/tests/FunctionalTests/quickstart_tests/Controls/RadioButtonTestCase.php
index 24b5f6c9..bda7ca2d 100644
--- a/tests/FunctionalTests/quickstart_tests/Controls/RadioButtonTestCase.php
+++ b/tests/FunctionalTests/quickstart_tests/Controls/RadioButtonTestCase.php
@@ -18,7 +18,7 @@ class RadioButtonTestCase extends SeleniumTestCase
 		$this->verifyTextNotPresent("I'm clicked");

 		$this->clickAndWait("//input[@name='ctl0\$body\$ctl2' and @value='ctl0\$body\$ctl2']", "");

 		$this->verifyTextPresent("I'm clicked");

-		$this->clickAndWait("//input[@name='ctl0\$body\$ctl2' and @value='ctl0\$body\$ctl2']", "");

+		$this->click("//input[@name='ctl0\$body\$ctl2' and @value='ctl0\$body\$ctl2']", "");

 		$this->verifyTextPresent("I'm clicked");

 

 		// a radiobutton causing validation on a textbox