merge from 3.0 branch till 1463.

4 files changed, 17 insertions, 5 deletions

diff --git a/tests/FunctionalTests/validators/tests/CheckBoxTestCase.php b/tests/FunctionalTests/validators/tests/CheckBoxTestCase.php
index 6783572d..41c588ee 100644
--- a/tests/FunctionalTests/validators/tests/CheckBoxTestCase.php
+++ b/tests/FunctionalTests/validators/tests/CheckBoxTestCase.php
@@ -4,6 +4,9 @@ class CheckBoxTestCase extends SeleniumTestCase
 {

 	function test()

 	{

+		//problem with test runner clicking on radio buttons

+		$this->skipBrowsers(self::OPERA);

+

 		$this->open('validators/index.php?page=CheckBox');

 

 

diff --git a/tests/FunctionalTests/validators/tests/ListControlTestCase.php b/tests/FunctionalTests/validators/tests/ListControlTestCase.php
index 76d84eff..37f35d1b 100644
--- a/tests/FunctionalTests/validators/tests/ListControlTestCase.php
+++ b/tests/FunctionalTests/validators/tests/ListControlTestCase.php
@@ -7,6 +7,9 @@ class ListControlTestCase extends SeleniumTestCase
 {

 	function test()

 	{

+		//problem with test runner clicking on radio buttons

+		$this->skipBrowsers(self::OPERA);

+

 		$base = "ctl0_Content_";

 		$this->open("validators/index.php?page=ListControl", "");

 		$this->verifyTextPresent("List Control Required Field Validation Test", "");

diff --git a/tests/FunctionalTests/validators/tests/RequiredFieldTestCase.php b/tests/FunctionalTests/validators/tests/RequiredFieldTestCase.php
index 41372b93..5ba23133 100644
--- a/tests/FunctionalTests/validators/tests/RequiredFieldTestCase.php
+++ b/tests/FunctionalTests/validators/tests/RequiredFieldTestCase.php
@@ -1,9 +1,12 @@
 <?php

 

-class RequiredFieldTestCase extends SeleniumTestCase 

+class RequiredFieldTestCase extends SeleniumTestCase

 {

 	function test()

 	{

+		//problem with test runner clicking on radio buttons

+		$this->skipBrowsers(self::OPERA);

+

 		$base = "ctl0_Content_";

 		$this->open("validators/index.php?page=RequiredFieldValidator");

 		$this->assertTextPresent("RequiredFieldValidator Tests");

@@ -45,11 +48,11 @@ class RequiredFieldTestCase extends SeleniumTestCase
 		$this->assertVisible("{$base}validator2");

 		$this->click("{$base}check2");

 		$this->clickAndWait("{$base}submit2");

-		

+

 		$this->type("{$base}text1", "Hello");

 		$this->click("{$base}check1");

 		$this->click("{$base}submit2");

-		

+

 		$this->assertNotVisible("{$base}validator5");

 		$this->assertNotVisible("{$base}validator6");

 		$this->assertNotVisible("{$base}validator7");

@@ -67,9 +70,9 @@ class RequiredFieldTestCase extends SeleniumTestCase
 		$this->assertNotVisible("{$base}validator5");

 		$this->assertNotVisible("{$base}validator6");

 		$this->assertNotVisible("{$base}validator7");

-		$this->assertNotVisible("{$base}validator8");		

+		$this->assertNotVisible("{$base}validator8");

 	}

-	

+

 	function testInitialValue()

 	{

 		$base = "ctl0_Content_";

diff --git a/tests/FunctionalTests/validators/tests/RequiredListTestCase.php b/tests/FunctionalTests/validators/tests/RequiredListTestCase.php
index 23e0f045..9f652583 100644
--- a/tests/FunctionalTests/validators/tests/RequiredListTestCase.php
+++ b/tests/FunctionalTests/validators/tests/RequiredListTestCase.php
@@ -5,6 +5,9 @@ class RequiredListTestCase extends SeleniumTestCase
 

 	function test()

 	{

+		//problem with test runner clicking on radio buttons

+		$this->skipBrowsers(self::OPERA);

+

 		$base = "ctl0_Content_";

 		$this->open("validators/index.php?page=RequiredListValidator");

 		$this->click("{$base}submit1");