From c35f8b03e445af4cdb8077fe6c185becb00c0213 Mon Sep 17 00:00:00 2001
From: umarcor <unai.martinezcorral@ehu.eus>
Date: Sun, 8 Sep 2019 15:40:54 +0200
Subject: [PATCH] style: simply defer os.RemoveAll

---
 cobra/cmd/add_test.go  |  7 +------
 cobra/cmd/init_test.go | 16 +++++++---------
 2 files changed, 8 insertions(+), 15 deletions(-)

diff --git a/cobra/cmd/add_test.go b/cobra/cmd/add_test.go
index 0de1d221..b3d01016 100644
--- a/cobra/cmd/add_test.go
+++ b/cobra/cmd/add_test.go
@@ -23,15 +23,10 @@ func TestGoldenAddCmd(t *testing.T) {
 			Viper:   true,
 		},
 	}
+	defer os.RemoveAll(command.AbsolutePath)
 
 	// init project first
 	command.Project.Create()
-	defer func() {
-		if _, err := os.Stat(command.AbsolutePath); err == nil {
-			os.RemoveAll(command.AbsolutePath)
-		}
-	}()
-
 	if err := command.Create(); err != nil {
 		t.Fatal(err)
 	}
diff --git a/cobra/cmd/init_test.go b/cobra/cmd/init_test.go
index 3060c527..fd8f87f0 100644
--- a/cobra/cmd/init_test.go
+++ b/cobra/cmd/init_test.go
@@ -12,19 +12,17 @@ func TestGoldenInitCmd(t *testing.T) {
 	wd, _ := os.Getwd()
 	project := &Project{
 		AbsolutePath: fmt.Sprintf("%s/testproject", wd),
-		PkgName:      "github.com/spf13/testproject",
 		Legal:        getLicense(),
 		Copyright:    copyrightLine(),
-		Viper:        true,
-		AppName:      "testproject",
+
+		// required to init
+		AppName: "testproject",
+		PkgName: "github.com/spf13/testproject",
+		Viper:   true,
 	}
+	defer os.RemoveAll(project.AbsolutePath)
 
-	defer func() {
-		if _, err := os.Stat(project.AbsolutePath); err == nil {
-			os.RemoveAll(project.AbsolutePath)
-		}
-	}()
-
+	// init project first
 	err := project.Create()
 	if err != nil {
 		t.Fatal(err)