Skip to content

Commit 8eb2535

Browse files
inhereinhere
committed
up: update deps, remote dep stretchr/testify
1 parent 1c3506b commit 8eb2535

File tree

7 files changed

+75
-66
lines changed

7 files changed

+75
-66
lines changed

‎.github/workflows/go.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ jobs:
1919
runs-on: ubuntu-latest
2020
strategy:
2121
matrix:
22-
go_version: [1.18, 1.15, 1.16, 1.17]
22+
go_version: [1.18, 1.19, 1.16, 1.17]
2323

2424
steps:
2525
- name: Check out code

‎chlog/filter_test.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import (
44
"testing"
55

66
"github.com/gookit/gitw/chlog"
7-
"github.com/stretchr/testify/assert"
7+
"github.com/gookit/goutil/testutil/assert"
88
)
99

1010
func TestKeywordsFilter(t *testing.T) {

‎cmd_quick.go‎

Lines changed: 0 additions & 1 deletion
This file was deleted.

‎cmds_test.go‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,15 +5,15 @@ import (
55

66
"github.com/gookit/gitw"
77
"github.com/gookit/goutil/dump"
8-
"github.com/stretchr/testify/assert"
8+
"github.com/gookit/goutil/testutil/assert"
99
)
1010

1111
func TestTags(t *testing.T) {
1212
ts, err := gitw.Tags()
13-
assert.NoError(t, err)
13+
assert.NoErr(t, err)
1414
dump.P(ts)
1515

1616
ts, err = gitw.Tags("-n", "--sort=-version:refname")
17-
assert.NoError(t, err)
17+
assert.NoErr(t, err)
1818
dump.P(ts)
1919
}

‎go.mod‎

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,21 @@
11
module github.com/gookit/gitw
22

3-
go 1.15
3+
go 1.18
44

55
require (
66
github.com/gookit/color v1.5.2
77
github.com/gookit/goutil v0.5.15
88
github.com/gookit/slog v0.3.3
9-
github.com/stretchr/testify v1.8.0
109
gopkg.in/yaml.v3 v3.0.1
1110
)
11+
12+
require (
13+
github.com/gookit/gsr v0.0.7 // indirect
14+
github.com/mattn/go-isatty v0.0.16 // indirect
15+
github.com/valyala/bytebufferpool v1.0.0 // indirect
16+
github.com/xo/terminfo v0.0.0-20210125001918-ca9a967f8778 // indirect
17+
golang.org/x/crypto v0.0.0-20220829220503-c86fa9a7ed90 // indirect
18+
golang.org/x/sys v0.0.0-20220829200755-d48e67d00261 // indirect
19+
golang.org/x/term v0.0.0-20220722155259-a9ba230a4035 // indirect
20+
golang.org/x/text v0.3.8 // indirect
21+
)

‎info_test.go‎

Lines changed: 45 additions & 45 deletions
Original file line numberDiff line numberDiff line change
@@ -6,92 +6,92 @@ import (
66

77
"github.com/gookit/gitw"
88
"github.com/gookit/goutil/dump"
9-
"github.com/stretchr/testify/assert"
9+
"github.com/gookit/goutil/testutil/assert"
1010
)
1111

1212
func TestNewRemoteInfo(t *testing.T) {
1313
URL := "https://github.com/gookit/gitw"
1414

1515
rt, err := gitw.NewRemoteInfo("origin", URL, gitw.RemoteTypePush)
16-
assert.NoError(t, err)
16+
assert.NoErr(t, err)
1717
assert.True(t, rt.Valid())
1818
assert.False(t, rt.Invalid())
19-
assert.Equal(t, "origin", rt.Name)
20-
assert.Equal(t, gitw.RemoteTypePush, rt.Type)
21-
assert.Equal(t, "github.com", rt.Host)
22-
assert.Equal(t, "gookit/gitw", rt.RepoPath())
23-
assert.Equal(t, gitw.SchemeHTTPS, rt.Scheme)
24-
assert.Equal(t, gitw.ProtoHTTP, rt.Proto)
25-
assert.Equal(t, rt.URL, rt.RawURLOfHTTP())
19+
assert.Eq(t, "origin", rt.Name)
20+
assert.Eq(t, gitw.RemoteTypePush, rt.Type)
21+
assert.Eq(t, "github.com", rt.Host)
22+
assert.Eq(t, "gookit/gitw", rt.RepoPath())
23+
assert.Eq(t, gitw.SchemeHTTPS, rt.Scheme)
24+
assert.Eq(t, gitw.ProtoHTTP, rt.Proto)
25+
assert.Eq(t, rt.URL, rt.RawURLOfHTTP())
2626

2727
URL = "[email protected]:gookit/gitw.git"
2828
rt, err = gitw.NewRemoteInfo("origin", URL, gitw.RemoteTypePush)
29-
assert.NoError(t, err)
30-
assert.Equal(t, "github.com", rt.Host)
31-
assert.Equal(t, "gookit/gitw", rt.Path())
32-
assert.Equal(t, gitw.SchemeGIT, rt.Scheme)
33-
assert.Equal(t, gitw.ProtoSSH, rt.Proto)
34-
assert.Equal(t, "https://github.com/gookit/gitw", rt.RawURLOfHTTP())
29+
assert.NoErr(t, err)
30+
assert.Eq(t, "github.com", rt.Host)
31+
assert.Eq(t, "gookit/gitw", rt.Path())
32+
assert.Eq(t, gitw.SchemeGIT, rt.Scheme)
33+
assert.Eq(t, gitw.ProtoSSH, rt.Proto)
34+
assert.Eq(t, "https://github.com/gookit/gitw", rt.RawURLOfHTTP())
3535
}
3636

3737
func TestParseBranchLine_simple(t *testing.T) {
3838
info, err := gitw.ParseBranchLine("* ", false)
39-
assert.Error(t, err)
39+
assert.Err(t, err)
4040

4141
info, err = gitw.ParseBranchLine("* (HEAD)", false)
42-
assert.Error(t, err)
42+
assert.Err(t, err)
4343

4444
info, err = gitw.ParseBranchLine("* fea/new_br001", false)
45-
assert.NoError(t, err)
45+
assert.NoErr(t, err)
4646

4747
assert.True(t, info.Current)
4848
assert.True(t, info.IsValid())
4949
assert.False(t, info.IsRemoted())
50-
assert.Equal(t, "", info.Remote)
51-
assert.Equal(t, "fea/new_br001", info.Name)
52-
assert.Equal(t, "fea/new_br001", info.Short)
50+
assert.Eq(t, "", info.Remote)
51+
assert.Eq(t, "fea/new_br001", info.Name)
52+
assert.Eq(t, "fea/new_br001", info.Short)
5353

5454
info, err = gitw.ParseBranchLine(" remotes/source/my_new_br ", false)
55-
assert.NoError(t, err)
55+
assert.NoErr(t, err)
5656

5757
assert.False(t, info.Current)
5858
assert.True(t, info.IsValid())
5959
assert.True(t, info.IsRemoted())
60-
assert.Equal(t, "source", info.Remote)
61-
assert.Equal(t, "remotes/source/my_new_br", info.Name)
62-
assert.Equal(t, "my_new_br", info.Short)
60+
assert.Eq(t, "source", info.Remote)
61+
assert.Eq(t, "remotes/source/my_new_br", info.Name)
62+
assert.Eq(t, "my_new_br", info.Short)
6363
}
6464

6565
func TestParseBranchLine_verbose(t *testing.T) {
6666
info, err := gitw.ParseBranchLine("* fea/new_br001 73j824d the message 001", true)
67-
assert.NoError(t, err)
67+
assert.NoErr(t, err)
6868

6969
assert.True(t, info.Current)
7070
assert.True(t, info.IsValid())
7171
assert.False(t, info.IsRemoted())
72-
assert.Equal(t, "", info.Remote)
73-
assert.Equal(t, "fea/new_br001", info.Name)
74-
assert.Equal(t, "fea/new_br001", info.Short)
75-
assert.Equal(t, "73j824d", info.Hash)
76-
assert.Equal(t, "the message 001", info.HashMsg)
72+
assert.Eq(t, "", info.Remote)
73+
assert.Eq(t, "fea/new_br001", info.Name)
74+
assert.Eq(t, "fea/new_br001", info.Short)
75+
assert.Eq(t, "73j824d", info.Hash)
76+
assert.Eq(t, "the message 001", info.HashMsg)
7777

7878
info, err = gitw.ParseBranchLine(" remotes/source/my_new_br 6fb8dcd the message 003 ", true)
79-
assert.NoError(t, err)
79+
assert.NoErr(t, err)
8080
dump.P(info)
8181

8282
assert.False(t, info.Current)
8383
assert.True(t, info.IsValid())
8484
assert.True(t, info.IsRemoted())
85-
assert.Equal(t, "source", info.Remote)
86-
assert.Equal(t, "remotes/source/my_new_br", info.Name)
87-
assert.Equal(t, "my_new_br", info.Short)
88-
assert.Equal(t, "6fb8dcd", info.Hash)
89-
assert.Equal(t, "the message 003", info.HashMsg)
85+
assert.Eq(t, "source", info.Remote)
86+
assert.Eq(t, "remotes/source/my_new_br", info.Name)
87+
assert.Eq(t, "my_new_br", info.Short)
88+
assert.Eq(t, "6fb8dcd", info.Hash)
89+
assert.Eq(t, "the message 003", info.HashMsg)
9090

9191
info, err = gitw.ParseBranchLine("* （头指针在 v0.2.3 分离） 3c08adf chore: update readme add branch info docs", true)
92-
assert.Error(t, err)
92+
assert.Err(t, err)
9393
info, err = gitw.ParseBranchLine("* (HEAD detached at pull/29/merge) 62f3455 Merge cfc79b748e176c1c9e266c8bc413c87fe974acef into c9503c2aef993a2cf582d90c137deda53c9bca68", true)
94-
assert.Error(t, err)
94+
assert.Err(t, err)
9595
}
9696

9797
func TestBranchInfo_parse_simple(t *testing.T) {
@@ -106,11 +106,11 @@ func TestBranchInfo_parse_simple(t *testing.T) {
106106
bis.Parse()
107107
// dump.P(bis)
108108

109-
assert.NoError(t, bis.LastErr())
109+
assert.NoErr(t, bis.LastErr())
110110
assert.NotEmpty(t, bis.Current())
111111
assert.NotEmpty(t, bis.Locales())
112112
assert.NotEmpty(t, bis.Remotes(""))
113-
assert.Equal(t, "master", bis.Current().Name)
113+
assert.Eq(t, "master", bis.Current().Name)
114114
}
115115

116116
func TestBranchInfo_parse_invalid(t *testing.T) {
@@ -124,7 +124,7 @@ func TestBranchInfo_parse_invalid(t *testing.T) {
124124
bis.Parse()
125125
// dump.P(bis)
126126

127-
assert.Error(t, bis.LastErr())
127+
assert.Err(t, bis.LastErr())
128128
assert.Nil(t, bis.Current())
129129
assert.NotEmpty(t, bis.Locales())
130130
assert.NotEmpty(t, bis.Remotes("origin"))
@@ -144,11 +144,11 @@ func TestBranchInfo_parse_verbose(t *testing.T) {
144144
bis.Parse()
145145
// dump.P(bis)
146146

147-
assert.NoError(t, bis.LastErr())
147+
assert.NoErr(t, bis.LastErr())
148148
assert.NotEmpty(t, bis.Current())
149149
assert.NotEmpty(t, bis.Locales())
150150
assert.NotEmpty(t, bis.Remotes(""))
151-
assert.Equal(t, "master", bis.Current().Name)
151+
assert.Eq(t, "master", bis.Current().Name)
152152

153153
// search
154154
rets := bis.Search("new", gitw.BrSearchLocal)
@@ -165,5 +165,5 @@ func TestBranchInfo_parse_verbose(t *testing.T) {
165165
assert.NotEmpty(t, rets)
166166
assert.Len(t, rets, 1)
167167
assert.True(t, rets[0].IsRemoted())
168-
assert.Equal(t, "origin", rets[0].Remote)
168+
assert.Eq(t, "origin", rets[0].Remote)
169169
}

‎repo_test.go‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@ import (
66
"github.com/gookit/gitw"
77
"github.com/gookit/goutil/dump"
88
"github.com/gookit/goutil/sysutil"
9+
"github.com/gookit/goutil/testutil/assert"
910
"github.com/gookit/slog"
10-
"github.com/stretchr/testify/assert"
1111
)
1212

1313
var repo = gitw.NewRepo("./").WithFn(func(r *gitw.Repo) {
@@ -23,7 +23,7 @@ func TestRepo_RemoteInfos(t *testing.T) {
2323
rs := repo.AllRemoteInfos()
2424
dump.P(rs)
2525

26-
assert.NoError(t, repo.Err())
26+
assert.NoErr(t, repo.Err())
2727
assert.NotEmpty(t, rs)
2828

2929
assert.True(t, repo.HasRemote(gitw.DefaultRemoteName))
@@ -37,18 +37,18 @@ func TestRepo_DefaultRemoteInfo(t *testing.T) {
3737
assert.NotEmpty(t, rt)
3838
assert.True(t, rt.Valid())
3939
assert.False(t, rt.Invalid())
40-
assert.Equal(t, gitw.DefaultRemoteName, rt.Name)
41-
assert.Equal(t, "[email protected]:gookit/gitw.git", rt.GitURL())
42-
assert.Equal(t, "http://github.com/gookit/gitw", rt.URLOfHTTP())
43-
assert.Equal(t, "https://github.com/gookit/gitw", rt.URLOfHTTPS())
40+
assert.Eq(t, gitw.DefaultRemoteName, rt.Name)
41+
assert.Eq(t, "[email protected]:gookit/gitw.git", rt.GitURL())
42+
assert.Eq(t, "http://github.com/gookit/gitw", rt.URLOfHTTP())
43+
assert.Eq(t, "https://github.com/gookit/gitw", rt.URLOfHTTPS())
4444

4545
rt = repo.RandomRemoteInfo(gitw.RemoteTypePush)
4646
assert.NotEmpty(t, rt)
4747
}
4848

4949
func TestRepo_AutoMatchTag(t *testing.T) {
50-
assert.Equal(t, "HEAD", repo.AutoMatchTag("head"))
51-
assert.Equal(t, "541fb9d", repo.AutoMatchTag("541fb9d"))
50+
assert.Eq(t, "HEAD", repo.AutoMatchTag("head"))
51+
assert.Eq(t, "541fb9d", repo.AutoMatchTag("541fb9d"))
5252
}
5353

5454
func TestRepo_BranchInfos(t *testing.T) {
@@ -66,8 +66,8 @@ func TestRepo_BranchInfos(t *testing.T) {
6666

6767
mbr := repo.BranchInfo("main")
6868
if mbr != nil {
69-
assert.Equal(t, "main", mbr.Name)
70-
assert.Equal(t, "main", mbr.Short)
69+
assert.Eq(t, "main", mbr.Name)
70+
assert.Eq(t, "main", mbr.Short)
7171
}
7272
}
7373

@@ -77,12 +77,12 @@ func TestRepo_Info(t *testing.T) {
7777

7878
assert.Nil(t, repo.Err())
7979
assert.NotNil(t, info)
80-
assert.Equal(t, "gitw", info.Name)
80+
assert.Eq(t, "gitw", info.Name)
8181
}
8282

8383
func TestRepo_AutoMatchTagByTagType(t *testing.T) {
84-
assert.Equal(t, "HEAD", repo.AutoMatchTagByType("head", 0))
85-
assert.Equal(t, "541fb9d", repo.AutoMatchTagByType("541fb9d", 0))
84+
assert.Eq(t, "HEAD", repo.AutoMatchTagByType("head", 0))
85+
assert.Eq(t, "541fb9d", repo.AutoMatchTagByType("541fb9d", 0))
8686
}
8787

8888
func TestRepo_TagsSortedByCreatorDate(t *testing.T) {

0 commit comments

Comments
 (0)