summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNick Thomas <nick@gitlab.com>2019-09-20 11:50:43 +0100
committerNick Thomas <nick@gitlab.com>2019-09-20 11:50:43 +0100
commitf62e3e7cf424f407358ae2525472aae840dd9066 (patch)
treeba1b0fa6da94d13a39c0758957a8b88771741483
parent996b2e1d44cc671cc60fd4ddacd2c5750b72a025 (diff)
downloadgitlab-shell-f62e3e7cf424f407358ae2525472aae840dd9066.tar.gz
Fix logic errors in gitlabnet client tests
-rw-r--r--go/internal/gitlabnet/client_test.go16
1 files changed, 8 insertions, 8 deletions
diff --git a/go/internal/gitlabnet/client_test.go b/go/internal/gitlabnet/client_test.go
index cf42195..e8499dc 100644
--- a/go/internal/gitlabnet/client_test.go
+++ b/go/internal/gitlabnet/client_test.go
@@ -117,11 +117,11 @@ func TestClients(t *testing.T) {
func testSuccessfulGet(t *testing.T, client *GitlabClient) {
t.Run("Successful get", func(t *testing.T) {
response, err := client.Get("/hello")
- defer response.Body.Close()
-
require.NoError(t, err)
require.NotNil(t, response)
+ defer response.Body.Close()
+
responseBody, err := ioutil.ReadAll(response.Body)
assert.NoError(t, err)
assert.Equal(t, string(responseBody), "Hello")
@@ -133,11 +133,11 @@ func testSuccessfulPost(t *testing.T, client *GitlabClient) {
data := map[string]string{"key": "value"}
response, err := client.Post("/post_endpoint", data)
- defer response.Body.Close()
-
require.NoError(t, err)
require.NotNil(t, response)
+ defer response.Body.Close()
+
responseBody, err := ioutil.ReadAll(response.Body)
assert.NoError(t, err)
assert.Equal(t, "Echo: {\"key\":\"value\"}", string(responseBody))
@@ -189,11 +189,11 @@ func testBrokenRequest(t *testing.T, client *GitlabClient) {
func testAuthenticationHeader(t *testing.T, client *GitlabClient) {
t.Run("Authentication headers for GET", func(t *testing.T) {
response, err := client.Get("/auth")
- defer response.Body.Close()
-
require.NoError(t, err)
require.NotNil(t, response)
+ defer response.Body.Close()
+
responseBody, err := ioutil.ReadAll(response.Body)
require.NoError(t, err)
@@ -204,11 +204,11 @@ func testAuthenticationHeader(t *testing.T, client *GitlabClient) {
t.Run("Authentication headers for POST", func(t *testing.T) {
response, err := client.Post("/auth", map[string]string{})
- defer response.Body.Close()
-
require.NoError(t, err)
require.NotNil(t, response)
+ defer response.Body.Close()
+
responseBody, err := ioutil.ReadAll(response.Body)
require.NoError(t, err)