From c0239466d7e7142a67f6233169377b10fd93e6ec Mon Sep 17 00:00:00 2001
From: xue <>
Date: Fri, 1 Dec 2006 21:39:16 +0000
Subject: merge from 3.0 branch till 1537.

---
 tests/FunctionalTests/quickstart/Controls/DataGrid1TestCase.php | 2 --
 tests/FunctionalTests/tickets/protected/pages/Ticket205.page    | 2 +-
 tests/FunctionalTests/tickets/protected/pages/Ticket207.page    | 2 +-
 3 files changed, 2 insertions(+), 4 deletions(-)

(limited to 'tests/FunctionalTests')

diff --git a/tests/FunctionalTests/quickstart/Controls/DataGrid1TestCase.php b/tests/FunctionalTests/quickstart/Controls/DataGrid1TestCase.php
index d20a7955..7336ff8d 100644
--- a/tests/FunctionalTests/quickstart/Controls/DataGrid1TestCase.php
+++ b/tests/FunctionalTests/quickstart/Controls/DataGrid1TestCase.php
@@ -24,9 +24,7 @@ class DataGrid1TestCase extends SeleniumTestCase
 
 		// verify specific table tags
 		$this->verifyElementPresent("ctl0_body_DataGrid");
-		$this->verifyAttribute("ctl0_body_DataGrid@rules","all");
 		$this->verifyAttribute("ctl0_body_DataGrid@cellpadding","2");
-		$this->verifyAttribute("ctl0_body_DataGrid@cellspacing","0");
 	}
 }
 
diff --git a/tests/FunctionalTests/tickets/protected/pages/Ticket205.page b/tests/FunctionalTests/tickets/protected/pages/Ticket205.page
index 1481a227..5735b22a 100644
--- a/tests/FunctionalTests/tickets/protected/pages/Ticket205.page
+++ b/tests/FunctionalTests/tickets/protected/pages/Ticket205.page
@@ -20,7 +20,7 @@
 		ControlCssClass="required"
 		OnServerValidate="customValidate"
 		ClientValidationFunction="clientSideCustomValidate"
-		ClientSide.OnError="alert('error')"
+		ClientSide.OnValidationError="alert('error')"
 		ErrorMessage="must equal to 'Prado'" />
 	<com:TButton ID="button1" Text="Submit!" />
 </com:TContent>
\ No newline at end of file
diff --git a/tests/FunctionalTests/tickets/protected/pages/Ticket207.page b/tests/FunctionalTests/tickets/protected/pages/Ticket207.page
index 556c5aae..594d512b 100644
--- a/tests/FunctionalTests/tickets/protected/pages/Ticket207.page
+++ b/tests/FunctionalTests/tickets/protected/pages/Ticket207.page
@@ -6,7 +6,7 @@
 		id="validator1"
 		ControlToValidate="text1" Text="Error"
 		ClientSide.ObserveChanges="false"
-	    ClientSide.OnError="alert('error on text1 fired')" />
+	    ClientSide.OnValidationError="alert('error on text1 fired')" />
 	  <br />
 	  <com:TTextBox ID="text2" /><br />
 	  <com:TRequiredFieldValidator id="validator2" ControlToValidate="text2" Text="Error" />
-- 
cgit v1.2.3