From 8c75d1c1bc494220bed313e542902cdc22c5336f Mon Sep 17 00:00:00 2001
From: Nathaniel Guse <nathaniel.guse@gmail.com>
Date: Mon, 1 Jul 2013 11:58:16 -0500
Subject: [feature/twig] Fix template_test.php

Various tests were broken completely, and some things such as whitespace
changed with Twig

PHPBB3-11598
---
 tests/template/templates/define_unclosed.html | 2 --
 tests/template/templates/loop_nested.html     | 8 ++++----
 tests/template/templates/loop_size.html       | 2 +-
 tests/template/templates/loop_underscore.html | 2 +-
 tests/template/templates/loop_vars.html       | 1 -
 5 files changed, 6 insertions(+), 9 deletions(-)
 delete mode 100644 tests/template/templates/define_unclosed.html

(limited to 'tests/template/templates')

diff --git a/tests/template/templates/define_unclosed.html b/tests/template/templates/define_unclosed.html
deleted file mode 100644
index 1c975eab2b..0000000000
--- a/tests/template/templates/define_unclosed.html
+++ /dev/null
@@ -1,2 +0,0 @@
-<!-- DEFINE $VALUE -->
-test
diff --git a/tests/template/templates/loop_nested.html b/tests/template/templates/loop_nested.html
index 45b1ef85d4..3b5ffa5cac 100644
--- a/tests/template/templates/loop_nested.html
+++ b/tests/template/templates/loop_nested.html
@@ -1,6 +1,6 @@
 <!-- BEGIN outer -->
-	outer - {outer.S_ROW_COUNT}<!-- IF outer.VARIABLE --> - {outer.VARIABLE}<!-- ENDIF -->
-	<!-- BEGIN middle -->
-		middle - {middle.S_ROW_COUNT}<!-- IF middle.VARIABLE --> - {middle.VARIABLE}<!-- ENDIF -->
-	<!-- END middle -->
+outer - {outer.S_ROW_COUNT}<!-- IF outer.VARIABLE --> - {outer.VARIABLE}<!-- ENDIF -->
+<!-- BEGIN middle -->
+middle - {outer.middle.S_ROW_COUNT}<!-- IF outer.middle.VARIABLE --> - {outer.middle.VARIABLE}<!-- ENDIF -->
+<!-- END middle -->
 <!-- END outer -->
diff --git a/tests/template/templates/loop_size.html b/tests/template/templates/loop_size.html
index f1938441df..8f581cef10 100644
--- a/tests/template/templates/loop_size.html
+++ b/tests/template/templates/loop_size.html
@@ -36,4 +36,4 @@
 
 <!-- BEGIN loop -->
 	in loop
-<!-- END -->
+<!-- END loop -->
diff --git a/tests/template/templates/loop_underscore.html b/tests/template/templates/loop_underscore.html
index dafce5dea6..4001007868 100644
--- a/tests/template/templates/loop_underscore.html
+++ b/tests/template/templates/loop_underscore.html
@@ -2,7 +2,7 @@
 loop
 <!-- BEGINELSE -->
 noloop
-<!-- END loop -->
+<!-- END _underscore_loop -->
 
 <!-- IF ._underscore_loop -->
 loop
diff --git a/tests/template/templates/loop_vars.html b/tests/template/templates/loop_vars.html
index d94a0ae0f7..7d86d4b7b6 100644
--- a/tests/template/templates/loop_vars.html
+++ b/tests/template/templates/loop_vars.html
@@ -11,4 +11,3 @@ last
 <!-- IF inner.S_LAST_ROW and inner.S_ROW_COUNT and inner.S_NUM_ROWS -->last inner<!-- ENDIF -->
 <!-- END inner -->
 <!-- END loop -->
-<!-- IF .loop.inner -->inner loop<!-- ENDIF -->
-- 
cgit v1.2.1