From 485adb037b3c3c978f3a8e8ad2481d5a4824d9a3 Mon Sep 17 00:00:00 2001
From: Michael Whatcott <mike@smarty.com>
Date: Wed, 28 Jun 2023 09:42:05 -0600
Subject: [PATCH] Refer to recently migrated assertions module.

Closes #52
---
 convey/assertions.go           | 4 ++--
 convey/init.go                 | 2 +-
 convey/reporting/reports.go    | 2 +-
 convey/reporting_hooks_test.go | 4 ++--
 convey/update_assertions.sh    | 8 ++++----
 go.mod                         | 2 +-
 go.sum                         | 4 ++--
 7 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/convey/assertions.go b/convey/assertions.go
index bff8eacc..7b71f6dd 100644
--- a/convey/assertions.go
+++ b/convey/assertions.go
@@ -4,9 +4,9 @@ package convey
 
 //go:generate ./update_assertions.sh
 
-import "github.com/smartystreets/assertions"
+import "github.com/smarty/assertions"
 
-// These assertions are forwarded from github.com/smartystreets/assertions
+// These assertions are forwarded from github.com/smarty/assertions
 // in order to make convey self-contained.
 var (
 	ShouldAlmostEqual            = assertions.ShouldAlmostEqual
diff --git a/convey/init.go b/convey/init.go
index cb930a0d..c872881f 100644
--- a/convey/init.go
+++ b/convey/init.go
@@ -5,7 +5,7 @@ import (
 	"os"
 
 	"github.com/jtolds/gls"
-	"github.com/smartystreets/assertions"
+	"github.com/smarty/assertions"
 	"github.com/smartystreets/goconvey/convey/reporting"
 )
 
diff --git a/convey/reporting/reports.go b/convey/reporting/reports.go
index 7a650197..b9089810 100644
--- a/convey/reporting/reports.go
+++ b/convey/reporting/reports.go
@@ -76,7 +76,7 @@ func removePackagePath(name string) string {
 
 /////////////////// FailureView ////////////////////////
 
-// This struct is also declared in github.com/smartystreets/assertions.
+// FailureView is also declared in github.com/smarty/assertions.
 // The json struct tags should be equal in both declarations.
 type FailureView struct {
 	Message  string `json:"Message"`
diff --git a/convey/reporting_hooks_test.go b/convey/reporting_hooks_test.go
index a9ea6c5d..92da1a6f 100644
--- a/convey/reporting_hooks_test.go
+++ b/convey/reporting_hooks_test.go
@@ -63,7 +63,7 @@ func TestComparisonFailureDeserializedAndReported(t *testing.T) {
 		So("hi", ShouldEqual, "bye")
 	})
 
-	expectEqual(t, "Begin|A|Failure(bye/hi)|Exit|End", myReporter.wholeStory())
+	expectEqual(t, `Begin|A|Failure("bye"/"hi")|Exit|End`, myReporter.wholeStory())
 }
 
 func TestNestedFailureReported(t *testing.T) {
@@ -311,7 +311,7 @@ func (self *fakeReporter) wholeStory() string {
 
 type fakeGoTest struct{}
 
-func (self *fakeGoTest) Fail()                                     {}
+func (self *fakeGoTest) Fail()                             {}
 func (self *fakeGoTest) Fatalf(format string, args ...any) {}
 
 var test t = new(fakeGoTest)
diff --git a/convey/update_assertions.sh b/convey/update_assertions.sh
index df280622..a2e10eea 100755
--- a/convey/update_assertions.sh
+++ b/convey/update_assertions.sh
@@ -3,8 +3,8 @@
 cd "$(dirname $(realpath $0))"
 
 ASSERTIONS=($(
-  go tool nm "$(go list -export -f '{{.Export}}' github.com/smartystreets/assertions)" |\
-    awk '/ T github\.com\/smartystreets\/assertions\.Should/{split($3, a, "."); print a[3]}' |\
+  go tool nm "$(go list -export -f '{{.Export}}' github.com/smarty/assertions)" |\
+    awk '/ T github\.com\/smarty\/assertions\.Should/{split($3, a, "."); print a[3]}' |\
     sort | uniq))
 
 (
@@ -14,9 +14,9 @@ ASSERTIONS=($(
   echo
   echo "//go:generate ./update_assertions.sh"
   echo
-  echo "import \"github.com/smartystreets/assertions\""
+  echo "import \"github.com/smarty/assertions\""
   echo
-  echo "// These assertions are forwarded from github.com/smartystreets/assertions"
+  echo "// These assertions are forwarded from github.com/smarty/assertions"
   echo "// in order to make convey self-contained."
   echo "var ("
 
diff --git a/go.mod b/go.mod
index 6d2e0379..fc22c69f 100644
--- a/go.mod
+++ b/go.mod
@@ -4,7 +4,7 @@ go 1.18
 
 require (
 	github.com/jtolds/gls v4.20.0+incompatible
-	github.com/smartystreets/assertions v1.13.1
+	github.com/smarty/assertions v1.15.0
 	golang.org/x/tools v0.7.0
 )
 
diff --git a/go.sum b/go.sum
index e77d0632..d2c7152c 100644
--- a/go.sum
+++ b/go.sum
@@ -2,8 +2,8 @@ github.com/gopherjs/gopherjs v1.17.2 h1:fQnZVsXk8uxXIStYb0N4bGk7jeyTalG/wsZjQ25d
 github.com/gopherjs/gopherjs v1.17.2/go.mod h1:pRRIvn/QzFLrKfvEz3qUuEhtE/zLCWfreZ6J5gM2i+k=
 github.com/jtolds/gls v4.20.0+incompatible h1:xdiiI2gbIgH/gLH7ADydsJ1uDOEzR8yvV7C0MuV77Wo=
 github.com/jtolds/gls v4.20.0+incompatible/go.mod h1:QJZ7F/aHp+rZTRtaJ1ow/lLfFfVYBRgL+9YlvaHOwJU=
-github.com/smartystreets/assertions v1.13.1 h1:Ef7KhSmjZcK6AVf9YbJdvPYG9avaF0ZxudX+ThRdWfU=
-github.com/smartystreets/assertions v1.13.1/go.mod h1:cXr/IwVfSo/RbCSPhoAPv73p3hlSdrBH/b3SdnW/LMY=
+github.com/smarty/assertions v1.15.0 h1:cR//PqUBUiQRakZWqBiFFQ9wb8emQGDb0HeGdqGByCY=
+github.com/smarty/assertions v1.15.0/go.mod h1:yABtdzeQs6l1brC900WlRNwj6ZR55d7B+E8C6HtKdec=
 golang.org/x/mod v0.9.0 h1:KENHtAZL2y3NLMYZeHY9DW8HW8V+kQyJsY/V9JlKvCs=
 golang.org/x/mod v0.9.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs=
 golang.org/x/sync v0.1.0 h1:wsuoTGHzEhffawBOhz5CYhcrV4IdKZbEyZjBMuTp12o=