test: gitlab testify

pkg/git/gitlab/gitlab_test.go

@@ -16,40 +16,59 @@
 package gitlab
 
 import (
-	"reflect"
 	"testing"
+
+	"github.com/stretchr/testify/assert"
 )
 
 func TestNewRepoInfo(t *testing.T) {
 	want := DefaultRepoInfo{
 		host:  "gitlab.com",
 		owner: "username",
 		repo:  "ritchie-formulas",
-		token: "gHexna7h7CQWafwNYSXp",
+		token: "some_token",
 	}
-	got := NewRepoInfo("https://gitlab.com/username/ritchie-formulas", "gHexna7h7CQWafwNYSXp")
+	got := NewRepoInfo("https://gitlab.com/username/ritchie-formulas", "some_token")
 
-	if !reflect.DeepEqual(got, want) {
-		t.Errorf("NewRepoInfo() = %v, want %v", got, want)
-	}
+	assert.Equal(t, want, got)
 }
 
 func TestTagsUrl(t *testing.T) {
 	const want = "https://gitlab.com/api/v4/projects/username%2Fritchie-formulas/releases"
-	repoInfo := NewRepoInfo("https://gitlab.com/username/ritchie-formulas", "gHexna7h7CQWafwNYSXp")
+	repoInfo := NewRepoInfo("https://gitlab.com/username/ritchie-formulas", "some_token")
 	tagsUrl := repoInfo.TagsUrl()
 
-	if !reflect.DeepEqual(tagsUrl, want) {
-		t.Errorf("NewRepoInfo() = %v, want %v", "got", want)
-	}
+	assert.Equal(t, want, tagsUrl)
 }
 
 func TestZipUrl(t *testing.T) {
 	const want = "https://gitlab.com/api/v4/projects/username%2Fritchie-formulas/repository/archive.zip?sha=1.0.0"
-	repoInfo := NewRepoInfo("https://gitlab.com/username/ritchie-formulas", "gHexna7h7CQWafwNYSXp")
-	tagsUrl := repoInfo.ZipUrl("1.0.0")
+	repoInfo := NewRepoInfo("https://gitlab.com/username/ritchie-formulas", "some_token")
+	zipUrl := repoInfo.ZipUrl("1.0.0")
 
-	if !reflect.DeepEqual(tagsUrl, want) {
-		t.Errorf("NewRepoInfo() = %v, want %v", tagsUrl, want)
-	}
+	assert.Equal(t, want, zipUrl)
+}
+
+func TestLatestTagUrl(t *testing.T) {
+	const want = "https://gitlab.com/api/v4/projects/username%2Fritchie-formulas/releases?per_page=1&page=1"
+	repoInfo := NewRepoInfo("https://gitlab.com/username/ritchie-formulas", "some_token")
+	latestTagUrl := repoInfo.LatestTagUrl()
+
+	assert.Equal(t, want, latestTagUrl)
+}
+
+func TestTokenHeader(t *testing.T) {
+	const want = "some_token"
+	repoInfo := NewRepoInfo("https://gitlab.com/username/ritchie-formulas", "some_token")
+	tokenHeader := repoInfo.TokenHeader()
+
+	assert.Equal(t, want, tokenHeader)
+}
+
+func TestToken(t *testing.T) {
+	const want = "some_token"
+	repoInfo := NewRepoInfo("https://gitlab.com/username/ritchie-formulas", "some_token")
+	token := repoInfo.Token()
+
+	assert.Equal(t, want, token)
 }

pkg/git/gitlab/repository.go

@@ -19,7 +19,6 @@ import (
 	"context"
 	"encoding/json"
 	"errors"
-	"fmt"
 	"io"
 	"io/ioutil"
 	"net/http"
@@ -38,54 +37,32 @@ func NewRepoManager(client *http.Client) RepoManager {
 
 func (re RepoManager) Zipball(info git.RepoInfo, version string) (io.ReadCloser, error) {
 	zipUrl := info.ZipUrl(version)
-	req, err := http.NewRequestWithContext(context.TODO(), http.MethodGet, zipUrl, nil)
+	res, err := re.performRequest(info, zipUrl)
 	if err != nil {
 		return nil, err
 	}
 
-	if info.Token() != "" {
-		authToken := info.TokenHeader()
-		req.Header.Add(headers.GitlabToken, authToken)
-	}
-
-	resp, err := re.client.Do(req)
-	if err != nil {
-		return nil, err
-	}
-
-	if resp.StatusCode != 200 {
-		defer resp.Body.Close()
-
-		all, _ := ioutil.ReadAll(resp.Body)
-		fmt.Println(all)
-		return nil, errors.New(resp.Status)
+	if res.StatusCode != http.StatusOK {
+		defer res.Body.Close()
+		all, _ := ioutil.ReadAll(res.Body)
+		return nil, errors.New(res.Status + "-" + string(all))
 	}
 
-	return resp.Body, nil
+	return res.Body, nil
 }
 
 func (re RepoManager) Tags(info git.RepoInfo) (git.Tags, error) {
 	apiUrl := info.TagsUrl()
-	req, err := http.NewRequestWithContext(context.TODO(), http.MethodGet, apiUrl, nil)
-	if err != nil {
-		return git.Tags{}, err
-	}
-
-	if info.Token() != "" {
-		authToken := info.TokenHeader()
-		req.Header.Add(headers.GitlabToken, authToken)
-	}
-
-	res, err := re.client.Do(req)
+	res, err := re.performRequest(info, apiUrl)
 	if err != nil {
 		return git.Tags{}, err
 	}
 
 	defer res.Body.Close()
 
 	if res.StatusCode != http.StatusOK {
-		errorMessage := fmt.Sprintf("There was an error adding the repository, status: %d - %s.", res.StatusCode, http.StatusText(res.StatusCode))
-		return git.Tags{}, errors.New(errorMessage)
+		all, _ := ioutil.ReadAll(res.Body)
+		return git.Tags{}, errors.New(res.Status + "-" + string(all))
 	}
 
 	var tags git.Tags
@@ -116,11 +93,8 @@ func (re RepoManager) LatestTag(info git.RepoInfo) (git.Tag, error) {
 	defer res.Body.Close()
 
 	if res.StatusCode != http.StatusOK {
-		b, err := ioutil.ReadAll(res.Body)
-		if err != nil {
-			return git.Tag{}, err
-		}
-		return git.Tag{}, errors.New(string(b))
+		all, _ := ioutil.ReadAll(res.Body)
+		return git.Tag{}, errors.New(res.Status + "-" + string(all))
 	}
 
 	var tags git.Tags
@@ -134,3 +108,21 @@ func (re RepoManager) LatestTag(info git.RepoInfo) (git.Tag, error) {
 
 	return tags[0], nil
 }
+
+func (re RepoManager) performRequest(info git.RepoInfo, url string) (*http.Response, error) {
+	req, err := http.NewRequestWithContext(context.Background(), http.MethodGet, url, nil)
+	if err != nil {
+		return nil, err
+	}
+
+	if info.Token() != "" {
+		req.Header.Add(headers.GitlabToken, info.Token())
+	}
+
+	res, err := re.client.Do(req)
+	if err != nil {
+		return nil, err
+	}
+
+	return res, nil
+}