From e950515960fc8c90880baff19711e556575eef32 Mon Sep 17 00:00:00 2001
From: Stephen Searles <stephen.searles@gmail.com>
Date: Sun, 30 Jul 2017 12:40:48 -0700
Subject: [PATCH] fixing setup bug, adding test

---
 doc_test.go | 9 +++++++++
 setup.go    | 3 ++-
 2 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/doc_test.go b/doc_test.go
index 9f9e81e..8d7b974 100644
--- a/doc_test.go
+++ b/doc_test.go
@@ -58,4 +58,13 @@ func TestDoc(t *testing.T) {
 	if len(c) != 1 {
 		t.Fatalf("expected 1 page, but saw %d pages", len(c))
 	}
+
+	w.CH.NewContent("TEST 2!!", "")
+	c, err = GetContent(w.BlogFolder, w.CH.HugoSites)
+	if err != nil {
+		t.Fatalf("couldn't get content from the test environment: %v", err)
+	}
+	if len(c) != 2 {
+		t.Fatalf("expected 2 pages, but saw %d pages", len(c))
+	}
 }
diff --git a/setup.go b/setup.go
index ec5e4e8..bc9a39e 100644
--- a/setup.go
+++ b/setup.go
@@ -16,8 +16,9 @@ import (
 
 func (ch *CaddyHugo) SetupCaddy(c *caddy.Controller) error {
 	ch.Site = httpserver.GetConfig(c)
+	err := ch.Setup(ch.Site.Root)
 	ch.Site.AddMiddleware(ch.Middleware(c))
-	return ch.Setup(ch.Dir)
+	return err
 }
 
 func (ch *CaddyHugo) Setup(dir string) error {