Remove github.com/kr/pretty in favor of assert.EqualValues()

go.mod

@@ -28,7 +28,6 @@ require (
 	github.com/gorilla/securecookie v1.1.1
 	github.com/hashicorp/go-cleanhttp v0.5.2 // indirect
 	github.com/joho/godotenv v1.4.0
-	github.com/kr/pretty v0.3.0
 	github.com/lib/pq v1.10.3
 	github.com/mattn/go-sqlite3 v1.14.9
 	github.com/moby/moby v20.10.10+incompatible

pipeline/frontend/yaml/compiler/params_test.go

@@ -1,10 +1,8 @@
 package compiler
 
 import (
-	"reflect"
 	"testing"
 
-	"github.com/kr/pretty"
 	"github.com/stretchr/testify/assert"
 )
 
@@ -30,9 +28,5 @@ func TestParamsToEnv(t *testing.T) {
 	}
 	got := map[string]string{}
 	assert.NoError(t, paramsToEnv(from, got))
-
-	if !reflect.DeepEqual(want, got) {
-		t.Errorf("Problem converting plugin parameters to environment variables")
-		pretty.Ldiff(t, want, got)
-	}
+	assert.EqualValues(t, want, got, "Problem converting plugin parameters to environment variables")
 }

pipeline/frontend/yaml/compiler/script_posix_test.go

@@ -4,7 +4,7 @@ import (
 	"encoding/base64"
 	"testing"
 
-	"github.com/kr/pretty"
+	"github.com/stretchr/testify/assert"
 )
 
 func TestGenerateScriptPosix(t *testing.T) {
@@ -43,10 +43,6 @@ go test
 		script := generateScriptPosix(test.from)
 		decoded, _ := base64.StdEncoding.DecodeString(script)
 		got := string(decoded)
-
-		if got != test.want {
-			t.Errorf("Want encoded script for %s", test.from)
-			pretty.Ldiff(t, got, test.want)
-		}
+		assert.EqualValues(t, got, test.want, "Want encoded script for %s", test.from)
 	}
 }

pipeline/frontend/yaml/container_test.go

@@ -1,10 +1,9 @@
 package yaml
 
 import (
-	"reflect"
 	"testing"
 
-	"github.com/kr/pretty"
+	"github.com/stretchr/testify/assert"
 	"gopkg.in/yaml.v3"
 
 	"github.com/woodpecker-ci/woodpecker/pipeline/frontend/yaml/types"
@@ -114,12 +113,8 @@ func TestUnmarshalContainer(t *testing.T) {
 	}
 	got := Container{}
 	err := yaml.Unmarshal(containerYaml, &got)
-	if err != nil {
-		t.Error(err)
-	} else if !reflect.DeepEqual(want, got) {
-		t.Errorf("problem parsing container")
-		pretty.Ldiff(t, want, got)
-	}
+	assert.NoError(t, err)
+	assert.EqualValues(t, want, got, "problem parsing container")
 }
 
 // TestUnmarshalContainersErr unmarshals a map of containers. The order is
@@ -153,12 +148,8 @@ func TestUnmarshalContainers(t *testing.T) {
 		in := []byte(test.from)
 		got := Containers{}
 		err := yaml.Unmarshal(in, &got)
-		if err != nil {
-			t.Error(err)
-		} else if !reflect.DeepEqual(test.want, got.Containers) {
-			t.Errorf("problem parsing containers %q", test.from)
-			pretty.Ldiff(t, test.want, got.Containers)
-		}
+		assert.NoError(t, err)
+		assert.EqualValues(t, test.want, got.Containers, "problem parsing containers %q", test.from)
 	}
 }
 
@@ -173,8 +164,6 @@ func TestUnmarshalContainersErr(t *testing.T) {
 		in := []byte(test)
 		containers := new(Containers)
 		err := yaml.Unmarshal(in, &containers)
-		if err == nil {
-			t.Errorf("wanted error for containers %q", test)
-		}
+		assert.Error(t, err, "wanted error for containers %q", test)
 	}
 }

pipeline/frontend/yaml/network_test.go

@@ -1,10 +1,9 @@
 package yaml
 
 import (
-	"reflect"
 	"testing"
 
-	"github.com/kr/pretty"
+	"github.com/stretchr/testify/assert"
 	"gopkg.in/yaml.v3"
 )
 
@@ -36,12 +35,8 @@ func TestUnmarshalNetwork(t *testing.T) {
 		in := []byte(test.from)
 		got := Network{}
 		err := yaml.Unmarshal(in, &got)
-		if err != nil {
-			t.Error(err)
-		} else if !reflect.DeepEqual(test.want, got) {
-			t.Errorf("problem parsing network %q", test.from)
-			pretty.Ldiff(t, test.want, got)
-		}
+		assert.NoError(t, err)
+		assert.EqualValues(t, test.want, got, "problem parsing network %q", test.from)
 	}
 }
 
@@ -83,12 +78,8 @@ func TestUnmarshalNetworks(t *testing.T) {
 		in := []byte(test.from)
 		got := Networks{}
 		err := yaml.Unmarshal(in, &got)
-		if err != nil {
-			t.Error(err)
-		} else if !reflect.DeepEqual(test.want, got.Networks) {
-			t.Errorf("problem parsing network %q", test.from)
-			pretty.Ldiff(t, test.want, got.Networks)
-		}
+		assert.NoError(t, err)
+		assert.EqualValues(t, test.want, got.Networks, "problem parsing network %q", test.from)
 	}
 }
 
@@ -101,8 +92,6 @@ func TestUnmarshalNetworkErr(t *testing.T) {
 	for _, test := range testdata {
 		in := []byte(test)
 		err := yaml.Unmarshal(in, new(Networks))
-		if err == nil {
-			t.Errorf("wanted error for networks %q", test)
-		}
+		assert.Error(t, err, "wanted error for networks %q", test)
 	}
 }

pipeline/frontend/yaml/secret_test.go

@@ -1,10 +1,9 @@
 package yaml
 
 import (
-	"reflect"
 	"testing"
 
-	"github.com/kr/pretty"
+	"github.com/stretchr/testify/assert"
 	"gopkg.in/yaml.v3"
 )
 
@@ -54,11 +53,7 @@ func TestUnmarshalSecrets(t *testing.T) {
 		in := []byte(test.from)
 		got := Secrets{}
 		err := yaml.Unmarshal(in, &got)
-		if err != nil {
-			t.Error(err)
-		} else if !reflect.DeepEqual(test.want, got.Secrets) {
-			t.Errorf("problem parsing secrets %q", test.from)
-			pretty.Ldiff(t, test.want, got.Secrets)
-		}
+		assert.NoError(t, err)
+		assert.EqualValues(t, test.want, got.Secrets, "problem parsing secrets %q", test.from)
 	}
 }

pipeline/frontend/yaml/volume_test.go

@@ -1,10 +1,9 @@
 package yaml
 
 import (
-	"reflect"
 	"testing"
 
-	"github.com/kr/pretty"
+	"github.com/stretchr/testify/assert"
 	"gopkg.in/yaml.v3"
 )
 
@@ -36,12 +35,8 @@ func TestUnmarshalVolume(t *testing.T) {
 		in := []byte(test.from)
 		got := Volume{}
 		err := yaml.Unmarshal(in, &got)
-		if err != nil {
-			t.Error(err)
-		} else if !reflect.DeepEqual(test.want, got) {
-			t.Errorf("problem parsing volume %q", test.from)
-			pretty.Ldiff(t, test.want, got)
-		}
+		assert.NoError(t, err)
+		assert.EqualValues(t, test.want, got, "problem parsing volume %q", test.from)
 	}
 }
 
@@ -83,12 +78,8 @@ func TestUnmarshalVolumes(t *testing.T) {
 		in := []byte(test.from)
 		got := Volumes{}
 		err := yaml.Unmarshal(in, &got)
-		if err != nil {
-			t.Error(err)
-		} else if !reflect.DeepEqual(test.want, got.Volumes) {
-			t.Errorf("problem parsing volumes %q", test.from)
-			pretty.Ldiff(t, test.want, got.Volumes)
-		}
+		assert.NoError(t, err)
+		assert.EqualValues(t, test.want, got.Volumes, "problem parsing volumes %q", test.from)
 	}
 }
 
@@ -101,8 +92,6 @@ func TestUnmarshalVolumesErr(t *testing.T) {
 	for _, test := range testdata {
 		in := []byte(test)
 		err := yaml.Unmarshal(in, new(Volumes))
-		if err == nil {
-			t.Errorf("wanted error for volumes %q", test)
-		}
+		assert.Error(t, err, "wanted error for volumes %q", test)
 	}
 }