Fix some of the "new site" tests

diff --git a/commands/new.go b/commands/new.go
index 39454e6c89676c15af2126fc46224baf4d2f9651..d465e83ffdb60ba7f3da3a79f6e44cc3824a0105 100644 (file)
--- a/commands/new.go
+++ b/commands/new.go
@@ -15,12 +15,12 @@ package commands
 
 import (
        "bytes"
+       "errors"
        "os"
        "path/filepath"
        "strings"
        "time"
 
-       "errors"
        "github.com/spf13/cobra"
        "github.com/spf13/hugo/create"
        "github.com/spf13/hugo/helpers"

diff --git a/commands/new_test.go b/commands/new_test.go
index 08d50f4cede838010341c7afb57363c44c9a5fe1..ceed826263c1a8704929555c10ced32dcfd1e6a8 100644 (file)
--- a/commands/new_test.go
+++ b/commands/new_test.go
@@ -1,12 +1,13 @@
 package commands
 
 import (
-       "github.com/spf13/afero"
-       "github.com/spf13/hugo/hugofs"
-       "github.com/stretchr/testify/assert"
        "os"
        "path/filepath"
        "testing"
+
+       "github.com/spf13/afero"
+       "github.com/spf13/hugo/hugofs"
+       "github.com/stretchr/testify/assert"
 )
 
 // Issue #1133
@@ -41,10 +42,20 @@ func TestDoNewSite(t *testing.T) {
        checkNewSiteInited(basepath, t)
 }
 
+func TestDoNewSite_noerror_base_exists_but_empty(t *testing.T) {
+       basepath := filepath.Join(os.TempDir(), "blog")
+       hugofs.SourceFs = new(afero.MemMapFs)
+       hugofs.SourceFs.MkdirAll(basepath, 777)
+       err := doNewSite(basepath, false)
+       assert.Nil(t, err)
+}
+
 func TestDoNewSite_error_base_exists(t *testing.T) {
        basepath := filepath.Join(os.TempDir(), "blog")
        hugofs.SourceFs = new(afero.MemMapFs)
        hugofs.SourceFs.MkdirAll(basepath, 777)
+       hugofs.SourceFs.Create(filepath.Join(basepath, "foo"))
+       // Since the directory already exists and isn't empty, expect an error
        err := doNewSite(basepath, false)
        assert.NotNil(t, err)
 }
@@ -59,8 +70,7 @@ func TestDoNewSite_force_empty_dir(t *testing.T) {
        checkNewSiteInited(basepath, t)
 }
 
-// TODO(spf13): Fix and re-enable this.
-func _TestDoNewSite_error_force_dir_inside_exists(t *testing.T) {
+func TestDoNewSite_error_force_dir_inside_exists(t *testing.T) {
        basepath := filepath.Join(os.TempDir(), "blog")
        contentPath := filepath.Join(basepath, "content")
        hugofs.SourceFs = new(afero.MemMapFs)