From 60774b6b72a2f5966e90112ae98f357b761dcf88 Mon Sep 17 00:00:00 2001 From: ErickSkrauch Date: Fri, 21 Aug 2020 18:12:31 +0300 Subject: [PATCH] Resolves #27. Replace import of the gock with gopkg.in/h2non/gock.v1 --- Gopkg.lock | 18 +++++++++--------- Gopkg.toml | 4 ++-- api/mojang/mojang_test.go | 3 ++- .../remote_api_uuids_provider_test.go | 3 ++- 4 files changed, 15 insertions(+), 13 deletions(-) diff --git a/Gopkg.lock b/Gopkg.lock index 477f6fb..4e787f2 100644 --- a/Gopkg.lock +++ b/Gopkg.lock @@ -83,14 +83,6 @@ revision = "c5c6c98bc25355028a63748a498942a6398ccd22" version = "v1.7.1" -[[projects]] - digest = "1:5eeb4bfc6db411dbb34a6d9e5d49a9956b160d59fd004ee8f03fe53c9605c082" - name = "github.com/h2non/gock" - packages = ["."] - pruneopts = "" - revision = "ba88c4862a27596539531ce469478a91bc5a0511" - version = "v1.0.14" - [[projects]] digest = "1:0f31ddb2589297fc1d716f45b34e34bff34e968de1aa239543274c87522e86f4" name = "github.com/h2non/parth" @@ -308,6 +300,14 @@ pruneopts = "" revision = "bd91bbf73e9a4a801adbfb97133c992678533126" +[[projects]] + digest = "1:2a7fe9cf6ed8bca3f0ef319592db1621ce244e7ffefba3c2c21ee40d6898a9c8" + name = "gopkg.in/h2non/gock.v1" + packages = ["."] + pruneopts = "" + revision = "3ffff9b1aa8200275a5eb219c5f9c62bd27acb31" + version = "v1.0.15" + [[projects]] branch = "v2" digest = "1:81314a486195626940617e43740b4fa073f265b0715c9f54ce2027fee1cb5f61" @@ -327,7 +327,6 @@ "github.com/getsentry/raven-go", "github.com/goava/di", "github.com/gorilla/mux", - "github.com/h2non/gock", "github.com/mediocregopher/radix.v2/pool", "github.com/mediocregopher/radix.v2/redis", "github.com/mediocregopher/radix.v2/util", @@ -345,6 +344,7 @@ "github.com/stretchr/testify/require", "github.com/stretchr/testify/suite", "github.com/thedevsaddam/govalidator", + "gopkg.in/h2non/gock.v1", ] solver-name = "gps-cdcl" solver-version = 1 diff --git a/Gopkg.toml b/Gopkg.toml index 6632bcf..e9bd248 100644 --- a/Gopkg.toml +++ b/Gopkg.toml @@ -52,5 +52,5 @@ ignored = ["github.com/elyby/chrly"] version = "^1.3.0" [[constraint]] - name = "github.com/h2non/gock" - version = "^1.0.6" + name = "gopkg.in/h2non/gock.v1" + version = "^1.0.15" diff --git a/api/mojang/mojang_test.go b/api/mojang/mojang_test.go index b9c1124..1a9162d 100644 --- a/api/mojang/mojang_test.go +++ b/api/mojang/mojang_test.go @@ -4,7 +4,8 @@ import ( "net/http" "testing" - "github.com/h2non/gock" + "gopkg.in/h2non/gock.v1" + testify "github.com/stretchr/testify/assert" ) diff --git a/mojangtextures/remote_api_uuids_provider_test.go b/mojangtextures/remote_api_uuids_provider_test.go index 166b432..2d34b4f 100644 --- a/mojangtextures/remote_api_uuids_provider_test.go +++ b/mojangtextures/remote_api_uuids_provider_test.go @@ -6,7 +6,8 @@ import ( . "net/url" "testing" - "github.com/h2non/gock" + "gopkg.in/h2non/gock.v1" + "github.com/stretchr/testify/mock" "github.com/stretchr/testify/suite" )