2 files changed, 39 insertions, 100 deletions
diff --git a/htesting/test_helpers.go b/htesting/test_helpers.go
new file mode 100644
index 000000000..dc303b2e5
--- /dev/null
+++ b/htesting/test_helpers.go
@@ -0,0 +1,39 @@
+// Copyright 2019 The Hugo Authors. All rights reserved.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package htesting
+
+import (
+	"runtime"
+	"strings"
+
+	"github.com/spf13/afero"
+)
+
+// CreateTempDir creates a temp dir in the given filesystem and
+// returns the dirnam and a func that removes it when done.
+func CreateTempDir(fs afero.Fs, prefix string) (string, func(), error) {
+	tempDir, err := afero.TempDir(fs, "", prefix)
+	if err != nil {
+		return "", nil, err
+	}
+
+	_, isOsFs := fs.(*afero.OsFs)
+
+	if isOsFs && runtime.GOOS == "darwin" && !strings.HasPrefix(tempDir, "/private") {
+		// To get the entry folder in line with the rest. This its a little bit
+		// mysterious, but so be it.
+		tempDir = "/private" + tempDir
+	}
+	return tempDir, func() { fs.RemoveAll(tempDir) }, nil
+}
diff --git a/htesting/test_structs.go b/htesting/test_structs.go
deleted file mode 100644
index 72dc7f3fc..000000000
--- a/htesting/test_structs.go
+++ /dev/null
@@ -1,100 +0,0 @@
-// Copyright 2019 The Hugo Authors. All rights reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package htesting
-
-import (
-	"html/template"
-	"time"
-
-	"github.com/gohugoio/hugo/common/hugo"
-	"github.com/gohugoio/hugo/langs"
-	"github.com/gohugoio/hugo/navigation"
-	"github.com/gohugoio/hugo/resources/page"
-	"github.com/spf13/viper"
-)
-
-type testSite struct {
-	h hugo.Info
-	l *langs.Language
-}
-
-func (t testSite) Hugo() hugo.Info {
-	return t.h
-}
-
-func (t testSite) ServerPort() int {
-	return 1313
-}
-
-func (testSite) LastChange() (t time.Time) {
-	return
-}
-
-func (t testSite) Title() string {
-	return "foo"
-}
-
-func (t testSite) Sites() page.Sites {
-	return nil
-}
-
-func (t testSite) IsServer() bool {
-	return false
-}
-
-func (t testSite) Language() *langs.Language {
-	return t.l
-}
-
-func (t testSite) Pages() page.Pages {
-	return nil
-}
-
-func (t testSite) RegularPages() page.Pages {
-	return nil
-}
-
-func (t testSite) Menus() navigation.Menus {
-	return nil
-}
-
-func (t testSite) Taxonomies() interface{} {
-	return nil
-}
-
-func (t testSite) BaseURL() template.URL {
-	return ""
-}
-
-func (t testSite) Params() map[string]interface{} {
-	return nil
-}
-
-func (t testSite) Data() map[string]interface{} {
-	return nil
-}
-
-// NewTestHugoSite creates a new minimal test site.
-func NewTestHugoSite() page.Site {
-	return testSite{
-		h: hugo.NewInfo(hugo.EnvironmentProduction),
-		l: langs.NewLanguage("en", newTestConfig()),
-	}
-}
-
-func newTestConfig() *viper.Viper {
-	v := viper.New()
-	v.Set("contentDir", "content")
-	return v
-}