merge from 3.0 branch till 1463.

3 files changed, 22 insertions, 13 deletions

diff --git a/tests/FunctionalTests/tickets/tests/Ticket21TestCase.php b/tests/FunctionalTests/tickets/tests/Ticket21TestCase.php
index d9677779..394f8c95 100644
--- a/tests/FunctionalTests/tickets/tests/Ticket21TestCase.php
+++ b/tests/FunctionalTests/tickets/tests/Ticket21TestCase.php
@@ -4,6 +4,9 @@ class Ticket21TestCase extends SeleniumTestCase
 {

 	function test()

 	{

+		//problem with test runner clicking on radio buttons

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

+

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

 		$this->assertTitle("Verifying Ticket 21");

 		$this->clickAndWait("ctl0_Content_button1");

diff --git a/tests/FunctionalTests/tickets/tests/Ticket225TestCase.php b/tests/FunctionalTests/tickets/tests/Ticket225TestCase.php
index 966e8383..e8c0f612 100644
--- a/tests/FunctionalTests/tickets/tests/Ticket225TestCase.php
+++ b/tests/FunctionalTests/tickets/tests/Ticket225TestCase.php
@@ -4,18 +4,21 @@ class Ticket225TestCase extends SeleniumTestCase
 {
 	function test()
 	{
+		//problem with test runner clicking on radio buttons
+		$this->skipBrowsers(self::OPERA);
+
 		$base="ctl0_Content_";
 		$this->open('tickets/index.php?page=Ticket225');
 		$this->assertTextPresent('RadioButton Group Tests');
 		$this->assertText("{$base}label1", "Label 1");
-		
+
 		$this->assertNotVisible("{$base}validator1");
 		$this->click("{$base}button4");
 		$this->assertVisible("{$base}validator1");
-		
+
 		$this->click("{$base}button2");
 		$this->clickAndWait("{$base}button4");
-		
+
 		$this->assertText("{$base}label1", 'ctl0$Content$button1 ctl0$Content$button2 ctl0$Content$button3');
 		$this->assertNotVisible("{$base}validator1");
 	}
diff --git a/tests/FunctionalTests/tickets/tests/Ticket278TestCase.php b/tests/FunctionalTests/tickets/tests/Ticket278TestCase.php
index bd631c14..6e3666b9 100644
--- a/tests/FunctionalTests/tickets/tests/Ticket278TestCase.php
+++ b/tests/FunctionalTests/tickets/tests/Ticket278TestCase.php
@@ -4,47 +4,50 @@ class Ticket278TestCase extends SeleniumTestCase
 {

 	function test()

 	{

+		//problem with test runner clicking on radio buttons

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

+

 		$base = 'ctl0_Content_';

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

 		$this->assertTitle('Verifying Ticket 278');

 		$this->assertNotVisible($base.'validator1');

 		$this->assertNotVisible($base.'validator2');

 		$this->assertNotVisible($base.'panel1');

-		

-		$this->click($base.'button1');		

+

+		$this->click($base.'button1');

 		$this->assertVisible($base.'validator1');

 		$this->assertNotVisible($base.'validator2');

-		

+

 		$this->type($base.'text1', 'asd');

 		$this->clickAndWait($base.'button1');

 		$this->assertNotVisible($base.'validator1');

 		$this->assertNotVisible($base.'validator2');

 		$this->assertNotVisible($base.'panel1');

-		

+

 		$this->click($base.'check1');

 		$this->click($base.'button1');

 		$this->assertNotVisible($base.'validator1');

 		$this->assertVisible($base.'validator2');

 		$this->assertVisible($base.'panel1');

-		

-		

+

+

 		$this->type($base.'text1', '');

 		$this->type($base.'text2', 'asd');

 		$this->click($base.'button1');

 		$this->assertVisible($base.'validator1');

 		$this->assertNotVisible($base.'validator2');

 		$this->assertVisible($base.'panel1');

-		

-		

+

+

 		$this->type($base.'text1', 'asd');

 		$this->clickAndWait($base.'button1');

 		$this->assertNotVisible($base.'validator1');

 		$this->assertNotVisible($base.'validator2');

 		$this->assertVisible($base.'panel1');

-		

+

 		$this->type($base.'text1', '');

 		$this->type($base.'text2', '');

-		$this->click($base.'button1');		

+		$this->click($base.'button1');

 		$this->assertVisible($base.'validator1');

 		$this->assertVisible($base.'validator2');

 		$this->assertVisible($base.'panel1');