Merge pull request #4 from fr3nch13/dev

Ensuring subdir is set, so it acts like before.
fr3nch13 · Sep 7, 2023 · 65d780a · 65d780a
2 parents d532b36 + 5553cea
commit 65d780a
Show file tree

Hide file tree

Showing 9 changed files with 54 additions and 6 deletions.
diff --git a/src/View/CsvView.php b/src/View/CsvView.php
@@ -22,6 +22,7 @@ public function initialize(): void
         parent::initialize();
 
         $this->setLayout('Fr3nch13/Excel.csv/default');
+        $this->setSubDir('csv');
 
         $this->getResponse()->setTypeMap('csv', ['text/csv; charset=UTF-8']);
         $this->setResponse($this->getResponse()->withType('csv'));

diff --git a/src/View/ExcelView.php b/src/View/ExcelView.php
@@ -22,6 +22,7 @@ public function initialize(): void
         parent::initialize();
 
         $this->setLayout('Fr3nch13/Excel.xlsx/default');
+        $this->setSubDir('xlsx');
 
         $this->getResponse()->setTypeMap('xlsx', ['application/vnd.openxmlformats-officedocument.spreadsheetml.sheet']);
         $this->setResponse($this->getResponse()->withType('xlsx'));

diff --git a/src/View/PdfView.php b/src/View/PdfView.php
@@ -22,6 +22,7 @@ public function initialize(): void
         parent::initialize();
 
         $this->setLayout('Fr3nch13/Excel.pdf/default');
+        $this->setSubDir('pdf');
 
         $this->getResponse()->setTypeMap('pdf', ['application/pdf']);
         $this->setResponse($this->getResponse()->withType('pdf'));

diff --git a/templates/csv/test.php b/templates/csv/test.php
@@ -0,0 +1,12 @@
+<?php
+
+declare(strict_types=1);
+
+/**
+ * @var \Fr3nch13\Excel\View\CsvView $this
+ *
+ * Used to test the finding of templates for the View.
+ * This is the sample file where you can manipulate the output.
+ */
+
+echo $this->fetch('content');
diff --git a/templates/pdf/test.php b/templates/pdf/test.php
@@ -0,0 +1,12 @@
+<?php
+
+declare(strict_types=1);
+
+/**
+ * @var \Fr3nch13\Excel\View\PdfView $this
+ *
+ * Used to test the finding of templates for the View.
+ * This is the sample file where you can manipulate the output.
+ */
+
+echo $this->fetch('content');
diff --git a/templates/xlsx/test.php b/templates/xlsx/test.php
@@ -0,0 +1,12 @@
+<?php
+
+declare(strict_types=1);
+
+/**
+ * @var \Fr3nch13\Excel\View\ExcelView $this
+ *
+ * Used to test the finding of templates for the View.
+ * This is the sample file where you can manipulate the output.
+ */
+
+echo $this->fetch('content');
diff --git a/tests/TestCase/View/CsvViewTest.php b/tests/TestCase/View/CsvViewTest.php
@@ -89,7 +89,7 @@ public function testLayout(): void
      */
     public function testFileNames(): void
     {
-        $this->View->setTemplate('base');
+        $this->View->setTemplate('Fr3nch13/Excel.test');
         $this->View->render();
 
         $filenames = $this->View->getFileNames();
@@ -99,8 +99,11 @@ public function testFileNames(): void
             '/templates/layout/csv/default.php',
             str_replace(PLUGIN_ROOT, '', $filenames['layout'])
         );
+
+        // since there are no routes, the Request can't route to a controller.
+        // here, we're ensuring the subdir is set.
         $this->assertSame(
-            '/vendor/fr3nch13/cakephp-pta/tests/test_app/templates/base.php',
+            '/templates/csv/test.php',
             str_replace(PLUGIN_ROOT, '', $filenames['template'])
         );
     }

diff --git a/tests/TestCase/View/ExcelViewTest.php b/tests/TestCase/View/ExcelViewTest.php
@@ -89,7 +89,7 @@ public function testLayout(): void
      */
     public function testFileNames(): void
     {
-        $this->View->setTemplate('base');
+        $this->View->setTemplate('Fr3nch13/Excel.test');
         $this->View->render();
 
         $filenames = $this->View->getFileNames();
@@ -99,8 +99,11 @@ public function testFileNames(): void
             '/templates/layout/xlsx/default.php',
             str_replace(PLUGIN_ROOT, '', $filenames['layout'])
         );
+
+        // since there are no routes, the Request can't route to a controller.
+        // here, we're ensuring the subdir is set.
         $this->assertSame(
-            '/vendor/fr3nch13/cakephp-pta/tests/test_app/templates/base.php',
+            '/templates/xlsx/test.php',
             str_replace(PLUGIN_ROOT, '', $filenames['template'])
         );
     }

diff --git a/tests/TestCase/View/PdfViewTest.php b/tests/TestCase/View/PdfViewTest.php
@@ -89,7 +89,7 @@ public function testLayout(): void
      */
     public function testFileNames(): void
     {
-        $this->View->setTemplate('base');
+        $this->View->setTemplate('Fr3nch13/Excel.test');
         $this->View->render();
 
         $filenames = $this->View->getFileNames();
@@ -99,8 +99,11 @@ public function testFileNames(): void
             '/templates/layout/pdf/default.php',
             str_replace(PLUGIN_ROOT, '', $filenames['layout'])
         );
+
+        // since there are no routes, the Request can't route to a controller.
+        // here, we're ensuring the subdir is set.
         $this->assertSame(
-            '/vendor/fr3nch13/cakephp-pta/tests/test_app/templates/base.php',
+            '/templates/pdf/test.php',
             str_replace(PLUGIN_ROOT, '', $filenames['template'])
         );
     }