summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--.gitattributes4
-rw-r--r--tests/FunctionalTests/tickets/protected/pages/Ticket54.page4
-rw-r--r--tests/FunctionalTests/tickets/protected/pages/Ticket54Master.php7
-rw-r--r--tests/FunctionalTests/tickets/protected/pages/Ticket54Master.tpl1
-rw-r--r--tests/FunctionalTests/tickets/tests/Ticket54TestCase.php12
5 files changed, 28 insertions, 0 deletions
diff --git a/.gitattributes b/.gitattributes
index a1bddbb4..1a153e47 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -897,9 +897,13 @@ tests/FunctionalTests/tickets/protected/pages/Layout.tpl -text
tests/FunctionalTests/tickets/protected/pages/Ticket21.page -text
tests/FunctionalTests/tickets/protected/pages/Ticket21.php -text
tests/FunctionalTests/tickets/protected/pages/Ticket27.page -text
+tests/FunctionalTests/tickets/protected/pages/Ticket54.page -text
+tests/FunctionalTests/tickets/protected/pages/Ticket54Master.php -text
+tests/FunctionalTests/tickets/protected/pages/Ticket54Master.tpl -text
tests/FunctionalTests/tickets/protected/pages/config.xml -text
tests/FunctionalTests/tickets/tests/Ticket21TestCase.php -text
tests/FunctionalTests/tickets/tests/Ticket27TestCase.php -text
+tests/FunctionalTests/tickets/tests/Ticket54TestCase.php -text
tests/UnitTests/TODO.txt -text
tests/UnitTests/framework/Collections/utList.php -text
tests/UnitTests/framework/Collections/utMap.php -text
diff --git a/tests/FunctionalTests/tickets/protected/pages/Ticket54.page b/tests/FunctionalTests/tickets/protected/pages/Ticket54.page
new file mode 100644
index 00000000..8ac4285b
--- /dev/null
+++ b/tests/FunctionalTests/tickets/protected/pages/Ticket54.page
@@ -0,0 +1,4 @@
+<%@ MasterClass="Application.pages.Ticket54Master" %>
+<com:TContent ID="A">A</com:TContent>
+<com:TContent ID="B">B</com:TContent>
+<com:TContent ID="C">C</com:TContent>
diff --git a/tests/FunctionalTests/tickets/protected/pages/Ticket54Master.php b/tests/FunctionalTests/tickets/protected/pages/Ticket54Master.php
new file mode 100644
index 00000000..817e7c45
--- /dev/null
+++ b/tests/FunctionalTests/tickets/protected/pages/Ticket54Master.php
@@ -0,0 +1,7 @@
+<?php
+
+class Ticket54Master extends TTemplateControl
+{
+}
+
+?> \ No newline at end of file
diff --git a/tests/FunctionalTests/tickets/protected/pages/Ticket54Master.tpl b/tests/FunctionalTests/tickets/protected/pages/Ticket54Master.tpl
new file mode 100644
index 00000000..af57b6c7
--- /dev/null
+++ b/tests/FunctionalTests/tickets/protected/pages/Ticket54Master.tpl
@@ -0,0 +1 @@
+|<com:TContentPlaceholder ID="A" />||<com:TContentPlaceholder ID="B" />||<com:TContentPlaceholder ID="C" />|
diff --git a/tests/FunctionalTests/tickets/tests/Ticket54TestCase.php b/tests/FunctionalTests/tickets/tests/Ticket54TestCase.php
new file mode 100644
index 00000000..c131a67d
--- /dev/null
+++ b/tests/FunctionalTests/tickets/tests/Ticket54TestCase.php
@@ -0,0 +1,12 @@
+<?php
+
+class Ticket54TestCase extends SeleniumTestCase
+{
+ function test()
+ {
+ $this->open('tickets/index.php?page=Ticket54');
+ $this->verifyTextPresent("|A||B||C|", "");
+ }
+}
+
+?> \ No newline at end of file