fix: tests

Author: Genert Org

.gitignore

@@ -25,6 +25,7 @@ _testmain.go
 # Editors
 .idea
 .vscode
+!.vscode/launch.json
 
 # Local API tests
 tests.sh

pipedrive/activity_types.go

@@ -67,8 +67,8 @@ func (s *ActivityTypesService) List(ctx context.Context) (*ActivityTypesResponse
 // ActivityTypesAddOptions specifices the optional parameters to the
 // ActivityTypesService.Create method.
 type ActivityTypesAddOptions struct {
-Name string `url:"name,omitempty"`
-IconKey string `url:"icon_key,omitempty"`
+Name string `url:"name"`
+IconKey string `url:"icon_key"`
 Color string `url:"color,omitempty"`
 }
 

pipedrive/errors.go

@@ -1,6 +1,9 @@
 package pipedrive
 
-import "net/http"
+import (
+"fmt"
+"net/http"
+)
 
 // RateLimitError occurs when Pipedrive returns 403 Forbidden response with a rate limit
 // remaining value of 0.
@@ -11,14 +14,19 @@ type RateLimitError struct {
 }
 
 func (e *RateLimitError) Error() string {
-return "Something went wrong with rate"
+return fmt.Sprintf("%v %v: %d %v",
+e.Response.Request.Method, e.Response.Request.URL,
+e.Response.StatusCode, e.Message)
 }
 
 // ErrorResponse reports one or more errors caused by an API request.
 type ErrorResponse struct {
 Response *http.Response
+Message string
 }
 
 func (e *ErrorResponse) Error() string {
-return "Something went wrong with response"
+return fmt.Sprintf("%v %v: %d %v",
+e.Response.Request.Method, e.Response.Request.URL,
+e.Response.StatusCode, e.Message)
 }

pipedrive/pipedrive.go

@@ -188,8 +188,22 @@ func (c *Client) checkResponse(r *http.Response) error {
 return nil
 }
 
-return &ErrorResponse{
-Response: r,
+data, err := ioutil.ReadAll(r.Body)
+errorResponse := &ErrorResponse{Response: r}
+
+if err == nil && data != nil {
+json.Unmarshal(data, errorResponse)
+}
+
+switch {
+case r.StatusCode == http.StatusForbidden && r.Header.Get(headerRateRemaining) == "0":
+return &RateLimitError{
+Rate: parseRateFromResponse(r),
+Response: errorResponse.Response,
+}
+
+default:
+return errorResponse
 }
 }
 

test/integration/activity_fields_test.go

@@ -1,17 +1,18 @@
 package integration
 
-/*
-import "testing"
+import (
+"context"
+"testing"
+)
 
 func TestActivityFieldsService_List(t *testing.T) {
-searchResults, _, err := client.ActivityFields.List()
+result, _, err := client.ActivityFields.List(context.Background())
 
 if err != nil {
-t.Errorf("Could not get search results: %v", err)
+t.Errorf("Could not get results: %v", err)
 }
 
-if searchResults.Success != true {
-t.Error("Got invalid activity fields")
+if result.Success != true {
+t.Error("Got invalid result")
 }
 }
-*/

test/integration/activity_types_test.go

@@ -1,14 +1,15 @@
 package integration
 
-/*
 import (
-"github.com/genert/pipedrive-api/pipedrive"
+"context"
 "testing"
+
+"github.com/genert/pipedrive-api/pipedrive"
 )
 
 func TestActivityTypesService_Create(t *testing.T) {
-result, _, err := client.ActivityTypes.Create(&pipedrive.ActivityTypesAddOptions{
-Name: "test",
+result, _, err := client.ActivityTypes.Create(context.Background(), &pipedrive.ActivityTypesAddOptions{
+Name: RandomString(13),
 IconKey: "email",
 })
 
@@ -20,20 +21,3 @@ func TestActivityTypesService_Create(t *testing.T) {
 t.Error("Could not create activity type successfully")
 }
 }
-
-func TestActivityTypesService_Delete(t *testing.T) {
-
-}
-
-func TestActivityTypesService_DeleteMultiple(t *testing.T) {
-
-}
-
-func TestActivityTypesService_Edit(t *testing.T) {
-
-}
-
-func TestActivityTypesService_List(t *testing.T) {
-
-}
-*/

test/integration/currencies_test.go

@@ -1,20 +1,21 @@
 package integration
 
-/*
 import (
+"context"
+"testing"
+
 "github.com/genert/pipedrive-api/pipedrive"
 "github.com/go-test/deep"
-"testing"
 )
 
 func TestCurrenciesService_List(t *testing.T) {
-currencies, _, err := client.Currencies.List(nil)
+result, _, err := client.Currencies.List(context.Background(), nil)
 
 if err != nil {
 t.Errorf("Could not get currencies: %v", err)
 }
 
-if currencies.Success != true {
+if result.Success != true {
 t.Error("Unsuccessful currencies request")
 }
 
@@ -28,21 +29,21 @@ func TestCurrenciesService_List(t *testing.T) {
 IsCustomFlag: false,
 }
 
-if diff := deep.Equal(expectedCurrency, currencies.Data[0]); diff != nil {
+if diff := deep.Equal(expectedCurrency, result.Data[0]); diff != nil {
 t.Error(diff)
 }
 }
 
 func TestCurrenciesService_List2(t *testing.T) {
-currencies, _, err := client.Currencies.List(&pipedrive.CurrenciesListOptions{
+result, _, err := client.Currencies.List(context.Background(), &pipedrive.CurrenciesListOptions{
 Term: "estonia",
 })
 
 if err != nil {
 t.Errorf("Could not get currencies: %v", err)
 }
 
-if currencies.Success != true {
+if result.Success != true {
 t.Error("Unsuccessful currencies request")
 }
 
@@ -56,8 +57,7 @@ func TestCurrenciesService_List2(t *testing.T) {
 IsCustomFlag: false,
 }
 
-if diff := deep.Equal(expectedCurrency, currencies.Data[0]); diff != nil {
+if diff := deep.Equal(expectedCurrency, result.Data[0]); diff != nil {
 t.Error(diff)
 }
 }
-*/

test/integration/files_test.go

@@ -1,10 +1,11 @@
 package integration
 
-/*
-import "testing"
+import (
+"testing"
+)
 
-func TestFilesService_Download(t *testing.T) {
-result, _, err := client.Files.GetDownloadLinkById(1)
+func TestFilesService_GetDownloadLinkByID(t *testing.T) {
+result, _, err := client.Files.GetDownloadLinkByID(1)
 
 if err != nil {
 t.Errorf("Could not get result: %v", err)
@@ -14,4 +15,3 @@ func TestFilesService_Download(t *testing.T) {
 t.Error("Got invalid download link")
 }
 }
-*/

test/integration/pipedrive_test.go

@@ -1,15 +1,47 @@
 package integration
 
 import (
+"math/rand"
 "os"
+"time"
 
 "github.com/genert/pipedrive-api/pipedrive"
 )
 
 var (
 client *pipedrive.Client
+
+// Random string generator
+src = rand.NewSource(time.Now().UnixNano())
+)
+
+// Random string generator
+const letterBytes = "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ"
+const (
+letterIdxBits = 6 // 6 bits to represent a letter index
+letterIdxMask = 1<<letterIdxBits - 1 // All 1-bits, as many as letterIdxBits
+letterIdxMax = 63 / letterIdxBits // # of letter indices fitting in 63 bits
 )
 
+func RandomString(n int) string {
+b := make([]byte, n)
+
+// A src.Int63() generates 63 random bits, enough for letterIdxMax characters!
+for i, cache, remain := n-1, src.Int63(), letterIdxMax; i >= 0; {
+if remain == 0 {
+cache, remain = src.Int63(), letterIdxMax
+}
+if idx := int(cache & letterIdxMask); idx < len(letterBytes) {
+b[i] = letterBytes[idx]
+i--
+}
+cache >>= letterIdxBits
+remain--
+}
+
+return string(b)
+}
+
 func init() {
 token := os.Getenv("PIPEDRIVE_API_TOKEN")
 

test/integration/recents_test.go

@@ -1,28 +1,26 @@
 package integration
 
-/*
 import (
-"github.com/genert/pipedrive-api/pipedrive"
+"context"
 "testing"
 "time"
+
+"github.com/genert/pipedrive-api/pipedrive"
 )
 
 func TestRecents_List(t *testing.T) {
 sinceTime := time.Date(2017, time.September, 10, 10, 0, 0, 0, time.UTC).Format("2006-01-02 15:04:05")
 
-opt := &pipedrive.RecentsListOptions{
+result, _, err := client.Recents.List(context.Background(), &pipedrive.RecentsListOptions{
 SinceTimestamp: sinceTime,
 Start: 0,
-}
-
-recents, _, err := client.Recents.List(opt)
+})
 
 if err != nil {
 t.Errorf("Could not get recents: %v", err)
 }
 
-if recents.Success != true {
+if result.Success != true {
 t.Error("Could not get successful recents response")
 }
 }
-*/