Improved tests coverage, support to nested content types

Author: erikaheidi

Command/Web/ContentController.php

@@ -36,7 +36,7 @@ public function handle(): void
                 }
 
                 $start = ($page * $limit) - $limit;
-                $contentType = $content_provider->getContentType($request->getRoute());
+                $contentType = $content_provider->getContentType($request->getPath());
                 $content_list = $content_provider->fetchFrom($contentType, $start, $limit);
                 $response = new Response($twig->render('content/listing.html.twig', [
                     'content_list' => $content_list,

composer.json

@@ -11,8 +11,8 @@
         }
     },
     "require": {
-        "minicli/minicli": "^4.0",
-        "librarianphp/librarian-core": "^4.0"
+        "minicli/minicli": "^4.2.0",
+        "librarianphp/librarian-core": "^4.5.0"
     },
     "require-dev": {
         "pestphp/pest": "^3.2",

composer.lock

@@ -1,26 +1,41 @@
 <?php
 
 it('loads index page', function () {
-    $app = getLibrarianIndex();
+    $app = getLibrarian('/');
     $app->runCommand(['minicli', 'web', 'index']);
 })->expectOutputRegex('/template listing/');
 
 it('loads custom index page', function () {
-    $app = getLibrarianIndex('posts/test0');
+    $app = getLibrarian('/', [], ['site_index' => 'posts/test0']);
+    $app->runCommand(['minicli', 'web', 'index']);
+})->expectOutputRegex('/Devo Produzir Conteúdo em Português ou Inglês?/');
+
+it('loads custom index template', function () {
+    $app = getLibrarian('/', [], ['site_index' => 'posts/test0', 'site_index_tpl' => 'content/custom_index.html.twig']);
     $app->runCommand(['minicli', 'web', 'index']);
 })->expectOutputRegex('/custom index/');
 
-it('loads ', function () {
-    $app = getLibrarianContent('test0');
+it('loads single post', function () {
+    $app = getLibrarian('/posts/test1');
+    $app->runCommand(['minicli', 'web', 'content']);
+})->expectOutputRegex('/Testing Markdown Front Matter/');
+
+it('loads nested content', function () {
+    $app = getLibrarian('/docs/en/test0');
+    $app->runCommand(['minicli', 'web', 'content']);
+})->expectOutputRegex('/Testing Sub-Level En/');
+
+it('loads article list from base content type', function () {
+    $app = getLibrarian('/posts');
     $app->runCommand(['minicli', 'web', 'content']);
-})->expectOutputRegex('/template single/');
+})->expectOutputRegex('/template listing Blog posts/');
 
-test('Content page posts/test1 is correctly loaded', function () {
-    $app = getLibrarianContent('test1');
+it('loads article list from nested content type', function () {
+    $app = getLibrarian('/docs/en');
     $app->runCommand(['minicli', 'web', 'content']);
-})->expectOutputRegex('/template single/');
+})->expectOutputRegex('/template listing English Docs/');
 
-test('Content page posts/test2 is correctly loaded', function () {
-    $app = getLibrarianContent('test2');
+it('loads article list from parent content type', function () {
+    $app = getLibrarian('/docs/');
     $app->runCommand(['minicli', 'web', 'content']);
-})->expectOutputRegex('/template single/');
+})->expectOutputRegex('/template listing Docs/');

tests/Feature/CommandTest.php

@@ -43,7 +43,28 @@
 |
 */
 
-function getLibrarian(Request $request): App {}
+function getLibrarian(string $requestUri, array $params = [], array $appConfig = []): App
+{
+    $config = array_merge([
+        'debug' => true,
+        'templates_path' => __DIR__.'/Resources/templates',
+        'data_path' => __DIR__.'/Resources/data',
+        'cache_path' => sys_get_temp_dir(),
+    ], $appConfig);
+
+    $request = new Request($params, $requestUri);
+    $router = Mockery::mock(RouterServiceProvider::class);
+    $router->shouldReceive('load');
+    $router->shouldReceive('getRequest')->andReturn($request);
+
+    $app = new App($config);
+    $app->addService('content', new ContentServiceProvider);
+    $app->addService('twig', new TwigServiceProvider);
+    $app->addService('librarian', new LibrarianServiceProvider);
+    $app->addService('router', $router);
+
+    return $app;
+}
 
 function getLibrarianIndex(?string $custom = null): App
 {

tests/Pest.php

@@ -0,0 +1,5 @@
+---
+title: Portuguese Docs
+description: Portuguese Docs section
+index: 100
+---

tests/Resources/data/docs/pt/_index

@@ -0,0 +1,5 @@
+---
+title: Blog posts
+description: Blog section
+index: 100
+---

tests/Resources/data/posts/_index

@@ -1 +1 @@
-template listing
+template listing {{ content_type.title }}

tests/Resources/templates/content/listing.html.twig

@@ -1 +1 @@
-template single
+template single {{ content.frontMatterGet('title') }}