Merge branch 'master' of github.com:hydephp/develop

emmadesilva · emmadesilva · commit fbc58f6985c3 · 2023-03-01T22:23:02.000+01:00
diff --git a/packages/framework/src/Pages/Concerns/UsesFlattenedOutputPaths.php b/packages/framework/src/Pages/Concerns/UsesFlattenedOutputPaths.php
diff --git a/packages/framework/src/Pages/DocumentationPage.php b/packages/framework/src/Pages/DocumentationPage.php
@@ -18,8 +18,6 @@
  */
 class DocumentationPage extends BaseMarkdownPage
 {
-    use Concerns\UsesFlattenedOutputPaths;
-
     public static string $sourceDirectory = '_docs';
     public static string $outputDirectory = 'docs';
     public static string $template = 'hyde::layouts/docs';
diff --git a/packages/framework/tests/Unit/DocumentationPageTest.php b/packages/framework/tests/Unit/DocumentationPageTest.php
@@ -18,7 +18,6 @@
  * @covers \Hyde\Pages\DocumentationPage
  * @covers \Hyde\Framework\Factories\Concerns\HasFactory
  * @covers \Hyde\Framework\Factories\NavigationDataFactory
- * @covers \Hyde\Pages\Concerns\UsesFlattenedOutputPaths
  */
 class DocumentationPageTest extends TestCase
 {
@@ -32,9 +31,14 @@ public function test_can_get_current_page_path()
     {
         $page = DocumentationPage::make('foo');
         $this->assertEquals('docs/foo', $page->getRouteKey());
+    }
 
+    public function test_can_get_current_custom_page_path()
+    {
         config(['hyde.output_directories.documentation-page' => 'documentation/latest/']);
         (new HydeServiceProvider($this->app))->register();
+
+        $page = DocumentationPage::make('foo');
         $this->assertEquals('documentation/latest/foo', $page->getRouteKey());
     }
 
@@ -169,10 +173,10 @@ public function test_has_table_of_contents()
         $this->assertFalse(DocumentationPage::hasTableOfContents());
     }
 
-    public function test_compiled_pages_originating_in_subdirectories_get_output_to_root_docs_path()
+    public function test_compiled_pages_originating_in_subdirectories_retain_subdirectory_structure()
     {
         $page = DocumentationPage::make('foo/bar');
-        $this->assertEquals('docs/bar.html', $page->getOutputPath());
+        $this->assertEquals('docs/foo/bar.html', $page->getOutputPath());
     }
 
     public function test_page_has_front_matter()

Original file line number	Diff line number	Diff line change
`@@ -18,8 +18,6 @@`
`18`	`18`	`*/`
`19`	`19`	`class DocumentationPage extends BaseMarkdownPage`
`20`	`20`	`{`
`21`		`- use Concerns\UsesFlattenedOutputPaths;`
`22`		`-`
`23`	`21`	`public static string $sourceDirectory = '_docs';`
`24`	`22`	`public static string $outputDirectory = 'docs';`
`25`	`23`	`public static string $template = 'hyde::layouts/docs';`
Original file line number	Diff line number	Diff line change
`@@ -18,7 +18,6 @@`
`18`	`18`	`* @covers \Hyde\Pages\DocumentationPage`
`19`	`19`	`* @covers \Hyde\Framework\Factories\Concerns\HasFactory`
`20`	`20`	`* @covers \Hyde\Framework\Factories\NavigationDataFactory`
`21`		`- * @covers \Hyde\Pages\Concerns\UsesFlattenedOutputPaths`
`22`	`21`	`*/`
`23`	`22`	`class DocumentationPageTest extends TestCase`
`24`	`23`	`{`
`@@ -32,9 +31,14 @@ public function test_can_get_current_page_path()`
`32`	`31`	`{`
`33`	`32`	`$page = DocumentationPage::make('foo');`
`34`	`33`	`$this->assertEquals('docs/foo', $page->getRouteKey());`
	`34`	`+ }`
`35`	`35`
	`36`	`+ public function test_can_get_current_custom_page_path()`
	`37`	`+ {`
`36`	`38`	`config(['hyde.output_directories.documentation-page' => 'documentation/latest/']);`
`37`	`39`	`(new HydeServiceProvider($this->app))->register();`
	`40`	`+`
	`41`	`+ $page = DocumentationPage::make('foo');`
`38`	`42`	`$this->assertEquals('documentation/latest/foo', $page->getRouteKey());`
`39`	`43`	`}`
`40`	`44`
`@@ -169,10 +173,10 @@ public function test_has_table_of_contents()`
`169`	`173`	`$this->assertFalse(DocumentationPage::hasTableOfContents());`
`170`	`174`	`}`
`171`	`175`
`172`		`- public function test_compiled_pages_originating_in_subdirectories_get_output_to_root_docs_path()`
	`176`	`+ public function test_compiled_pages_originating_in_subdirectories_retain_subdirectory_structure()`
`173`	`177`	`{`
`174`	`178`	`$page = DocumentationPage::make('foo/bar');`
`175`		`- $this->assertEquals('docs/bar.html', $page->getOutputPath());`
	`179`	`+ $this->assertEquals('docs/foo/bar.html', $page->getOutputPath());`
`176`	`180`	`}`
`177`	`181`
`178`	`182`	`public function test_page_has_front_matter()`