Commit af790d09 authored by Timo Furrer's avatar Timo Furrer ☕
Browse files

Merge branch 'testifyAssertions3' into 'main' 

test: Refactor tests to use testify assertions 3

Closes #2206

See merge request !2695
parents 45dd0c95 d3e63b00

error_tracking_test.go

+12 −28
Original line number Diff line number Diff line
@@ -19,8 +19,10 @@ package gitlab 
import (

	"fmt"

	"net/http"

	"reflect"

	"testing"



	"github.com/stretchr/testify/assert"

	"github.com/stretchr/testify/require"

)



func TestGetErrorTracking(t *testing.T) {
@@ -39,9 +41,7 @@ func TestGetErrorTracking(t *testing.T) { 
	})



	et, _, err := client.ErrorTracking.GetErrorTrackingSettings(1)

	if err != nil {

		t.Errorf("ErrorTracking.GetErrorTracking returned error: %v", err)

	}

	require.NoError(t, err)



	want := &ErrorTrackingSettings{

		Active:            true,
@@ -51,9 +51,7 @@ func TestGetErrorTracking(t *testing.T) { 
		Integrated:        false,

	}



	if !reflect.DeepEqual(want, et) {

		t.Errorf("ErrorTracking.GetErrorTracking returned %+v, want %+v", et, want)

	}

	assert.Equal(t, want, et)

}



func TestDisableErrorTracking(t *testing.T) {
@@ -78,9 +76,7 @@ func TestDisableErrorTracking(t *testing.T) { 
			Integrated: Ptr(false),

		},

	)

	if err != nil {

		t.Errorf("ErrorTracking.EnableDisableErrorTracking returned error: %v", err)

	}

	require.NoError(t, err)



	want := &ErrorTrackingSettings{

		Active:            false,
@@ -90,9 +86,7 @@ func TestDisableErrorTracking(t *testing.T) { 
		Integrated:        false,

	}



	if !reflect.DeepEqual(want, et) {

		t.Errorf("ErrorTracking.EnableDisableErrorTracking returned %+v, want %+v", et, want)

	}

	assert.Equal(t, want, et)

}



func TestListErrorTrackingClientKeys(t *testing.T) {
@@ -117,9 +111,7 @@ func TestListErrorTrackingClientKeys(t *testing.T) { 
			PerPage: 10,

		},

	})

	if err != nil {

		t.Errorf("ErrorTracking.ListErrorTrackingClientKeys returned error: %v", err)

	}

	require.NoError(t, err)



	want := []*ErrorTrackingClientKey{{

		ID:        1,
@@ -128,9 +120,7 @@ func TestListErrorTrackingClientKeys(t *testing.T) { 
		SentryDsn: "https://glet_aa77551d849c083f76d0bc545ed053a3@gitlab.example.com/api/v4/error_tracking/collector/5",

	}}



	if !reflect.DeepEqual(want, cks) {

		t.Errorf("ErrorTracking.ListErrorTrackingClientKeys returned %+v, want %+v", cks, want)

	}

	assert.Equal(t, want, cks)

}



func TestCreateClientKey(t *testing.T) {
@@ -148,9 +138,7 @@ func TestCreateClientKey(t *testing.T) { 
	})



	ck, _, err := client.ErrorTracking.CreateClientKey(1)

	if err != nil {

		t.Errorf("ErrorTracking.CreateClientKey returned error: %v", err)

	}

	require.NoError(t, err)



	want := &ErrorTrackingClientKey{

		ID:        1,
@@ -159,9 +147,7 @@ func TestCreateClientKey(t *testing.T) { 
		SentryDsn: "https://glet_aa77551d849c083f76d0bc545ed053a3@gitlab.example.com/api/v4/error_tracking/collector/5",

	}



	if !reflect.DeepEqual(want, ck) {

		t.Errorf("ErrorTracking.CreateClientKey returned %+v, want %+v", ck, want)

	}

	assert.Equal(t, want, ck)

}



func TestDeleteClientKey(t *testing.T) {
@@ -174,7 +160,5 @@ func TestDeleteClientKey(t *testing.T) { 
	})



	_, err := client.ErrorTracking.DeleteClientKey(1, 3)

	if err != nil {

		t.Errorf("ErrorTracking.DeleteClientKey returned error: %v", err)

	}

	require.NoError(t, err)

}

generic_packages_test.go

+11 −17
Original line number Diff line number Diff line
@@ -19,11 +19,11 @@ package gitlab 
import (

	"fmt"

	"net/http"

	"reflect"

	"strings"

	"testing"



	"github.com/stretchr/testify/assert"

	"github.com/stretchr/testify/require"

)



func TestPublishPackageFile(t *testing.T) {
@@ -40,9 +40,7 @@ func TestPublishPackageFile(t *testing.T) { 
	})



	_, _, err := client.GenericPackages.PublishPackageFile(1234, "foo", "0.1.2", "bar-baz.txt", strings.NewReader("bar = baz"), &PublishPackageFileOptions{})

	if err != nil {

		t.Errorf("GenericPackages.PublishPackageFile returned error: %v", err)

	}

	require.NoError(t, err)

}



func TestDownloadPackageFile(t *testing.T) {
@@ -57,14 +55,10 @@ func TestDownloadPackageFile(t *testing.T) { 
	})



	packageBytes, _, err := client.GenericPackages.DownloadPackageFile(1234, "foo", "0.1.2", "bar-baz.txt")

	if err != nil {

		t.Errorf("GenericPackages.DownloadPackageFile returned error: %v", err)

	}

	require.NoError(t, err)



	want := []byte("bar = baz")

	if !reflect.DeepEqual(want, packageBytes) {

		t.Errorf("GenericPackages.DownloadPackageFile returned %+v, want %+v", packageBytes, want)

	}

	assert.Equal(t, want, packageBytes)

}



func TestFormatPackageURL(t *testing.T) {
@@ -72,7 +66,7 @@ func TestFormatPackageURL(t *testing.T) { 
	_, client := setup(t)



	url, err := client.GenericPackages.FormatPackageURL(1234, "foo", "0.1.2", "bar-baz.txt")

	assert.NoError(t, err)

	require.NoError(t, err)



	want := "projects/1234/packages/generic/foo/0%2E1%2E2/bar-baz%2Etxt"

	assert.Equal(t, want, url)

invites_test.go

+15 −37
Original line number Diff line number Diff line
@@ -3,8 +3,10 @@ package gitlab 
import (

	"fmt"

	"net/http"

	"reflect"

	"testing"



	"github.com/stretchr/testify/assert"

	"github.com/stretchr/testify/require"

)



func TestListGroupPendingInvites(t *testing.T) {
@@ -21,14 +23,10 @@ func TestListGroupPendingInvites(t *testing.T) { 
	}



	projects, _, err := client.Invites.ListPendingGroupInvitations("test", opt)

	if err != nil {

		t.Errorf("Invites.ListPendingGroupInvitations returned error: %v", err)

	}

	require.NoError(t, err)



	want := []*PendingInvite{{ID: 1}, {ID: 2}}

	if !reflect.DeepEqual(want, projects) {

		t.Errorf("Invites.ListPendingGroupInvitations returned %+v, want %+v", projects, want)

	}

	assert.Equal(t, want, projects)

}



func TestGroupInvites(t *testing.T) {
@@ -45,14 +43,10 @@ func TestGroupInvites(t *testing.T) { 
	}



	projects, _, err := client.Invites.GroupInvites("test", opt)

	if err != nil {

		t.Errorf("Invites.GroupInvites returned error: %v", err)

	}

	require.NoError(t, err)



	want := &InvitesResult{Status: "success"}

	if !reflect.DeepEqual(want, projects) {

		t.Errorf("Invites.GroupInvites returned %+v, want %+v", projects, want)

	}

	assert.Equal(t, want, projects)

}



func TestGroupInvitesError(t *testing.T) {
@@ -69,14 +63,10 @@ func TestGroupInvitesError(t *testing.T) { 
	}



	projects, _, err := client.Invites.GroupInvites("test", opt)

	if err != nil {

		t.Errorf("Invites.GroupInvites returned error: %v", err)

	}

	require.NoError(t, err)



	want := &InvitesResult{Status: "error", Message: map[string]string{"example@member.org": "Already invited"}}

	if !reflect.DeepEqual(want, projects) {

		t.Errorf("Invites.GroupInvites returned %+v, want %+v", projects, want)

	}

	assert.Equal(t, want, projects)

}



func TestListProjectPendingInvites(t *testing.T) {
@@ -93,14 +83,10 @@ func TestListProjectPendingInvites(t *testing.T) { 
	}



	projects, _, err := client.Invites.ListPendingProjectInvitations("test", opt)

	if err != nil {

		t.Errorf("Invites.ListPendingProjectInvitations returned error: %v", err)

	}

	require.NoError(t, err)



	want := []*PendingInvite{{ID: 1}, {ID: 2}}

	if !reflect.DeepEqual(want, projects) {

		t.Errorf("Invites.ListPendingProjectInvitations returned %+v, want %+v", projects, want)

	}

	assert.Equal(t, want, projects)

}



func TestProjectInvites(t *testing.T) {
@@ -117,14 +103,10 @@ func TestProjectInvites(t *testing.T) { 
	}



	projects, _, err := client.Invites.ProjectInvites("test", opt)

	if err != nil {

		t.Errorf("Invites.ProjectInvites returned error: %v", err)

	}

	require.NoError(t, err)



	want := &InvitesResult{Status: "success"}

	if !reflect.DeepEqual(want, projects) {

		t.Errorf("Invites.ProjectInvites returned %+v, want %+v", projects, want)

	}

	assert.Equal(t, want, projects)

}



func TestProjectInvitesError(t *testing.T) {
@@ -141,12 +123,8 @@ func TestProjectInvitesError(t *testing.T) { 
	}



	projects, _, err := client.Invites.ProjectInvites("test", opt)

	if err != nil {

		t.Errorf("Invites.ProjectInvites returned error: %v", err)

	}

	require.NoError(t, err)



	want := &InvitesResult{Status: "error", Message: map[string]string{"example@member.org": "Already invited"}}

	if !reflect.DeepEqual(want, projects) {

		t.Errorf("Invites.ProjectInvites returned %+v, want %+v", projects, want)

	}

	assert.Equal(t, want, projects)

}