Replace deprecated ioutil package with os and io

README.md

@@ -125,7 +125,7 @@ See [examples](https://github.com/h2non/gock/tree/master/_examples) directory fo
 package test
 
 import (
-  "io/ioutil"
+  "io"
   "net/http"
   "testing"
 
@@ -145,7 +145,7 @@ func TestSimple(t *testing.T) {
   st.Expect(t, err, nil)
   st.Expect(t, res.StatusCode, 200)
 
-  body, _ := ioutil.ReadAll(res.Body)
+  body, _ := io.ReadAll(res.Body)
   st.Expect(t, string(body)[:13], `{"foo":"bar"}`)
 
   // Verify that we don't have pending mocks
@@ -159,7 +159,7 @@ func TestSimple(t *testing.T) {
 package test
 
 import (
-  "io/ioutil"
+  "io"
   "net/http"
   "testing"
 
@@ -185,7 +185,7 @@ func TestMatchHeaders(t *testing.T) {
   res, err := (&http.Client{}).Do(req)
   st.Expect(t, err, nil)
   st.Expect(t, res.StatusCode, 200)
-  body, _ := ioutil.ReadAll(res.Body)
+  body, _ := io.ReadAll(res.Body)
   st.Expect(t, string(body), "foo foo")
 
   // Verify that we don't have pending mocks
@@ -199,7 +199,7 @@ func TestMatchHeaders(t *testing.T) {
 package test
 
 import (
-  "io/ioutil"
+  "io"
   "net/http"
   "testing"
 
@@ -221,7 +221,7 @@ func TestMatchParams(t *testing.T) {
   res, err := (&http.Client{}).Do(req)
   st.Expect(t, err, nil)
   st.Expect(t, res.StatusCode, 200)
-  body, _ := ioutil.ReadAll(res.Body)
+  body, _ := io.ReadAll(res.Body)
   st.Expect(t, string(body), "foo foo")
 
   // Verify that we don't have pending mocks
@@ -236,7 +236,7 @@ package test
 
 import (
   "bytes"
-  "io/ioutil"
+  "io"
   "net/http"
   "testing"
 
@@ -259,7 +259,7 @@ func TestMockSimple(t *testing.T) {
   st.Expect(t, err, nil)
   st.Expect(t, res.StatusCode, 201)
 
-  resBody, _ := ioutil.ReadAll(res.Body)
+  resBody, _ := io.ReadAll(res.Body)
   st.Expect(t, string(resBody)[:13], `{"bar":"foo"}`)
 
   // Verify that we don't have pending mocks
@@ -273,7 +273,7 @@ func TestMockSimple(t *testing.T) {
 package test
 
 import (
-  "io/ioutil"
+  "io"
   "net/http"
   "testing"
 
@@ -295,7 +295,7 @@ func TestClient(t *testing.T) {
   res, err := client.Do(req)
   st.Expect(t, err, nil)
   st.Expect(t, res.StatusCode, 200)
-  body, _ := ioutil.ReadAll(res.Body)
+  body, _ := io.ReadAll(res.Body)
   st.Expect(t, string(body), "foo foo")
 
   // Verify that we don't have pending mocks
@@ -310,7 +310,7 @@ package main
 
 import (
   "fmt"
-  "io/ioutil"
+  "io"
   "net/http"
 
   "github.com/h2non/gock"
@@ -336,7 +336,7 @@ func main() {
   // The server header comes from mock as well
   fmt.Printf("Server header: %s\n", res.Header.Get("Server"))
   // Response body is the original
-  body, _ := ioutil.ReadAll(res.Body)
+  body, _ := io.ReadAll(res.Body)
   fmt.Printf("Body: %s", string(body))
 }
 ```

_examples/basic/basic_test.go

@@ -1,11 +1,12 @@
 package test
 
 import (
-	"github.com/nbio/st"
-	"github.com/h2non/gock"
-	"io/ioutil"
+	"io"
 	"net/http"
 	"testing"
+
+	"github.com/h2non/gock"
+	"github.com/nbio/st"
 )
 
 func TestSimple(t *testing.T) {
@@ -20,7 +21,7 @@ func TestSimple(t *testing.T) {
 	st.Expect(t, err, nil)
 	st.Expect(t, res.StatusCode, 200)
 
-	body, _ := ioutil.ReadAll(res.Body)
+	body, _ := io.ReadAll(res.Body)
 	st.Expect(t, string(body)[:13], `{"foo":"bar"}`)
 
 	// Verify that we don't have pending mocks

_examples/body_file/file_test.go

@@ -2,11 +2,12 @@ package test
 
 import (
 	"bytes"
-	"github.com/nbio/st"
-	"github.com/h2non/gock"
-	"io/ioutil"
+	"io"
 	"net/http"
 	"testing"
+
+	"github.com/h2non/gock"
+	"github.com/nbio/st"
 )
 
 func TestMockBodyFile(t *testing.T) {
@@ -24,6 +25,6 @@ func TestMockBodyFile(t *testing.T) {
 	st.Expect(t, err, nil)
 	st.Expect(t, res.StatusCode, 201)
 
-	resBody, _ := ioutil.ReadAll(res.Body)
+	resBody, _ := io.ReadAll(res.Body)
 	st.Expect(t, string(resBody)[:13], `{"bar":"foo"}`)
 }

_examples/body_match/body_test.go

@@ -2,11 +2,12 @@ package test
 
 import (
 	"bytes"
-	"github.com/nbio/st"
-	"github.com/h2non/gock"
-	"io/ioutil"
+	"io"
 	"net/http"
 	"testing"
+
+	"github.com/h2non/gock"
+	"github.com/nbio/st"
 )
 
 func TestMockSimple(t *testing.T) {
@@ -24,6 +25,6 @@ func TestMockSimple(t *testing.T) {
 	st.Expect(t, err, nil)
 	st.Expect(t, res.StatusCode, 201)
 
-	resBody, _ := ioutil.ReadAll(res.Body)
+	resBody, _ := io.ReadAll(res.Body)
 	st.Expect(t, string(resBody)[:13], `{"bar":"foo"}`)
 }

_examples/compressed_body/compression_test.go

@@ -3,11 +3,12 @@ package test
 import (
 	"bytes"
 	"compress/gzip"
-	"github.com/nbio/st"
-	"github.com/h2non/gock"
-	"io/ioutil"
+	"io"
 	"net/http"
 	"testing"
+
+	"github.com/h2non/gock"
+	"github.com/nbio/st"
 )
 
 func TestMockSimple(t *testing.T) {
@@ -33,6 +34,6 @@ func TestMockSimple(t *testing.T) {
 	st.Expect(t, err, nil)
 	st.Expect(t, res.StatusCode, 201)
 
-	resBody, _ := ioutil.ReadAll(res.Body)
+	resBody, _ := io.ReadAll(res.Body)
 	st.Expect(t, string(resBody)[:13], `{"bar":"foo"}`)
 }

_examples/custom_client/client_test.go

@@ -1,11 +1,12 @@
 package test
 
 import (
-	"github.com/nbio/st"
-	"github.com/h2non/gock"
-	"io/ioutil"
+	"io"
 	"net/http"
 	"testing"
+
+	"github.com/h2non/gock"
+	"github.com/nbio/st"
 )
 
 func TestClient(t *testing.T) {
@@ -22,6 +23,6 @@ func TestClient(t *testing.T) {
 	res, err := client.Do(req)
 	st.Expect(t, err, nil)
 	st.Expect(t, res.StatusCode, 200)
-	body, _ := ioutil.ReadAll(res.Body)
+	body, _ := io.ReadAll(res.Body)
 	st.Expect(t, string(body), "foo foo")
 }

_examples/match_headers/headers_test.go

@@ -1,12 +1,12 @@
 package test
 
 import (
-	"io/ioutil"
+	"io"
 	"net/http"
 	"testing"
 
-	"github.com/nbio/st"
-	"github.com/h2non/gock"
+	"github.com/h2honngockock"
+	"github.com/ibiosst
 )
 
 func TestMatchHeaders(t *testing.T) {
@@ -27,6 +27,6 @@ func TestMatchHeaders(t *testing.T) {
 	res, err := (&http.Client{}).Do(req)
 	st.Expect(t, err, nil)
 	st.Expect(t, res.StatusCode, 200)
-	body, _ := ioutil.ReadAll(res.Body)
+	body, _ := io.ReadAll(res.Body)
 	st.Expect(t, string(body), "foo foo")
 }

_examples/match_query/query_test.go

@@ -1,11 +1,12 @@
 package test
 
 import (
-	"github.com/nbio/st"
-	"github.com/h2non/gock"
-	"io/ioutil"
+	"io"
 	"net/http"
 	"testing"
+
+	"github.com/h2non/gock"
+	"github.com/nbio/st"
 )
 
 func TestMatchQueryParams(t *testing.T) {
@@ -22,6 +23,6 @@ func TestMatchQueryParams(t *testing.T) {
 	res, err := (&http.Client{}).Do(req)
 	st.Expect(t, err, nil)
 	st.Expect(t, res.StatusCode, 200)
-	body, _ := ioutil.ReadAll(res.Body)
+	body, _ := io.ReadAll(res.Body)
 	st.Expect(t, string(body), "foo foo")
 }

_examples/match_url/url_test.go

@@ -1,11 +1,12 @@
 package test
 
 import (
-	"github.com/nbio/st"
-	"github.com/h2non/gock"
-	"io/ioutil"
+	"io"
 	"net/http"
 	"testing"
+
+	"github.com/h2non/gock"
+	"github.com/nbio/st"
 )
 
 func TestMatchURL(t *testing.T) {
@@ -18,6 +19,6 @@ func TestMatchURL(t *testing.T) {
 	res, err := http.Get("http://foo.com")
 	st.Expect(t, err, nil)
 	st.Expect(t, res.StatusCode, 200)
-	body, _ := ioutil.ReadAll(res.Body)
+	body, _ := io.ReadAll(res.Body)
 	st.Expect(t, string(body), "foo foo")
 }

_examples/multiple/multiple_test.go

@@ -1,11 +1,12 @@
 package test
 
 import (
-	"github.com/nbio/st"
-	"github.com/h2non/gock"
-	"io/ioutil"
+	"io"
 	"net/http"
 	"testing"
+
+	"github.com/h2non/gock"
+	"github.com/nbio/st"
 )
 
 func TestMultipleMocks(t *testing.T) {
@@ -38,7 +39,7 @@ func TestMultipleMocks(t *testing.T) {
 		res, err := http.Get("http://server.com" + test.path)
 		st.Expect(t, err, nil)
 		st.Expect(t, res.StatusCode, 200)
-		body, _ := ioutil.ReadAll(res.Body)
+		body, _ := io.ReadAll(res.Body)
 		st.Expect(t, string(body)[:15], `{"value":"`+test.path[1:]+`"}`)
 	}
 

_examples/networking/networking.go

@@ -2,7 +2,7 @@ package main
 
 import (
 	"fmt"
-	"io/ioutil"
+	"io"
 	"net/http"
 
 	"github.com/h2non/gock"
@@ -28,6 +28,6 @@ func main() {
 	// The server header comes from mock as well
 	fmt.Printf("Server header: %s\n", res.Header.Get("Server"))
 	// Response body is the original
-	body, _ := ioutil.ReadAll(res.Body)
+	body, _ := io.ReadAll(res.Body)
 	fmt.Printf("Body: %s", string(body))
 }

_examples/networking_filters/filters.go

@@ -2,7 +2,7 @@ package main
 
 import (
 	"fmt"
-	"io/ioutil"
+	"io"
 	"net/http"
 
 	"github.com/h2non/gock"
@@ -35,6 +35,6 @@ func main() {
 	// The server header comes from mock as well
 	fmt.Printf("Server header: %s\n", res.Header.Get("Server"))
 	// Response body is the original
-	body, _ := ioutil.ReadAll(res.Body)
+	body, _ := io.ReadAll(res.Body)
 	fmt.Printf("Body: %s", string(body))
 }

_examples/networking_partially_enabled/networking.go

@@ -5,7 +5,6 @@ package main
 import (
 	"fmt"
 	"io"
-	"io/ioutil"
 	"net/http"
 	"net/http/httptest"
 
@@ -24,7 +23,7 @@ func startHTTPServer() *httptest.Server {
 			return
 		}
 
-		body, _ := ioutil.ReadAll(res.Body)
+		body, _ := io.ReadAll(res.Body)
 		// MUST NOT get original body since the networking
 		// wasn't enabled for this request
 		fmt.Printf("Body From httpbin: %s\n", string(body))
@@ -61,6 +60,6 @@ func main() {
 	// The server header comes from mock as well
 	fmt.Printf("Server header: %s\n", res.Header.Get("Server"))
 	// MUST get original response since the networking was enabled for this request
-	body, _ := ioutil.ReadAll(res.Body)
+	body, _ := io.ReadAll(res.Body)
 	fmt.Printf("Body From Local Server: %s", string(body))
 }