From fd5010bd2a852ea8fa3a2b08e199312fb3b71097 Mon Sep 17 00:00:00 2001
From: Alex <alext@rtradetechnologies.com>
Date: Wed, 1 May 2019 16:13:47 -0700
Subject: [PATCH] api: cleanup header and NewURLApiWithClient test

This commit was moved from ipfs/go-ipfs-http-client@b8b55cb89a5dd830915f83e43e8afa7a01597905
---
 client/httpapi/api_test.go | 46 +++++++++++++-------------------------
 1 file changed, 15 insertions(+), 31 deletions(-)

diff --git a/client/httpapi/api_test.go b/client/httpapi/api_test.go
index 52fa67d0e..fadd9663e 100644
--- a/client/httpapi/api_test.go
+++ b/client/httpapi/api_test.go
@@ -5,13 +5,14 @@ import (
 	"io/ioutil"
 	"net/http"
 	gohttp "net/http"
+	"net/http/httptest"
 	"os"
 	"strconv"
 	"sync"
 	"testing"
 	"time"
 
-	"github.com/ipfs/interface-go-ipfs-core"
+	iface "github.com/ipfs/interface-go-ipfs-core"
 	"github.com/ipfs/interface-go-ipfs-core/path"
 
 	"github.com/ipfs/interface-go-ipfs-core/tests"
@@ -212,23 +213,24 @@ func TestHttpApi(t *testing.T) {
 	tests.TestApi(newNodeProvider(ctx))(t)
 }
 
-func Test_NewURLApiWithClient(t *testing.T) {
-	t.Skip()
+func Test_NewURLApiWithClient_With_Headers(t *testing.T) {
 	var (
-		url                 = "127.0.0.1:65501"
 		headerToTest        = "Test-Header"
 		expectedHeaderValue = "thisisaheadertest"
 	)
-	server, err := testHTTPServer(url, headerToTest, expectedHeaderValue)
-	if err != nil {
-		t.Fatal(err)
-	}
-	defer server.Close()
-	go func() {
-		server.ListenAndServe()
-	}()
+	ts := httptest.NewServer(
+		http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
+			val := r.Header.Get(headerToTest)
+			if val == expectedHeaderValue {
+				w.WriteHeader(400)
+				return
+			}
+			w.WriteHeader(200)
+		}),
+	)
+	defer ts.Close()
 	time.Sleep(time.Second * 2)
-	api, err := NewURLApiWithClient(url, &http.Client{
+	api, err := NewURLApiWithClient(ts.URL, &http.Client{
 		Transport: &http.Transport{
 			Proxy:             http.ProxyFromEnvironment,
 			DisableKeepAlives: true,
@@ -242,21 +244,3 @@ func Test_NewURLApiWithClient(t *testing.T) {
 		t.Fatal(err)
 	}
 }
-
-/// testHTTPServer spins up a test go http server
-// used to check headers
-func testHTTPServer(url, headerToTest, expectedHeaderValue string) (*http.Server, error) {
-	r := http.NewServeMux()
-	r.HandleFunc("/api/v0/pin/ls", func(w http.ResponseWriter, r *http.Request) {
-		val := r.Header.Get(headerToTest)
-		if val == expectedHeaderValue {
-			w.WriteHeader(400)
-			return
-		}
-		w.WriteHeader(200)
-	})
-	return &http.Server{
-		Handler: r,
-		Addr:    url,
-	}, nil
-}