Merge branch 'development' of github.com:gobuffalo/pop into development

Author: larrymjordan

genny/model/_fixtures/models/widget_test.go

@@ -1,6 +1,4 @@
-package models_test
-
-import "testing"
+package models
 
 func (ms *ModelSuite) Test_Widget() {
 	ms.Fail("This test needs to be implemented!")

genny/model/options.go

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

genny/model/options_test.go

@@ -20,7 +20,7 @@ func Test_Options_Validate(t *testing.T) {
 	r.Equal(0, len(opts.Attrs))
 	r.Equal("models", opts.Path)
 	r.Equal("models", opts.Package)
-	r.Equal("models_test", opts.TestPackage)
+	r.Equal("models", opts.TestPackage)
 	r.Equal("json", opts.Encoding)
 
 	// Force ID opt

genny/model/templates/-path-/-name-_test.go.tmpl

@@ -1,7 +1,5 @@
 package {{.opts.TestPackage}}
 
-import "testing"
-
 func (ms *ModelSuite) Test_{{.model.Name.Proper}}() {
 	ms.Fail("This test needs to be implemented!")
 }