Update Views tests

aplus-framework · Feb 20, 2024 · 21f243c · 21f243c
1 parent 16912d8
commit 21f243c
Show file tree

Hide file tree

Showing 3 changed files with 54 additions and 16 deletions.
diff --git a/tests/Debug/ViewCollectorTest.php b/tests/Debug/ViewCollectorTest.php
@@ -29,6 +29,7 @@ protected function setUp() : void
         $this->collector = new ViewCollector();
         $this->debugger->addCollector($this->collector, 'View');
         $this->view = new View();
+        $this->view->setInstanceName('default');
         $this->view->setDebugCollector($this->collector);
     }
 

diff --git a/tests/ViewTest.php b/tests/ViewTest.php
@@ -21,6 +21,7 @@ final class ViewTest extends TestCase
     protected function setUp() : void
     {
         $this->view = new ViewMock(__DIR__ . '/Views');
+        $this->view->setInstanceName('default');
     }
 
     public function testBaseDir() : void
@@ -293,11 +294,11 @@ public function testDebugBlock() : void
         $this->setDebugCollector();
         $contents = $this->view->render('home/index');
         self::assertStringContainsString(
-            '<!-- Block start: home/index::contents -->',
+            '<!-- DEBUG-VIEW START default:home/index::contents -->',
             $contents
         );
         self::assertStringContainsString(
-            '<!-- Block end: home/index::contents -->',
+            '<!-- DEBUG-VIEW ENDED default:home/index::contents -->',
             $contents
         );
     }
@@ -307,20 +308,42 @@ public function testDebugInclude() : void
         $this->setDebugCollector();
         $contents = $this->view->render('home/index');
         self::assertStringContainsString(
-            '<!-- Include start: _includes/footer -->',
+            '<!-- DEBUG-VIEW START default:_includes/footer -->',
             $contents
         );
         self::assertStringContainsString(
-            '<!-- Include end: _includes/footer -->',
+            '<!-- DEBUG-VIEW ENDED default:_includes/footer -->',
             $contents
         );
         $contents = $this->view->render('home/without-prefix');
         self::assertStringContainsString(
-            '<!-- Include start: _includes/footer -->',
+            '<!-- DEBUG-VIEW START default:_includes/footer -->',
             $contents
         );
         self::assertStringContainsString(
-            '<!-- Include end: _includes/footer -->',
+            '<!-- DEBUG-VIEW ENDED default:_includes/footer -->',
+            $contents
+        );
+    }
+
+    public function testDebugIncludeRepeated() : void
+    {
+        $this->setDebugCollector();
+        $contents = $this->view->render('home/repeat-includes');
+        self::assertStringContainsString(
+            '<!-- DEBUG-VIEW START default:_includes/footer -->',
+            $contents
+        );
+        self::assertStringContainsString(
+            '<!-- DEBUG-VIEW ENDED default:_includes/footer -->',
+            $contents
+        );
+        self::assertStringContainsString(
+            '<!-- DEBUG-VIEW START default:_includes/footer:2 -->',
+            $contents
+        );
+        self::assertStringContainsString(
+            '<!-- DEBUG-VIEW ENDED default:_includes/footer:2 -->',
             $contents
         );
     }
@@ -330,11 +353,11 @@ public function testDebugRender() : void
         $this->setDebugCollector();
         $contents = $this->view->render('home/index');
         self::assertStringContainsString(
-            '<!-- Render start: home/index -->',
+            '<!-- DEBUG-VIEW START default:home/index -->',
             $contents
         );
         self::assertStringContainsString(
-            '<!-- Render end: home/index -->',
+            '<!-- DEBUG-VIEW ENDED default:home/index -->',
             $contents
         );
     }
@@ -347,22 +370,22 @@ public function testDebugComments() : void
         $contents = $this->view->render('comments');
         self::assertSame(
             <<<'EOL'
-                <!-- Render start: comments -->
-                <!-- Layout start: _layouts/default -->
+                <!-- DEBUG-VIEW START default:comments -->
+                <!-- DEBUG-VIEW START default:_layouts/default -->
                 <h1>Layout Default</h1>
 
-                <!-- Block start: comments::contents -->
+                <!-- DEBUG-VIEW START default:comments::contents -->
                 CONTENTS
 
-                <!-- Include start: _includes/footer -->
+                <!-- DEBUG-VIEW START default:_includes/footer -->
                 <footer>Footer</footer>
 
-                <!-- Include end: _includes/footer -->
+                <!-- DEBUG-VIEW ENDED default:_includes/footer -->
 
-                <!-- Block end: comments::contents -->
+                <!-- DEBUG-VIEW ENDED default:comments::contents -->
 
-                <!-- Layout end: _layouts/default -->
-                <!-- Render end: comments -->
+                <!-- DEBUG-VIEW ENDED default:_layouts/default -->
+                <!-- DEBUG-VIEW ENDED default:comments -->
                 EOL,
             $contents
         );

diff --git a/tests/Views/home/repeat-includes.php b/tests/Views/home/repeat-includes.php
@@ -0,0 +1,14 @@
+<?php
+/**
+ * @var Framework\MVC\View $view
+ */
+$view->extends('_layouts/default', 'contents');
+?>
+<h2>Home Index</h2>
+<div>Foo bar baz</div>
+<div>
+    <?= $view->include('_includes/footer') ?>
+</div>
+<div>
+    <?= $view->include('_includes/footer') ?>
+</div>