Merge from 3.0 branch till 1350.

2 files changed, 14 insertions, 14 deletions

diff --git a/tests/FunctionalTests/tickets/protected/pages/Ticket278.page b/tests/FunctionalTests/tickets/protected/pages/Ticket278.page
index 75aed4d9..e7341bcc 100644
--- a/tests/FunctionalTests/tickets/protected/pages/Ticket278.page
+++ b/tests/FunctionalTests/tickets/protected/pages/Ticket278.page
@@ -4,16 +4,16 @@
 	<com:TTextBox ID="text1" />

 	<com:TRequiredFieldValidator

 		ID="validator1"

-		ControlToValidate="text1" 

+		ControlToValidate="text1"

 		ErrorMessage="Text 1 is required" />

 	<div>

 	<com:TCheckBox ID="check1" Text="More..." />

 	</div>

-	

-	<com:TPanel ID="panel1" Style="display:none" > 

+

+	<com:TPanel ID="panel1" Style="display:none" >

 		<com:TLabel ForControl="text2" Text="Text 2:" />

 		<com:TTextBox ID="text2" />

-		

+

 	<com:TRequiredFieldValidator

 		ID="validator2"

 		ControlToValidate="text2"

@@ -21,14 +21,14 @@
 		OnPreRender="validate2_onPostValidate"

 		ErrorMessage="Text 2 is required">

 	<prop:ClientSide.OnValidate>

-		validator.enabled = $("<%= $this->check1->ClientID %>").checked;

+		sender.enabled = $("<%= $this->check1->ClientID %>").checked;

 	</prop:ClientSide.OnValidate>

-	</com:TRequiredFieldValidator>	

-	

+	</com:TRequiredFieldValidator>

+

 	</com:TPanel>

-	

+

 	<com:TButton ID="button1" Text="Submit!" />

-	

+

 	<com:TClientScript>

 	Event.OnLoad(function()

 	{

diff --git a/tests/FunctionalTests/tickets/tests/Ticket274TestCase.php b/tests/FunctionalTests/tickets/tests/Ticket274TestCase.php
index ae976a7f..6a5ae0ff 100644
--- a/tests/FunctionalTests/tickets/tests/Ticket274TestCase.php
+++ b/tests/FunctionalTests/tickets/tests/Ticket274TestCase.php
@@ -9,15 +9,15 @@ class Ticket274TestCase extends SeleniumTestCase
 		$this->assertTitle('Verifying Ticket 274');

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

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

-		

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

+

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

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

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

-		

+

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

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

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

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

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

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

 	}

 }