summaryrefslogtreecommitdiff
path: root/tests/FunctionalTests/features
diff options
context:
space:
mode:
Diffstat (limited to 'tests/FunctionalTests/features')
-rw-r--r--tests/FunctionalTests/features/protected/controls/LabeledTextbox.php2
-rw-r--r--tests/FunctionalTests/features/protected/pages/HtmlArea.page29
2 files changed, 23 insertions, 8 deletions
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