Commit 9b5cc98b authored by Timo Furrer's avatar Timo Furrer ☕
Browse files

Merge branch 'testifyAssertions4' into 'main' 

test: Refactor tests to use testify assertions 4

Closes #2206

See merge request !2696
parents af790d09 b3a5541a

issues_statistics_test.go

+9 −19
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 TestGetIssuesStatistics(t *testing.T) {
@@ -39,9 +41,7 @@ func TestGetIssuesStatistics(t *testing.T) { 
	}



	issue, _, err := client.IssuesStatistics.GetIssuesStatistics(opt)

	if err != nil {

		t.Fatal(err)

	}

	require.NoError(t, err)



	want := &IssuesStatistics{

		Statistics: IssuesStatisticsStatistics{
@@ -51,9 +51,7 @@ func TestGetIssuesStatistics(t *testing.T) { 
		},

	}



	if !reflect.DeepEqual(want, issue) {

		t.Errorf("IssuesStatistics.GetIssuesStatistics returned %+v, want %+v", issue, want)

	}

	assert.Equal(t, want, issue)

}



func TestGetGroupIssuesStatistics(t *testing.T) {
@@ -72,9 +70,7 @@ func TestGetGroupIssuesStatistics(t *testing.T) { 
	}



	issue, _, err := client.IssuesStatistics.GetGroupIssuesStatistics(1, opt)

	if err != nil {

		t.Fatal(err)

	}

	require.NoError(t, err)



	want := &IssuesStatistics{

		Statistics: IssuesStatisticsStatistics{
@@ -84,9 +80,7 @@ func TestGetGroupIssuesStatistics(t *testing.T) { 
		},

	}



	if !reflect.DeepEqual(want, issue) {

		t.Errorf("IssuesStatistics.GetGroupIssuesStatistics returned %+v, want %+v", issue, want)

	}

	assert.Equal(t, want, issue)

}



func TestGetProjectIssuesStatistics(t *testing.T) {
@@ -105,9 +99,7 @@ func TestGetProjectIssuesStatistics(t *testing.T) { 
	}



	issue, _, err := client.IssuesStatistics.GetProjectIssuesStatistics(1, opt)

	if err != nil {

		t.Fatal(err)

	}

	require.NoError(t, err)



	want := &IssuesStatistics{

		Statistics: IssuesStatisticsStatistics{
@@ -117,7 +109,5 @@ func TestGetProjectIssuesStatistics(t *testing.T) { 
		},

	}



	if !reflect.DeepEqual(want, issue) {

		t.Errorf("IssuesStatistics.GetProjectIssuesStatistics returned %+v, want %+v", issue, want)

	}

	assert.Equal(t, want, issue)

}

personal_access_tokens_test.go

+20 −60
Original line number Diff line number Diff line
@@ -18,9 +18,11 @@ package gitlab 


import (

	"net/http"

	"reflect"

	"testing"

	"time"



	"github.com/stretchr/testify/assert"

	"github.com/stretchr/testify/require"

)



func TestListPersonalAccessTokensWithUserFilter(t *testing.T) {
@@ -39,9 +41,7 @@ func TestListPersonalAccessTokensWithUserFilter(t *testing.T) { 
			ListOptions:   ListOptions{Page: 1, PerPage: 10},

		},

	)

	if err != nil {

		t.Errorf("PersonalAccessTokens.ListPersonalAccessTokens returned error: %v", err)

	}

	require.NoError(t, err)



	expiresAt1 := ISOTime(time.Date(2022, time.March, 21, 0, 0, 0, 0, time.UTC))

	expiresAt2 := ISOTime(time.Date(2022, time.March, 20, 0, 0, 0, 0, time.UTC))
@@ -73,11 +73,7 @@ func TestListPersonalAccessTokensWithUserFilter(t *testing.T) { 
		},

	}



	if !reflect.DeepEqual(want, personalAccessTokens) {

		t.Errorf(

			"PersonalAccessTokens.ListPersonalAccessTokens returned %+v, want %+v", personalAccessTokens, want,

		)

	}

	assert.Equal(t, want, personalAccessTokens)

}



func TestListPersonalAccessTokensNoUserFilter(t *testing.T) {
@@ -92,9 +88,7 @@ func TestListPersonalAccessTokensNoUserFilter(t *testing.T) { 
	personalAccessTokens, _, err := client.PersonalAccessTokens.ListPersonalAccessTokens(

		&ListPersonalAccessTokensOptions{ListOptions: ListOptions{Page: 1, PerPage: 10}},

	)

	if err != nil {

		t.Errorf("PersonalAccessTokens.ListPersonalAccessTokens returned error: %v", err)

	}

	require.NoError(t, err)



	expiresAt1 := ISOTime(time.Date(2022, time.March, 21, 0, 0, 0, 0, time.UTC))

	expiresAt2 := ISOTime(time.Date(2022, time.March, 20, 0, 0, 0, 0, time.UTC))
@@ -126,11 +120,7 @@ func TestListPersonalAccessTokensNoUserFilter(t *testing.T) { 
		},

	}



	if !reflect.DeepEqual(want, personalAccessTokens) {

		t.Errorf(

			"PersonalAccessTokens.ListPersonalAccessTokens returned %+v, want %+v", personalAccessTokens, want,

		)

	}

	assert.Equal(t, want, personalAccessTokens)

}



func TestGetSinglePersonalAccessTokenByID(t *testing.T) {
@@ -143,9 +133,7 @@ func TestGetSinglePersonalAccessTokenByID(t *testing.T) { 
	})



	token, _, err := client.PersonalAccessTokens.GetSinglePersonalAccessTokenByID(1)

	if err != nil {

		t.Errorf("PersonalAccessTokens.RevokePersonalAccessToken returned error: %v", err)

	}

	require.NoError(t, err)



	want := &PersonalAccessToken{

		ID:          1,
@@ -159,9 +147,7 @@ func TestGetSinglePersonalAccessTokenByID(t *testing.T) { 
		Active:      true,

	}



	if !reflect.DeepEqual(want, token) {

		t.Errorf("PersonalAccessTokens.ListPersonalAccessTokens returned %+v, want %+v", token, want)

	}

	assert.Equal(t, want, token)

}



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



	token, _, err := client.PersonalAccessTokens.GetSinglePersonalAccessToken()

	if err != nil {

		t.Errorf("PersonalAccessTokens.RevokePersonalAccessToken returned error: %v", err)

	}

	require.NoError(t, err)



	want := &PersonalAccessToken{

		ID:          1,
@@ -190,9 +174,7 @@ func TestGetSinglePersonalAccessToken(t *testing.T) { 
		Active:      true,

	}



	if !reflect.DeepEqual(want, token) {

		t.Errorf("PersonalAccessTokens.ListPersonalAccessTokens returned %+v, want %+v", token, want)

	}

	assert.Equal(t, want, token)

}



func TestRotatePersonalAccessToken(t *testing.T) {
@@ -206,9 +188,7 @@ func TestRotatePersonalAccessToken(t *testing.T) { 
	expiration := ISOTime(time.Date(2023, time.August, 15, 0, 0, 0, 0, time.UTC))

	opts := &RotatePersonalAccessTokenOptions{ExpiresAt: &expiration}

	rotatedToken, _, err := client.PersonalAccessTokens.RotatePersonalAccessToken(42, opts)

	if err != nil {

		t.Errorf("PersonalAccessTokens.RotatePersonalAccessToken returned error: %v", err)

	}

	require.NoError(t, err)



	want := &PersonalAccessToken{

		ID:          42,
@@ -223,11 +203,7 @@ func TestRotatePersonalAccessToken(t *testing.T) { 
		Token:       "s3cr3t",

	}



	if !reflect.DeepEqual(want, rotatedToken) {

		t.Errorf(

			"PersonalAccessTokens.RotatePersonalAccessToken returned %+v, want %+v", rotatedToken, want,

		)

	}

	assert.Equal(t, want, rotatedToken)

}



func TestRotatePersonalAccessTokenByID(t *testing.T) {
@@ -241,9 +217,7 @@ func TestRotatePersonalAccessTokenByID(t *testing.T) { 
	expiration := ISOTime(time.Date(2023, time.August, 15, 0, 0, 0, 0, time.UTC))

	opts := &RotatePersonalAccessTokenOptions{ExpiresAt: &expiration}

	rotatedToken, _, err := client.PersonalAccessTokens.RotatePersonalAccessTokenByID(42, opts)

	if err != nil {

		t.Errorf("PersonalAccessTokens.RotatePersonalAccessTokenByID returned error: %v", err)

	}

	require.NoError(t, err)



	want := &PersonalAccessToken{

		ID:          42,
@@ -258,11 +232,7 @@ func TestRotatePersonalAccessTokenByID(t *testing.T) { 
		Token:       "s3cr3t",

	}



	if !reflect.DeepEqual(want, rotatedToken) {

		t.Errorf(

			"PersonalAccessTokens.RotatePersonalAccessTokenByID returned %+v, want %+v", rotatedToken, want,

		)

	}

	assert.Equal(t, want, rotatedToken)

}



func TestRotatePersonalAccessTokenSelf(t *testing.T) {
@@ -276,9 +246,7 @@ func TestRotatePersonalAccessTokenSelf(t *testing.T) { 
	expiration := ISOTime(time.Date(2023, time.August, 15, 0, 0, 0, 0, time.UTC))

	opts := &RotatePersonalAccessTokenOptions{ExpiresAt: &expiration}

	rotatedToken, _, err := client.PersonalAccessTokens.RotatePersonalAccessTokenSelf(opts)

	if err != nil {

		t.Errorf("PersonalAccessTokens.RotatePersonalAccessTokenSelf returned error: %v", err)

	}

	require.NoError(t, err)



	want := &PersonalAccessToken{

		ID:          42,
@@ -293,9 +261,7 @@ func TestRotatePersonalAccessTokenSelf(t *testing.T) { 
		Token:       "s3cr3t",

	}



	if !reflect.DeepEqual(want, rotatedToken) {

		t.Errorf("PersonalAccessTokens.RotatePersonalAccessTokenSelf returned %+v, want %+v", rotatedToken, want)

	}

	assert.Equal(t, want, rotatedToken)

}



func TestRevokePersonalAccessToken(t *testing.T) {
@@ -307,9 +273,7 @@ func TestRevokePersonalAccessToken(t *testing.T) { 
	})



	_, err := client.PersonalAccessTokens.RevokePersonalAccessToken(1)

	if err != nil {

		t.Errorf("PersonalAccessTokens.RevokePersonalAccessToken returned error: %v", err)

	}

	require.NoError(t, err)

}



func TestRevokePersonalAccessTokenByID(t *testing.T) {
@@ -321,9 +285,7 @@ func TestRevokePersonalAccessTokenByID(t *testing.T) { 
	})



	_, err := client.PersonalAccessTokens.RevokePersonalAccessTokenByID(1)

	if err != nil {

		t.Errorf("PersonalAccessTokens.RevokePersonalAccessTokenByID returned error: %v", err)

	}

	require.NoError(t, err)

}



func TestRevokePersonalAccessTokenSelf(t *testing.T) {
@@ -335,7 +297,5 @@ func TestRevokePersonalAccessTokenSelf(t *testing.T) { 
	})



	_, err := client.PersonalAccessTokens.RevokePersonalAccessTokenSelf()

	if err != nil {

		t.Errorf("PersonalAccessTokens.RevokePersonalAccessTokenSelf returned error: %v", err)

	}

	require.NoError(t, err)

}

runners_test.go

+35 −112
Original line number Diff line number Diff line
@@ -19,9 +19,11 @@ package gitlab 
import (

	"fmt"

	"net/http"

	"reflect"

	"testing"

	"time"



	"github.com/stretchr/testify/assert"

	"github.com/stretchr/testify/require"

)



func TestDisableRunner(t *testing.T) {
@@ -34,9 +36,7 @@ func TestDisableRunner(t *testing.T) { 
	})



	_, err := client.Runners.DisableProjectRunner(1, 2, nil)

	if err != nil {

		t.Fatalf("Runners.DisableProjectRunner returns an error: %v", err)

	}

	require.NoError(t, err)

}



func TestListRunnersJobs(t *testing.T) {
@@ -51,9 +51,7 @@ func TestListRunnersJobs(t *testing.T) { 
	opt := &ListRunnerJobsOptions{}



	jobs, _, err := client.Runners.ListRunnerJobs(1, opt)

	if err != nil {

		t.Fatalf("Runners.ListRunnersJobs returns an error: %v", err)

	}

	require.NoError(t, err)



	pipeline := JobPipeline{

		ID:        8777,
@@ -112,9 +110,7 @@ func TestListRunnersJobs(t *testing.T) { 
			},

		},

	}

	if !reflect.DeepEqual(want[0], jobs[0]) {

		t.Errorf("Runners.ListRunnersJobs returned %+v, want %+v", jobs[0], want[0])

	}

	assert.Equal(t, want[0], jobs[0])

}



func TestRemoveRunner(t *testing.T) {
@@ -127,9 +123,7 @@ func TestRemoveRunner(t *testing.T) { 
	})



	_, err := client.Runners.RemoveRunner(1, nil)

	if err != nil {

		t.Fatalf("Runners.RemoveARunner returns an error: %v", err)

	}

	require.NoError(t, err)

}



func TestUpdateRunnersDetails(t *testing.T) {
@@ -144,9 +138,7 @@ func TestUpdateRunnersDetails(t *testing.T) { 
	opt := &UpdateRunnerDetailsOptions{}



	details, _, err := client.Runners.UpdateRunnerDetails(6, opt, nil)

	if err != nil {

		t.Fatalf("Runners.UpdateRunnersDetails returns an error: %v", err)

	}

	require.NoError(t, err)



	projects := []RunnerDetailsProject{{

		ID:                1,
@@ -173,9 +165,7 @@ func TestUpdateRunnersDetails(t *testing.T) { 
		MaximumTimeout: 3600,

		Locked:         false,

	}

	if !reflect.DeepEqual(want, details) {

		t.Errorf("Runners.UpdateRunnersDetails returned %+v, want %+v", details, want)

	}

	assert.Equal(t, want, details)

}



func TestGetRunnerDetails(t *testing.T) {
@@ -188,9 +178,7 @@ func TestGetRunnerDetails(t *testing.T) { 
	})



	details, _, err := client.Runners.GetRunnerDetails(6, nil)

	if err != nil {

		t.Fatalf("Runners.GetRunnerDetails returns an error: %v", err)

	}

	require.NoError(t, err)



	projects := []RunnerDetailsProject{{

		ID:                1,
@@ -217,9 +205,7 @@ func TestGetRunnerDetails(t *testing.T) { 
		MaximumTimeout: 3600,

		Locked:         false,

	}

	if !reflect.DeepEqual(want, details) {

		t.Errorf("Runners.UpdateRunnersDetails returned %+v, want %+v", details, want)

	}

	assert.Equal(t, want, details)

}



func TestRegisterNewRunner(t *testing.T) {
@@ -235,23 +221,15 @@ func TestRegisterNewRunner(t *testing.T) { 
	opt := &RegisterNewRunnerOptions{}



	runner, resp, err := client.Runners.RegisterNewRunner(opt, nil)

	if err != nil {

		t.Fatalf("Runners.RegisterNewRunner returns an error: %v", err)

	}

	require.NoError(t, err)



	want := &Runner{

		ID:             12345,

		Token:          "6337ff461c94fd3fa32ba3b1ff4125",

		TokenExpiresAt: Ptr(time.Date(2016, time.January, 25, 16, 39, 48, 166000000, time.UTC)),

	}

	if !reflect.DeepEqual(want, runner) {

		t.Errorf("Runners.RegisterNewRunner returned %+v, want %+v", runner, want)

	}



	wantCode := 201

	if !reflect.DeepEqual(wantCode, resp.StatusCode) {

		t.Errorf("Runners.DeleteRegisteredRunner returned status code %+v, want %+v", resp.StatusCode, wantCode)

	}

	assert.Equal(t, want, runner)

	assert.Equal(t, 201, resp.StatusCode)

}



// Similar to TestRegisterNewRunner but sends info struct and some extra other
@@ -291,9 +269,7 @@ func TestRegisterNewRunnerInfo(t *testing.T) { 
		MaximumTimeout: Ptr(int64(45)),

	}

	runner, resp, err := client.Runners.RegisterNewRunner(opt, nil)

	if err != nil {

		t.Fatalf("Runners.RegisterNewRunner returns an error: %v", err)

	}

	require.NoError(t, err)



	want := &Runner{

		ID:             53,
@@ -305,14 +281,8 @@ func TestRegisterNewRunnerInfo(t *testing.T) { 
		Token:          "1111122222333333444444",

		TokenExpiresAt: Ptr(time.Date(2016, time.January, 25, 16, 39, 48, 166000000, time.UTC)),

	}

	if !reflect.DeepEqual(want, runner) {

		t.Errorf("Runners.RegisterNewRunner returned %+v, want %+v", runner, want)

	}



	wantCode := 201

	if !reflect.DeepEqual(wantCode, resp.StatusCode) {

		t.Errorf("Runners.DeleteRegisteredRunner returned status code %+v, want %+v", resp.StatusCode, wantCode)

	}

	assert.Equal(t, want, runner)

	assert.Equal(t, 201, resp.StatusCode)

}



func TestDeleteRegisteredRunner(t *testing.T) {
@@ -327,14 +297,9 @@ func TestDeleteRegisteredRunner(t *testing.T) { 
	opt := &DeleteRegisteredRunnerOptions{}



	resp, err := client.Runners.DeleteRegisteredRunner(opt, nil)

	if err != nil {

		t.Fatalf("Runners.DeleteRegisteredRunner returns an error: %v", err)

	}

	require.NoError(t, err)



	want := 204

	if !reflect.DeepEqual(want, resp.StatusCode) {

		t.Errorf("Runners.DeleteRegisteredRunner returned status code  %+v, want %+v", resp.StatusCode, want)

	}

	assert.Equal(t, 204, resp.StatusCode)

}



func TestDeleteRegisteredRunnerByID(t *testing.T) {
@@ -349,14 +314,9 @@ func TestDeleteRegisteredRunnerByID(t *testing.T) { 
	rid := int64(11111)



	resp, err := client.Runners.DeleteRegisteredRunnerByID(rid, nil)

	if err != nil {

		t.Fatalf("Runners.DeleteRegisteredRunnerByID returns an error: %v", err)

	}

	require.NoError(t, err)



	want := 204

	if !reflect.DeepEqual(want, resp.StatusCode) {

		t.Errorf("Runners.DeleteRegisteredRunnerByID returned status code  %+v, want %+v", resp.StatusCode, want)

	}

	assert.Equal(t, 204, resp.StatusCode)

}



func TestVerifyRegisteredRunner(t *testing.T) {
@@ -371,14 +331,9 @@ func TestVerifyRegisteredRunner(t *testing.T) { 
	opt := &VerifyRegisteredRunnerOptions{}



	resp, err := client.Runners.VerifyRegisteredRunner(opt, nil)

	if err != nil {

		t.Fatalf("Runners.VerifyRegisteredRunner returns an error: %v", err)

	}

	require.NoError(t, err)



	want := 200

	if !reflect.DeepEqual(want, resp.StatusCode) {

		t.Errorf("Runners.VerifyRegisteredRunner returned status code  %+v, want %+v", resp.StatusCode, want)

	}

	assert.Equal(t, 200, resp.StatusCode)

}



func TestResetInstanceRunnerRegistrationToken(t *testing.T) {
@@ -395,22 +350,14 @@ func TestResetInstanceRunnerRegistrationToken(t *testing.T) { 
	})



	token, resp, err := client.Runners.ResetInstanceRunnerRegistrationToken(nil)

	if err != nil {

		t.Fatalf("Runners.ResetInstanceRunnerRegistrationToken returns an error: %v", err)

	}

	require.NoError(t, err)



	want := &RunnerRegistrationToken{

		Token:          Ptr("6337ff461c94fd3fa32ba3b1ff4125"),

		TokenExpiresAt: Ptr(time.Date(2016, time.January, 25, 16, 39, 48, 166000000, time.UTC)),

	}

	if !reflect.DeepEqual(want, token) {

		t.Errorf("Runners.ResetInstanceRunnerRegistrationToken returned %+v, want %+v", token, want)

	}



	wantCode := 201

	if !reflect.DeepEqual(wantCode, resp.StatusCode) {

		t.Errorf("Runners.ResetInstanceRunnerRegistrationToken returned status code  %+v, want %+v", resp.StatusCode, wantCode)

	}

	assert.Equal(t, want, token)

	assert.Equal(t, 201, resp.StatusCode)

}



func TestResetGroupRunnerRegistrationToken(t *testing.T) {
@@ -427,22 +374,14 @@ func TestResetGroupRunnerRegistrationToken(t *testing.T) { 
	})



	token, resp, err := client.Runners.ResetGroupRunnerRegistrationToken("foobar", nil)

	if err != nil {

		t.Fatalf("Runners.ResetGroupRunnerRegistrationToken returns an error: %v", err)

	}

	require.NoError(t, err)



	want := &RunnerRegistrationToken{

		Token:          Ptr("6337ff461c94fd3fa32ba3b1ff4125"),

		TokenExpiresAt: Ptr(time.Date(2016, time.January, 25, 16, 39, 48, 166000000, time.UTC)),

	}

	if !reflect.DeepEqual(want, token) {

		t.Errorf("Runners.ResetGroupRunnerRegistrationToken returned %+v, want %+v", token, want)

	}



	wantCode := 201

	if !reflect.DeepEqual(wantCode, resp.StatusCode) {

		t.Errorf("Runners.ResetGroupRunnerRegistrationToken returned status code  %+v, want %+v", resp.StatusCode, wantCode)

	}

	assert.Equal(t, want, token)

	assert.Equal(t, 201, resp.StatusCode)

}



func TestResetProjectRunnerRegistrationToken(t *testing.T) {
@@ -459,22 +398,14 @@ func TestResetProjectRunnerRegistrationToken(t *testing.T) { 
	})



	token, resp, err := client.Runners.ResetProjectRunnerRegistrationToken("9", nil)

	if err != nil {

		t.Fatalf("Runners.ResetProjectRunnerRegistrationToken returns an error: %v", err)

	}

	require.NoError(t, err)



	want := &RunnerRegistrationToken{

		Token:          Ptr("6337ff461c94fd3fa32ba3b1ff4125"),

		TokenExpiresAt: Ptr(time.Date(2016, time.January, 25, 16, 39, 48, 166000000, time.UTC)),

	}

	if !reflect.DeepEqual(want, token) {

		t.Errorf("Runners.ResetProjectRunnerRegistrationToken returned %+v, want %+v", token, want)

	}



	wantCode := 201

	if !reflect.DeepEqual(wantCode, resp.StatusCode) {

		t.Errorf("Runners.ResetProjectRunnerRegistrationToken returned status code  %+v, want %+v", resp.StatusCode, wantCode)

	}

	assert.Equal(t, want, token)

	assert.Equal(t, 201, resp.StatusCode)

}



func TestResetRunnerAuthenticationToken(t *testing.T) {
@@ -491,20 +422,12 @@ func TestResetRunnerAuthenticationToken(t *testing.T) { 
	})



	token, resp, err := client.Runners.ResetRunnerAuthenticationToken(42, nil)

	if err != nil {

		t.Fatalf("Runners.ResetRunnerAuthenticationToken returns an error: %v", err)

	}

	require.NoError(t, err)



	want := &RunnerAuthenticationToken{

		Token:          Ptr("6337ff461c94fd3fa32ba3b1ff4125"),

		TokenExpiresAt: Ptr(time.Date(2016, time.January, 25, 16, 39, 48, 166000000, time.UTC)),

	}

	if !reflect.DeepEqual(want, token) {

		t.Errorf("Runners.ResetRunnerAuthenticationToken returned %+v, want %+v", token, want)

	}



	wantCode := 201

	if !reflect.DeepEqual(wantCode, resp.StatusCode) {

		t.Errorf("Runners.ResetRunnerAuthenticationToken returned status code  %+v, want %+v", resp.StatusCode, wantCode)

	}

	assert.Equal(t, want, token)

	assert.Equal(t, 201, resp.StatusCode)

}