test: remove rendered/ from test/

anna-ssg · Apr 11, 2024 · d5441af · d5441af
1 parent 7fac334
commit d5441af
Show file tree

Hide file tree

Showing 14 changed files with 13 additions and 143 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,5 +1,4 @@
-!rendered/
-site/rendered/
+**/rendered/
 anna
 !anna/
 *.exe

diff --git a/pkg/engine/anna_engine_test.go b/pkg/engine/anna_engine_test.go
@@ -61,6 +61,7 @@ func TestRenderTags(t *testing.T) {
 	if err != nil {
 		t.Errorf("%v", err)
 	}
+	os.MkdirAll(TestDirPath+"render_tags/rendered", 0750)
 	e.RenderTags(fileOutPath, templ)
 
 	t.Run("render tag.html", func(t *testing.T) {
@@ -105,12 +106,11 @@ func TestRenderTags(t *testing.T) {
 		}
 
 		if !slices.Equal(got_tech_file, want_tech_file) {
-		t.Errorf("The expected and generated tech.html tag-subpage can be found in test/engine/render_tags/rendered/tags/")
+			t.Errorf("The expected and generated tech.html tag-subpage can be found in test/engine/render_tags/rendered/tags/")
 		}
 	})
 }
 
-
 func TestGenerateMergedJson(t *testing.T) {
 	t.Run("test json creation from e.Templates", func(t *testing.T) {
 		e := engine.Engine{

diff --git a/pkg/engine/engine_integration_test.go b/pkg/engine/engine_integration_test.go
@@ -22,11 +22,13 @@ func TestRenderUserDefinedPages(t *testing.T) {
 		parser.TemplateData{
 			FilenameWithoutExtension: "index",
 			Body:                     template.HTML("<h1>Index Page</h1>"),
+			CompleteURL:              "index.html",
 		}
 
 	engine.Templates["posts/hello.md"] = parser.TemplateData{
 		FilenameWithoutExtension: "hello",
 		Body:                     template.HTML("<h1>Hello World</h1>"),
+		CompleteURL:              "posts/hello.html",
 	}
 
 	t.Run("render a set of user defined pages", func(t *testing.T) {
@@ -35,6 +37,8 @@ func TestRenderUserDefinedPages(t *testing.T) {
 		if err != nil {
 			t.Errorf("%v", err)
 		}
+
+		os.MkdirAll(TestDirPath+"render_user_defined/rendered", 0750)
 		engine.RenderUserDefinedPages(TestDirPath+"render_user_defined/", templ)
 
 		want_index_file, err := os.ReadFile(TestDirPath + "render_user_defined/want_index.html")

diff --git a/pkg/engine/engine_test.go b/pkg/engine/engine_test.go
@@ -46,7 +46,8 @@ func TestRenderPage(t *testing.T) {
 			t.Errorf("%v", err)
 		}
 
-		engine.RenderPage(TestDirPath+"engine/render_page/", "posts/got.md", page, templ, "page")
+		os.MkdirAll(TestDirPath+"render_page/rendered", 0750)
+		engine.RenderPage(TestDirPath+"render_page/", "posts/got.md", page, templ, "page")
 
 		got_file, err := os.ReadFile(TestDirPath + "render_page/rendered/posts/got.html")
 		if err != nil {

diff --git a/pkg/engine/user_engine_test.go b/pkg/engine/user_engine_test.go
@@ -53,6 +53,7 @@ func TestRenderEngineGeneratedFiles(t *testing.T) {
 			t.Errorf("%v", err)
 		}
 
+		os.MkdirAll(TestDirPath+"render_engine_generated/rendered", 0750)
 		engine.RenderEngineGeneratedFiles(TestDirPath+"render_engine_generated/", templ)
 
 		want_posts_file, err := os.ReadFile(TestDirPath + "render_engine_generated/want_posts.html")

diff --git a/test/engine/engine/render_page/rendered/posts/got.html b/test/engine/engine/render_page/rendered/posts/got.html
diff --git a/test/engine/render_engine_generated/rendered/posts.html b/test/engine/render_engine_generated/rendered/posts.html
diff --git a/test/engine/render_page/rendered/posts/got.html b/test/engine/render_page/rendered/posts/got.html
diff --git a/test/engine/render_tags/rendered/tags.html b/test/engine/render_tags/rendered/tags.html
diff --git a/test/engine/render_tags/rendered/tags/blogs.html b/test/engine/render_tags/rendered/tags/blogs.html
diff --git a/test/engine/render_tags/rendered/tags/tech.html b/test/engine/render_tags/rendered/tags/tech.html
diff --git a/test/engine/render_user_defined/rendered/index.html b/test/engine/render_user_defined/rendered/index.html
diff --git a/test/engine/render_user_defined/rendered/posts/hello.html b/test/engine/render_user_defined/rendered/posts/hello.html
diff --git a/test/engine/sitemap/got_sitemap.xml b/test/engine/sitemap/got_sitemap.xml
@@ -1,15 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <urlset xmlns="http://www.sitemaps.org/schemas/sitemap/0.9">
 	<url>
-		<loc>example.org/index.html</loc>
+		<loc>example.org/about.html</loc>
 		<lastmod>2024-02-23</lastmod>
 	</url>
 	<url>
-		<loc>example.org/research.html</loc>
+		<loc>example.org/index.html</loc>
 		<lastmod>2024-02-23</lastmod>
 	</url>
 	<url>
-		<loc>example.org/about.html</loc>
+		<loc>example.org/research.html</loc>
 		<lastmod>2024-02-23</lastmod>
 	</url>
 </urlset>