From 4630f5f396ed8b42b026f46faad92972b2b7c9c1 Mon Sep 17 00:00:00 2001
From: mehanizm <mike.berezin@gmail.com>
Date: Fri, 17 Apr 2020 23:12:07 +0300
Subject: [PATCH] test: add tests for errors

---
 client.go      | 15 ++++++++++-----
 client_test.go |  6 +++++-
 errors.go      |  2 +-
 errors_test.go | 22 ++++++++++++++++++++++
 4 files changed, 38 insertions(+), 7 deletions(-)
 create mode 100644 errors_test.go

diff --git a/client.go b/client.go
index 0204484..13b5a9e 100644
--- a/client.go
+++ b/client.go
@@ -8,6 +8,7 @@ package airtable
 import (
 	"bytes"
 	"encoding/json"
+	"errors"
 	"fmt"
 	"io/ioutil"
 	"net/http"
@@ -64,7 +65,7 @@ func (at *Client) get(db, table, recordID string, params url.Values, target inte
 	req.Header.Set("Content-Type", "application/json")
 	req.Header.Set("Authorization", fmt.Sprintf("Bearer %s", at.apiKey))
 	req.URL.RawQuery = params.Encode()
-	err = at.do(req, url, target)
+	err = at.do(req, target)
 	if err != nil {
 		return err
 	}
@@ -84,7 +85,7 @@ func (at *Client) post(db, table string, data, response interface{}) error {
 	}
 	req.Header.Set("Content-Type", "application/json")
 	req.Header.Set("Authorization", fmt.Sprintf("Bearer %s", at.apiKey))
-	return at.do(req, url, response)
+	return at.do(req, response)
 }
 
 func (at *Client) delete(db, table string, recordIDs []string, target interface{}) error {
@@ -101,7 +102,7 @@ func (at *Client) delete(db, table string, recordIDs []string, target interface{
 	req.Header.Set("Content-Type", "application/json")
 	req.Header.Set("Authorization", fmt.Sprintf("Bearer %s", at.apiKey))
 	req.URL.RawQuery = params.Encode()
-	err = at.do(req, rawURL, target)
+	err = at.do(req, target)
 	if err != nil {
 		return err
 	}
@@ -121,10 +122,14 @@ func (at *Client) patch(db, table, data, response interface{}) error {
 	}
 	req.Header.Set("Content-Type", "application/json")
 	req.Header.Set("Authorization", fmt.Sprintf("Bearer %s", at.apiKey))
-	return at.do(req, url, response)
+	return at.do(req, response)
 }
 
-func (at *Client) do(req *http.Request, url string, response interface{}) error {
+func (at *Client) do(req *http.Request, response interface{}) error {
+	if req == nil {
+		return errors.New("nil request")
+	}
+	url := req.URL.RequestURI()
 	resp, err := at.client.Do(req)
 	if err != nil {
 		return fmt.Errorf("HTTP request failure on %s: %w", url, err)
diff --git a/client_test.go b/client_test.go
index 3659b7f..1635d73 100644
--- a/client_test.go
+++ b/client_test.go
@@ -25,9 +25,13 @@ func TestClient_do(t *testing.T) {
 	if err != nil {
 		log.Fatal(err)
 	}
-	err = c.do(req, url, nil)
+	err = c.do(req, nil)
 	var e *HTTPClientError
 	if errors.Is(err, e) {
 		t.Errorf("should be an http error, but was not: %v", err)
 	}
+	err = c.do(nil, nil)
+	if err == nil {
+		t.Errorf("there should be an error, but was nil")
+	}
 }
diff --git a/errors.go b/errors.go
index 49f2bf3..1d19871 100644
--- a/errors.go
+++ b/errors.go
@@ -18,7 +18,7 @@ type HTTPClientError struct {
 }
 
 func (e *HTTPClientError) Error() string {
-	return fmt.Sprintf("status %d: err %v", e.StatusCode, e.Err)
+	return fmt.Sprintf("status %d, err: %v", e.StatusCode, e.Err)
 }
 
 func makeHTTPClientError(url string, resp *http.Response) error {
diff --git a/errors_test.go b/errors_test.go
new file mode 100644
index 0000000..7cc750e
--- /dev/null
+++ b/errors_test.go
@@ -0,0 +1,22 @@
+// Copyright © 2020 Mike Berezin
+//
+// Use of this source code is governed by an MIT license.
+// Details in the LICENSE file.
+
+package airtable
+
+import (
+	"errors"
+	"testing"
+)
+
+func TestHTTPClientError_Error(t *testing.T) {
+	e := &HTTPClientError{
+		StatusCode: 300,
+		Err:        errors.New("error message"),
+	}
+	expected := "status 300, err: error message"
+	if got := e.Error(); got != expected {
+		t.Errorf("HTTPClientError.Error() = %v, want %v", got, expected)
+	}
+}