Merge pull request #85 from sarathsp06/master

fix: fix failing tests and update travis

Author: Artur Khabibullin

.travis.yml

@@ -1,7 +1,8 @@
 language: go
+go_import_path: github.com/messagebird/go-rest-api
 go:
-  - "1.12"
   - "1.13"
+  - "1.14"
   - stable
   - master
 matrix:

contact/contact_test.go

@@ -139,7 +139,10 @@ func TestListPagination(t *testing.T) {
 	}
 
 	for _, tc := range tt {
-		List(client, tc.options)
+		_, err := List(client, tc.options)
+		if err != nil {
+			t.Fatalf("unexpected error listing contacts: %s", err)
+		}
 
 		if query := mbtest.Request.URL.RawQuery; query != tc.expected {
 			t.Fatalf("expected %s, got %s", tc.expected, query)

go.mod

@@ -1,3 +1,3 @@
 module github.com/messagebird/go-rest-api
 
-go 1.12
+go 1.13

group/group_test.go

@@ -101,8 +101,10 @@ func TestListPagination(t *testing.T) {
 	}
 
 	for _, tc := range tt {
-		List(client, tc.options)
-
+		_, err := List(client, tc.options)
+		if err != nil {
+			t.Fatalf("unexpected error listing groups: %s", err)
+		}
 		if query := mbtest.Request.URL.RawQuery; query != tc.expected {
 			t.Fatalf("got %s, expected %s", tc.expected, query)
 		}

number/number_test.go

@@ -99,7 +99,7 @@ func TestUpdate(t *testing.T) {
 
 	mbtest.AssertEndpointCalled(t, http.MethodPatch, "/v1/phone-numbers/31612345670")
 	mbtest.AssertTestdata(t, "numberUpdateRequestObject.json", mbtest.Request.Body)
-	
+
 	if !reflect.DeepEqual(number.Tags, []string{"tag1", "tag2", "tag3"}) {
 		t.Errorf("Unexpected number tags: %s, expected: ['tag1', 'tag2', 'tag3']", number.Tags)
 	}

signature/signature.go

@@ -117,7 +117,7 @@ func (v *Validator) ValidRequest(r *http.Request) error {
 		return fmt.Errorf("Unknown host: %s", r.Host)
 	}
 	b, _ := ioutil.ReadAll(r.Body)
-	if v.validTimestamp(ts) == false || v.validSignature(ts, r.URL.RawQuery, b, rs) == false {
+	if !v.validTimestamp(ts) || !v.validSignature(ts, r.URL.RawQuery, b, rs) {
 		return fmt.Errorf("Unknown host: %s", r.Host)
 	}
 	r.Body = ioutil.NopCloser(bytes.NewBuffer(b))

signature/signature_test.go

@@ -80,8 +80,7 @@ func TestCalculateSignature(t *testing.T) {
 			t.Errorf("Error calculating signature: %s, expected: %s", s, tt.es)
 		}
 		drs, _ := base64.StdEncoding.DecodeString(tt.es)
-		e := bool(bytes.Compare(s, drs) == 0)
-		if e != tt.e {
+		if bytes.Equal(s, drs) != tt.e {
 			t.Errorf("Unexpected signature: %s, test case: %s", s, tt.name)
 		}
 	}

sms/message_test.go

@@ -315,7 +315,9 @@ func TestListScheduled(t *testing.T) {
 		if !strings.Contains(r.URL.String(), expectedStatusFilter) {
 			t.Errorf("API call should contain filter by status (%v), but is is not %v", expectedStatusFilter, r.URL.String())
 		}
-		w.Write(mbtest.Testdata(t, "messageListScheduledObject.json"))
+		if _, err := w.Write(mbtest.Testdata(t, "messageListScheduledObject.json")); err != nil {
+			t.Fatalf("unexpected error responding to list scheduled request. err: %s", err)
+		}
 	})
 	transport, teardown := mbtest.HTTPTestTransport(h)
 	defer teardown()

voice/callflow_test.go

@@ -57,7 +57,7 @@ func TestCallFlowJSONMarshal(t *testing.T) {
 				Length: time.Second * 10,
 			},
 			&CallFlowRecordStep{
-				CallFlowStepBase:   CallFlowStepBase{
+				CallFlowStepBase: CallFlowStepBase{
 					ID: "3",
 				},
 				MaxLength:          10,
@@ -143,7 +143,7 @@ func TestCallFlowJSONUnmarshal(t *testing.T) {
 				Length: time.Second * 10,
 			},
 			&CallFlowRecordStep{
-				CallFlowStepBase:   CallFlowStepBase{
+				CallFlowStepBase: CallFlowStepBase{
 					ID: "3",
 				},
 				MaxLength:          10,
@@ -186,7 +186,7 @@ func TestCreateCallFlow(t *testing.T) {
 				Length: time.Second,
 			},
 			&CallFlowRecordStep{
-				CallFlowStepBase:   CallFlowStepBase{
+				CallFlowStepBase: CallFlowStepBase{
 					ID: "3",
 				},
 				MaxLength:          10,

voice/main_test.go

@@ -9,7 +9,7 @@ import (
 	"os"
 	"testing"
 
-	"github.com/messagebird/go-rest-api"
+	messagebird "github.com/messagebird/go-rest-api"
 )
 
 func testRequest(status int, body []byte) (*messagebird.Client, func()) {