Migrate username (#9)

Author: smoothprogrammer

.github/workflows/main.yaml

@@ -31,7 +31,7 @@ jobs:
         run: |
           nix --store ${{ env.CI_NIX_STORE }} \
             develop ${{ env.CI_NIX_FLAKE }} --command \
-            go test -v -cover -race ./...
+            go test -v -short -cover -race ./...
   lint:
     runs-on: ubuntu-latest
     steps:

README.md

@@ -1,13 +1,13 @@
 # gostman [![Go Reference](https://pkg.go.dev/badge/github.com/minizilla/gostman.svg)](https://pkg.go.dev/github.com/minizilla/gostman) [![main](https://github.com/minizilla/gostman/actions/workflows/main.yaml/badge.svg)](https://github.com/minizilla/gostman/actions/workflows/main.yaml)
 
-[Postman](https://www.postman.com/) like inside [Go](https://golang.org/) testing.
+[Postman](https://www.postman.com/) nuances in [Go](https://golang.org/) Test.
 
 ## Install
 
 Just import gostman to your test package.
 
 ```go
-import github.com/injustease/gostman
+import github.com/minizilla/gostman
 ```
 
 ## Usage
@@ -100,8 +100,8 @@ import (
     "os"
     "testing"
 
-    "github.com/injustease/is"
-    "github.com/injustease/gostman"
+    "github.com/minizilla/gostman"
+    "github.com/minizilla/testr"
 )
 
 func TestMain(m *testing.M) {
@@ -119,15 +119,15 @@ func TestRequest(t *testing.T) {
         r.Send(func(t *testing.T, req *http.Request, res *http.Response) {
             defer res.Body.Close()
 
-            is := is.New(t)
-            is.Equal(res.StatusCode, http.StatusOK)
+            assert := testr.New(t)
+            assert.Equal(res.StatusCode, http.StatusOK)
 
             var resp = struct {
                 Args map[string]string `json:"args"`
             }{}
             err := json.NewDecoder(res.Body).Decode(&resp)
-            is.NoError(err)
-            is.Equal(resp.Args["foo"], "bar")
+            assert.ErrorIs(err, nil)
+            assert.Equal(resp.Args["foo"], "bar")
         })
     })
 }

VERSION

@@ -1,9 +1,9 @@
 // Package postman_test contains examples of gostman using Postman Echo.
 // The following list are comparison of hierarchy between gostman and gostman.
 //
-// 	- The package postman_test is equal to collection in the postman
-// 	- All tests in the form of TextXxx equal to folder in the postman (gostman doesn't support recursive folder)
-// 	- Request itself is running in the subtests
+//   - The package postman_test is equal to collection in the postman
+//   - All tests in the form of TextXxx equal to folder in the postman (gostman doesn't support recursive folder)
+//   - Request itself is running in the subtests
 package postman_test
 
 import (
@@ -13,8 +13,8 @@ import (
 	"os"
 	"testing"
 
-	"github.com/injustease/gostman"
-	"github.com/injustease/is"
+	"github.com/minizilla/gostman"
+	"github.com/minizilla/testr"
 )
 
 type postmanResponse struct {
@@ -31,6 +31,10 @@ func TestMain(m *testing.M) {
 // TestRequest tests request to postman-echo.
 // go test -run Request
 func TestRequest(t *testing.T) {
+	if testing.Short() {
+		t.SkipNow()
+	}
+
 	gm := gostman.New(t)
 
 	// go test -run Request/Params
@@ -43,14 +47,14 @@ func TestRequest(t *testing.T) {
 		r.Send(func(t *testing.T, req *http.Request, res *http.Response) {
 			defer res.Body.Close()
 
-			is := is.New(t)
-			is.Equal(res.StatusCode, http.StatusOK)
+			assert := testr.New(t)
+			assert.Equal(res.StatusCode, http.StatusOK)
 
 			var resp postmanResponse
 			err := json.NewDecoder(res.Body).Decode(&resp)
-			is.NoError(err)
-			is.Equal(resp.Args["foo1"], "bar1")
-			is.Equal(resp.Args["foo2"], "bar2")
+			assert.ErrorIs(err, nil)
+			assert.Equal(resp.Args["foo1"], "bar1")
+			assert.Equal(resp.Args["foo2"], "bar2")
 		})
 	})
 
@@ -64,13 +68,13 @@ func TestRequest(t *testing.T) {
 		r.Send(func(t *testing.T, req *http.Request, res *http.Response) {
 			defer res.Body.Close()
 
-			is := is.New(t)
-			is.Equal(res.StatusCode, http.StatusOK)
+			assert := testr.New(t)
+			assert.Equal(res.StatusCode, http.StatusOK)
 
 			var resp postmanResponse
 			err := json.NewDecoder(res.Body).Decode(&resp)
-			is.NoError(err)
-			is.True(resp.Authenticated)
+			assert.ErrorIs(err, nil)
+			assert.Equal(resp.Authenticated, true)
 		})
 	})
 
@@ -84,14 +88,14 @@ func TestRequest(t *testing.T) {
 		r.Send(func(t *testing.T, req *http.Request, res *http.Response) {
 			defer res.Body.Close()
 
-			is := is.New(t)
-			is.Equal(res.StatusCode, http.StatusOK)
+			assert := testr.New(t)
+			assert.Equal(res.StatusCode, http.StatusOK)
 
 			var resp postmanResponse
 			err := json.NewDecoder(res.Body).Decode(&resp)
-			is.NoError(err)
-			is.Equal(resp.Headers["foo1"], "bar1")
-			is.Equal(resp.Headers["foo2"], "bar2")
+			assert.ErrorIs(err, nil)
+			assert.Equal(resp.Headers["foo1"], "bar1")
+			assert.Equal(resp.Headers["foo2"], "bar2")
 		})
 	})
 
@@ -104,22 +108,26 @@ func TestRequest(t *testing.T) {
 		r.Send(func(t *testing.T, req *http.Request, res *http.Response) {
 			defer res.Body.Close()
 
-			is := is.New(t)
-			is.Equal(res.StatusCode, http.StatusOK)
+			assert := testr.New(t)
+			assert.Equal(res.StatusCode, http.StatusOK)
 
 			var resp postmanResponse
 			err := json.NewDecoder(res.Body).Decode(&resp)
-			is.NoError(err)
-			is.Equal(resp.Data, text)
+			assert.ErrorIs(err, nil)
+			assert.Equal(resp.Data, text)
 		})
 	})
 }
 
 // TestVariable tests request to postman-echo with variable.
 //
-//  Set env: go test -run Variable -env postman
-//  Set env for the future request too: go test -run Variable -setenv postman
+//	Set env: go test -run Variable -env postman
+//	Set env for the future request too: go test -run Variable -setenv postman
 func TestVariable(t *testing.T) {
+	if testing.Short() {
+		t.SkipNow()
+	}
+
 	gm := gostman.New(t)
 
 	// go test -run Variable/Authorization -env postman
@@ -132,13 +140,13 @@ func TestVariable(t *testing.T) {
 		r.Send(func(t *testing.T, req *http.Request, res *http.Response) {
 			defer res.Body.Close()
 
-			is := is.New(t)
-			is.Equal(res.StatusCode, http.StatusOK)
+			assert := testr.New(t)
+			assert.Equal(res.StatusCode, http.StatusOK)
 
 			var resp postmanResponse
 			err := json.NewDecoder(res.Body).Decode(&resp)
-			is.NoError(err)
-			is.True(resp.Authenticated)
+			assert.ErrorIs(err, nil)
+			assert.Equal(resp.Authenticated, true)
 		})
 	})
 }

examples/postman/postman_test.go

@@ -1,11 +1,13 @@
-module github.com/injustease/gostman
+module github.com/minizilla/gostman
 
 go 1.17
 
 require (
-	github.com/injustease/is v1.5.0
+	github.com/minizilla/testr v0.2.3
 	github.com/sirupsen/logrus v1.8.1
 	gopkg.in/yaml.v2 v2.4.0
 )
 
 require golang.org/x/sys v0.0.0-20191026070338-33540a1f6037 // indirect
+
+retract v0.1.0

go.mod

@@ -1,7 +1,7 @@
 github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
 github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
-github.com/injustease/is v1.5.0 h1:lRfe4bt4C6tDqo7PWpSQ6SfeezTjk8UHBEMk8pu/yNg=
-github.com/injustease/is v1.5.0/go.mod h1:I2YT3yc64AaWxrl/sYwCmWGy/rEoplE1Pc9Q8ULxg5Q=
+github.com/minizilla/testr v0.2.3 h1:Fz6Xo8CBACAFeWygvyRZspt0tF5h6mNJg3duIsEZxgM=
+github.com/minizilla/testr v0.2.3/go.mod h1:DdZPGzN8GgQbC2QZ24W/BaWI88xCKUKQ6YLcV/g3hvQ=
 github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
 github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
 github.com/sirupsen/logrus v1.8.1 h1:dJKuHgqk1NNQlqoA6BTlM1Wf9DOH3NBjQyu0h9+AZZE=

go.sum

@@ -8,9 +8,6 @@ import (
 	"testing"
 )
 
-//go:embed VERSION
-var gostmanVersion string
-
 // Gostman represents an API development set.
 type Gostman struct {
 	t *testing.T

gostman.go

@@ -10,7 +10,7 @@ func (r *Request) Headers(f func(http.Header)) {
 func recomendedHeader() http.Header {
 	headers := make(http.Header)
 	headers.Add("Host", "<calculated when request is sent>")
-	headers.Add("User-Agent", "Gostman/"+gostmanVersion)
+	headers.Add("User-Agent", "Gostman")
 	headers.Add("Accept", "*/*")
 	// headers.Add("Accept-Encoding", "gzip, deflate, br") // TODO
 	headers.Add("Connection", "keep-alive")