Merge branch 'nyup-672_add-lauras-manually-created-home-and-about-pag…

…es-to-sitegen' into develop
NYULibraries · Oct 23, 2019 · 5d9f701 · 5d9f701
2 parents 85a76c2 + 1f6da47
commit 5d9f701
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 5 deletions.
diff --git a/sitegen/browsetopicslists_test.go b/sitegen/browsetopicslists_test.go
@@ -39,11 +39,12 @@ func testGenerateBrowseTopicsLists() (bool, error) {
 	BrowseTopicsListsGoldenFilesDirectory := rootDirectory + "/sitegen/testdata/golden/browse-topics-lists" +
 		"/" + getGoldenFileSubdirectory()
 
-	destination := rootDirectory + "/sitegen/testdata/tmp"
+	destination := rootDirectory + "/sitegen/testdata/tmp/browse-topics-lists/" +
+		getGoldenFileSubdirectory()
 	outputDir := destination + "/browse-topics-lists"
 	err = os.RemoveAll(outputDir)
 	if (err != nil) {
-		return false, errors.New("os.RemoveAll(" + destination + ") failed: " + err.Error())
+		return false, errors.New("os.RemoveAll(" + outputDir + ") failed: " + err.Error())
 	}
 
 	// Only do this if another sitegen test hasn't already

diff --git a/sitegen/sitepages_test.go b/sitegen/sitepages_test.go
@@ -39,7 +39,9 @@ func testGenerateSitePages() (bool, error) {
 	SitePagesGoldenFilesDirectory := rootDirectory + "/sitegen/testdata/golden/site-pages" +
 		"/" + getGoldenFileSubdirectory()
 
-	outputDir := rootDirectory + "/sitegen/testdata/tmp/site-pages"
+	outputDir := rootDirectory + "/sitegen/testdata/tmp/site-pages" +
+		"/" + getGoldenFileSubdirectory()
+
 	// Delete all the contents, but don't delete the directory itself
 	err = os.RemoveAll(outputDir)
 	err = os.MkdirAll(outputDir, 0700)

diff --git a/sitegen/topicpages_test.go b/sitegen/topicpages_test.go
@@ -40,11 +40,12 @@ func testGenerateTopicPages() (bool, error) {
 	TopicPagesGoldenFilesDirectory := rootDirectory + "/sitegen/testdata/golden/topic-pages" +
 		"/" + getGoldenFileSubdirectory()
 
-	destination := rootDirectory + "/sitegen/testdata/tmp"
+	destination := rootDirectory + "/sitegen/testdata/tmp/topic-pages/" +
+		getGoldenFileSubdirectory()
 	outputDir := destination + "/topic-pages"
 	err = os.RemoveAll(outputDir)
 	if (err != nil) {
-		return false, errors.New("os.Remove(" + destination + ") failed: " + err.Error())
+		return false, errors.New("os.Remove(" + outputDir + ") failed: " + err.Error())
 	}
 
 	// Only do this if another sitegen test hasn't already