fix ci failures

stretchr · Dec 30, 2024 · 688992a · 688992a
1 parent f85dd19
commit 688992a
Show file tree

Hide file tree

Showing 6 changed files with 180 additions and 2 deletions.
diff --git a/assert/assertion_format.go b/assert/assertion_format.go
diff --git a/assert/assertion_forward.go b/assert/assertion_forward.go
diff --git a/assert/assertions.go b/assert/assertions.go
@@ -20,8 +20,8 @@ import (
 	"github.com/davecgh/go-spew/spew"
 	"github.com/pmezard/go-difflib/difflib"
 
+	"github.com/stretchr/testify/assert/jsonmatch"
 	// Wrapper around gopkg.in/yaml.v3
-	"github.com/stretchr/testify/assert/internal/jsonmatch"
 	"github.com/stretchr/testify/assert/yaml"
 )
 
@@ -1819,7 +1819,7 @@ type ValueMatchers = jsonmatch.Matchers
 //
 // Can use nil for matchers to test equality of pure json.
 //
-// Note: in cases where expected and actual are not equal, the value for the matcher will be displayed as unequal, 
+// Note: in cases where expected and actual are not equal, the value for the matcher will be displayed as unequal,
 // regardless of the output of the matcher function.  This should be fixed in a future release.
 //
 //	assert.JSONMatchesBy(t, `{ "foo": "$NOT_EMPTY" }`, `{ "foo": "baz" }`, assert.ValueMatchers{

diff --git a/assert/internal/jsonmatch/matches_by.go → assert/jsonmatch/matches_by.go b/assert/internal/jsonmatch/matches_by.go → assert/jsonmatch/matches_by.go
diff --git a/require/require.go b/require/require.go
diff --git a/require/require_forward.go b/require/require_forward.go