fix: test filepaths

Author: MathisVerstrepen

services/articles.go

@@ -12,10 +12,11 @@ const (
 )
 
 func MarkdownArticlesPath() string {
+	root := os.Getenv("ROOT_DIR")
 	if strings.Compare(os.Getenv("ENV"), "dev") == 0 {
-		return path.Join(Root, MarkdownArticlesPathBase, "dev")
+		return path.Join(root, MarkdownArticlesPathBase, "dev")
 	}
-	return path.Join(Root, MarkdownArticlesPathBase, "prod")
+	return path.Join(root, MarkdownArticlesPathBase, "prod")
 }
 
 func RetrieveLocalMdArticles() ([]string, error) {
@@ -35,7 +36,7 @@ func RetrieveLocalMdArticles() ([]string, error) {
 
 func RetriveLocalHtmlArticle(article string) (string, error) {
 	article += ".html"
-	file, err := os.ReadFile(path.Join(Root, HTMLArticlesPath, article))
+	file, err := os.ReadFile(path.Join(os.Getenv("ROOT_DIR"), HTMLArticlesPath, article))
 	if err != nil {
 		return "", err
 	}
@@ -46,7 +47,7 @@ func RetriveLocalHtmlArticle(article string) (string, error) {
 func PersistHtmlArticle(article string, content string) error {
 	article = strings.Replace(article, ".md", ".html", 1)
 
-	file, err := os.Create(path.Join(Root, HTMLArticlesPath, article))
+	file, err := os.Create(path.Join(os.Getenv("ROOT_DIR"), HTMLArticlesPath, article))
 	if err != nil {
 		return err
 	}

services/markdown.go

@@ -7,7 +7,6 @@ import (
 	"fmt"
 	"io"
 	"os"
-	"path/filepath"
 	"regexp"
 	"strings"
 
@@ -17,10 +16,6 @@ import (
 	"potblog/infrastructure"
 )
 
-var (
-	Root = os.Getenv("ROOT_DIR")
-)
-
 func renderTemplate(t templ.Component) string {
 	buf := templ.GetBuffer()
 	defer templ.ReleaseBuffer(buf)
@@ -32,8 +27,7 @@ func renderTemplate(t templ.Component) string {
 	return buf.String()
 }
 
-func ReadMarkdownFile(relative_filepath string) string {
-	filepath := filepath.Join(Root, relative_filepath)
+func ReadMarkdownFile(filepath string) string {
 	file, err := os.Open(filepath)
 	if err != nil {
 		return ""

services/markdown_test.go

@@ -3,13 +3,20 @@ package services
 import (
 	"io"
 	"os"
+	"path"
 	"path/filepath"
 	"potblog/infrastructure"
 	"reflect"
+	"runtime"
 	"strings"
 	"testing"
 )
 
+var (
+	_, b, _, _ = runtime.Caller(0)
+	Root       = filepath.Join(filepath.Dir(b), "..")
+)
+
 func pointerTo[T ~string](s T) *T {
 	return &s
 }
@@ -56,7 +63,7 @@ func Test_ReadMarkdownFile(t *testing.T) {
 	}
 	for _, tt := range tests {
 		t.Run(tt.name, func(t *testing.T) {
-			if got := ReadMarkdownFile(tt.args.filename); got != tt.want {
+			if got := ReadMarkdownFile(path.Join(Root, tt.args.filename)); got != tt.want {
 				t.Errorf("ReadMarkdownFile() = %v\nWant %v", got, tt.want)
 			}
 		})
@@ -92,6 +99,7 @@ func TestMarkdownToHTML(t *testing.T) {
 		},
 	}
 	for _, tt := range tests {
+		os.Setenv("ROOT_DIR", Root)
 		t.Run(tt.name, func(t *testing.T) {
 			got, err := ConvertMarkdownToHTML(tt.args.md)
 			if (err != nil) != tt.wantErr {