tests: Replace assert with requirezj-remove-testify-assert

Testify features sub packages `assert` and `require`. The difference is
subtle, and lost on novice Golang developers that don't read the docs.
To create a more consistent code base `assert` will no longer be used.

This change was generated by a running a sed command on all `_test.go`
files, followed by `goimports -w`.

1 files changed, 7 insertions, 8 deletions

diff --git a/client/httpclient_test.go b/client/httpclient_test.go
index 59dabc4..2d2a06e 100644
--- a/client/httpclient_test.go
+++ b/client/httpclient_test.go
@@ -10,7 +10,6 @@ import (
 	"testing"
 	"time"
 
-	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 	"gitlab.com/gitlab-org/gitlab-shell/client/testserver"
 )
@@ -21,7 +20,7 @@ func TestReadTimeout(t *testing.T) {
 	client := NewHTTPClient("http://localhost:3000", "", "", "", false, expectedSeconds)
 
 	require.NotNil(t, client)
-	assert.Equal(t, time.Duration(expectedSeconds)*time.Second, client.Client.Timeout)
+	require.Equal(t, time.Duration(expectedSeconds)*time.Second, client.Client.Timeout)
 }
 
 const (
@@ -66,15 +65,15 @@ func testBasicAuthHeaders(t *testing.T, response *http.Response) {
 
 	require.NotNil(t, response)
 	responseBody, err := ioutil.ReadAll(response.Body)
-	assert.NoError(t, err)
+	require.NoError(t, err)
 
 	headerParts := strings.Split(string(responseBody), " ")
-	assert.Equal(t, "Basic", headerParts[0])
+	require.Equal(t, "Basic", headerParts[0])
 
 	credentials, err := base64.StdEncoding.DecodeString(headerParts[1])
 	require.NoError(t, err)
 
-	assert.Equal(t, username+":"+password, string(credentials))
+	require.Equal(t, username+":"+password, string(credentials))
 }
 
 func TestEmptyBasicAuthSettings(t *testing.T) {
@@ -82,7 +81,7 @@ func TestEmptyBasicAuthSettings(t *testing.T) {
 		{
 			Path: "/api/v4/internal/empty_basic_auth",
 			Handler: func(w http.ResponseWriter, r *http.Request) {
-				assert.Equal(t, "", r.Header.Get("Authorization"))
+				require.Equal(t, "", r.Header.Get("Authorization"))
 			},
 		},
 	}
@@ -100,13 +99,13 @@ func TestRequestWithUserAgent(t *testing.T) {
 		{
 			Path: "/api/v4/internal/default_user_agent",
 			Handler: func(w http.ResponseWriter, r *http.Request) {
-				assert.Equal(t, defaultUserAgent, r.UserAgent())
+				require.Equal(t, defaultUserAgent, r.UserAgent())
 			},
 		},
 		{
 			Path: "/api/v4/internal/override_user_agent",
 			Handler: func(w http.ResponseWriter, r *http.Request) {
-				assert.Equal(t, gitalyUserAgent, r.UserAgent())
+				require.Equal(t, gitalyUserAgent, r.UserAgent())
 			},
 		},
 	}