From 19989e32667e653d9dd65066ba26c91562a3cdc8 Mon Sep 17 00:00:00 2001
From: wei <>
Date: Fri, 28 Apr 2006 05:22:14 +0000
Subject: Fixed #68 and update TinyMCE to 2.0.5.1

---
 .../features/protected/controls/LabeledTextbox.php |  2 +-
 .../features/protected/pages/HtmlArea.page         | 29 ++++++++++++++++------
 .../tickets/protected/pages/Ticket68.page          | 25 +++++++++++++++++++
 3 files changed, 48 insertions(+), 8 deletions(-)
 create mode 100644 tests/FunctionalTests/tickets/protected/pages/Ticket68.page

(limited to 'tests')

diff --git a/tests/FunctionalTests/features/protected/controls/LabeledTextbox.php b/tests/FunctionalTests/features/protected/controls/LabeledTextbox.php
index 33396734..e190abd4 100644
--- a/tests/FunctionalTests/features/protected/controls/LabeledTextbox.php
+++ b/tests/FunctionalTests/features/protected/controls/LabeledTextbox.php
@@ -7,7 +7,7 @@ class LabeledTextBox extends TCompositeControl
 {
 	public function getTextBox()
 	{
-		return $this->textbox;
+		return $this->getRegisteredObject('textbox');
 	}
 	
 	public function getLabel()
diff --git a/tests/FunctionalTests/features/protected/pages/HtmlArea.page b/tests/FunctionalTests/features/protected/pages/HtmlArea.page
index 8b56f48d..3936e68c 100644
--- a/tests/FunctionalTests/features/protected/pages/HtmlArea.page
+++ b/tests/FunctionalTests/features/protected/pages/HtmlArea.page
@@ -1,10 +1,25 @@
-<%@ Application.Globalization.Charset="GB2312" %>
+
 <com:TContent ID="Content">
 
-	<com:THtmlArea>
-		<prop:Options>
-			plugins : "contextmenu,paste",
-			language: "zh_CN"
-		</prop:Options>
-	</com:THtmlArea>
+	<com:THtmlArea ID="text1" />
+
+	<com:TRequiredFieldValidator 
+		ControlToValidate="text1"
+		ErrorMessage="*" />
+
+	<com:TButton ID="button1" Text="submit 1" />
+
+	<com:TButton ID="button2" Text="submit 2" />
+
+	<com:THtmlArea ID="text2" />
+
+	<com:TRequiredFieldValidator 
+		ControlToValidate="text2"
+		ValidationGroup="group2"
+		ErrorMessage="*" />
+
+	<com:TButton ID="button3" ValidationGroup="group2" Text="submit 3" />
+
+	<com:TButton ID="button4" ValidationGroup="group2" Text="submit 4" />
+
 </com:TContent>
\ No newline at end of file
diff --git a/tests/FunctionalTests/tickets/protected/pages/Ticket68.page b/tests/FunctionalTests/tickets/protected/pages/Ticket68.page
new file mode 100644
index 00000000..3936e68c
--- /dev/null
+++ b/tests/FunctionalTests/tickets/protected/pages/Ticket68.page
@@ -0,0 +1,25 @@
+
+<com:TContent ID="Content">
+
+	<com:THtmlArea ID="text1" />
+
+	<com:TRequiredFieldValidator 
+		ControlToValidate="text1"
+		ErrorMessage="*" />
+
+	<com:TButton ID="button1" Text="submit 1" />
+
+	<com:TButton ID="button2" Text="submit 2" />
+
+	<com:THtmlArea ID="text2" />
+
+	<com:TRequiredFieldValidator 
+		ControlToValidate="text2"
+		ValidationGroup="group2"
+		ErrorMessage="*" />
+
+	<com:TButton ID="button3" ValidationGroup="group2" Text="submit 3" />
+
+	<com:TButton ID="button4" ValidationGroup="group2" Text="submit 4" />
+
+</com:TContent>
\ No newline at end of file
-- 
cgit v1.2.3