Merge branch 'master' into SoMsg

.travis.yml

@@ -1,17 +1,13 @@
+arch:
+  - amd64
+  - ppc64le
+
 language: go
 
 go:
-  - 1.2.x
-  - 1.3.x
-  - 1.4.x
-  - 1.5.x
-  - 1.6.x
-  - 1.7.x
-  - 1.8.x
-  - 1.9.x
-  - 1.10.x
-  - 1.11.x
-  - 1.12.x
+  - 1.13.x
+  - 1.14.x
+  - 1.15.x
   - master
 
 install:

convey/context.go

@@ -169,7 +169,7 @@ func (ctx *context) SkipSo(stuff ...interface{}) {
 	ctx.assertionReport(reporting.NewSkipReport())
 }
 
-func (ctx *context) So(actual interface{}, assert assertion, expected ...interface{}) {
+func (ctx *context) So(actual interface{}, assert Assertion, expected ...interface{}) {
 	if result := assert(actual, expected...); result == assertionSuccess {
 		ctx.assertionReport(reporting.NewSuccessReport())
 	} else {

convey/doc.go

@@ -23,8 +23,8 @@ type C interface {
 	SkipConvey(items ...interface{})
 	FocusConvey(items ...interface{})
 
-	So(actual interface{}, assert assertion, expected ...interface{})
-	SoMsg(msg string, actual interface{}, assert assertion, expected ...interface{})
+	So(actual interface{}, assert Assertion, expected ...interface{})
+	SoMsg(msg string, actual interface{}, assert Assertion, expected ...interface{})
 	SkipSo(stuff ...interface{})
 
 	Reset(action func())
@@ -105,11 +105,11 @@ func Reset(action func()) {
 
 /////////////////////////////////// Assertions ///////////////////////////////////
 
-// assertion is an alias for a function with a signature that the convey.So()
+// Assertion is an alias for a function with a signature that the convey.So()
 // method can handle. Any future or custom assertions should conform to this
 // method signature. The return value should be an empty string if the assertion
 // passes and a well-formed failure message if not.
-type assertion func(actual interface{}, expected ...interface{}) string
+type Assertion func(actual interface{}, expected ...interface{}) string
 
 const assertionSuccess = ""
 
@@ -122,7 +122,7 @@ const assertionSuccess = ""
 // documentation on specific assertion methods. A failing assertion will
 // cause t.Fail() to be invoked--you should never call this method (or other
 // failure-inducing methods) in your test code. Leave that to GoConvey.
-func So(actual interface{}, assert assertion, expected ...interface{}) {
+func So(actual interface{}, assert Assertion, expected ...interface{}) {
 	mustGetCurrentContext().So(actual, assert, expected...)
 }
 

web/server/parser/packageParser.go

@@ -50,6 +50,15 @@ func (self *outputParser) separateTestFunctionsAndMetadata() {
 		if self.processNonTestOutput() {
 			break
 		}
+		// Hack for results from ginkgo tests
+		lines := strings.Split(self.line, " --- ")
+		if len(lines) == 2 && len(strings.TrimSpace(lines[0])) > 0 && strings.HasPrefix(lines[1], "PASS") {
+			self.line = lines[0]
+			self.processTestOutput()
+			self.line = "--- " + lines[1]
+			self.processTestOutput()
+			continue
+		}
 		self.processTestOutput()
 	}
 }

web/server/parser/package_parser_test.go

@@ -1068,3 +1068,45 @@ var expectedGolang17Subtests = contract.PackageResult{
 		},
 	},
 }
+
+const inputGinkgo_Passes = `
+SUCCESS! -- 12 Passed | 0 Failed | 0 Pending | 0 Skipped --- PASS: TestModels (0.01s)
+PASS
+ok  	github.com/smartystreets/goconvey/webserver/examples	3.433s
+`
+
+var expectedGinkgo_Passes = contract.PackageResult{
+	PackageName: "github.com/smartystreets/goconvey/webserver/examples",
+	Elapsed:     3.433,
+	Outcome:     contract.Passed,
+}
+
+func TestParsePackage_GinkgoWithSuccessOutput(t *testing.T) {
+	actual := &contract.PackageResult{PackageName: expectedGinkgo_Passes.PackageName}
+	ParsePackageResults(actual, inputGinkgo_Passes)
+	assertEqual(t, expectedGinkgo_Passes, *actual)
+}
+
+const inputGinkgo_Fails = `
+Summarizing 1 Failure:
+
+[Fail] main.go GetHostname [It] returns an error if systemInfo.hostname == nil
+/Users/joeuser/go/src/github.com/smartystreets/goconvey/webserver/examples/main.go:141
+
+Ran 33 of 33 Specs in 0.005 seconds
+FAIL! -- 32 Passed | 1 Failed | 0 Pending | 0 Skipped --- FAIL: TestRoutes (0.01s)
+FAIL
+FAIL	github.com/smartystreets/goconvey/webserver/examples	0.810s
+`
+
+var expectedGinkgo_Fails = contract.PackageResult{
+	PackageName: "github.com/smartystreets/goconvey/webserver/examples",
+	Elapsed:     0.810,
+	Outcome:     contract.Failed,
+}
+
+func TestParsePackage_GinkgoWithFailureOutput(t *testing.T) {
+	actual := &contract.PackageResult{PackageName: expectedGinkgo_Fails.PackageName}
+	ParsePackageResults(actual, inputGinkgo_Fails)
+	assertEqual(t, expectedGinkgo_Fails, *actual)
+}

web/server/system/shell.go

@@ -52,10 +52,6 @@ func findGoConvey(directory, gobin, packageName, tagsArg string) Command {
 	return NewCommand(directory, gobin, "list", "-f", "'{{.TestImports}}{{.XTestImports}}'", tagsArg, packageName)
 }
 
-func compile(directory, gobin, tagsArg string) Command {
-	return NewCommand(directory, gobin, "test", "-i", tagsArg)
-}
-
 func runWithCoverage(compile, goconvey Command, coverage bool, reportPath, directory, gobin, defaultTimeout, tagsArg string, customArguments []string) Command {
 	if compile.Error != nil || goconvey.Error != nil {
 		return compile

web/server/system/shell_1_16.go

@@ -0,0 +1,7 @@
+// +build go1.16
+
+package system
+
+func compile(directory, gobin, tagsArg string) Command {
+	return NewCommand(directory, gobin, "test", tagsArg)
+}

web/server/system/shell_older_than_1_16.go

@@ -0,0 +1,7 @@
+// +build !go1.16
+
+package system
+
+func compile(directory, gobin, tagsArg string) Command {
+	return NewCommand(directory, gobin, "test", "-i", tagsArg)
+}