Fix models generated test package (#505)

gobuffalo · Dec 14, 2019 · 394b898 · 394b898
1 parent bcfc830
commit 394b898
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 3 deletions.
diff --git a/genny/model/_fixtures/models/widget_test.go b/genny/model/_fixtures/models/widget_test.go
@@ -1,4 +1,4 @@
-package models
+package models_test
 
 import "testing"
 

diff --git a/genny/model/options.go b/genny/model/options.go
@@ -1,6 +1,7 @@
 package model
 
 import (
+	"fmt"
 	"path/filepath"
 	"strings"
 
@@ -32,7 +33,7 @@ func (opts *Options) Validate() error {
 		opts.Package = filepath.Base(opts.Path)
 	}
 	if len(opts.TestPackage) == 0 {
-		opts.TestPackage = opts.Package
+		opts.TestPackage = fmt.Sprintf("%s_%s", opts.Package, "test")
 	}
 	if len(opts.Encoding) == 0 {
 		opts.Encoding = "json"

diff --git a/genny/model/options_test.go b/genny/model/options_test.go
@@ -18,6 +18,10 @@ func Test_Options_Validate(t *testing.T) {
 	err = opts.Validate()
 	r.NoError(err)
 	r.Equal(0, len(opts.Attrs))
+	r.Equal("models", opts.Path)
+	r.Equal("models", opts.Package)
+	r.Equal("models_test", opts.TestPackage)
+	r.Equal("json", opts.Encoding)
 
 	// Force ID opt
 	opts.ForceDefaultID = true

diff --git a/packrd/packed-packr.go b/packrd/packed-packr.go