Skip to content

Commit 75ebb86

Browse files
mislavmislav
committed
Use testify assertions for error matching
1 parent 45f4a1f commit 75ebb86

File tree

20 files changed

+95
-139
lines changed

20 files changed

+95
-139
lines changed

‎api/client_test.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ func TestGraphQL(t *testing.T) {
3131
)
3232

3333
err := client.GraphQL("github.com", "QUERY", vars, &response)
34-
assert.Equal(t, nil, err)
34+
assert.NoError(t, err)
3535
assert.Equal(t, "hubot", response.Viewer.Login)
3636

3737
req := http.Requests[0]
@@ -77,7 +77,7 @@ func TestRESTGetDelete(t *testing.T) {
7777

7878
r := bytes.NewReader([]byte(`{}`))
7979
err := client.REST("github.com", "DELETE", "applications/CLIENTID/grant", r, nil)
80-
assert.Equal(t, nil, err)
80+
assert.NoError(t, err)
8181
}
8282

8383
func TestRESTError(t *testing.T) {

‎api/pull_request_test.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ func TestPullRequest_ChecksStatus(t *testing.T) {
3333
} }] } }
3434
`
3535
err := json.Unmarshal([]byte(payload), &pr)
36-
assert.Equal(t, nil, err)
36+
assert.NoError(t, err)
3737

3838
checks := pr.ChecksStatus()
3939
assert.Equal(t, 8, checks.Total)

‎context/remote_test.go‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
package context
22

33
import (
4-
"errors"
54
"net/url"
65
"testing"
76

@@ -18,15 +17,15 @@ func Test_Remotes_FindByName(t *testing.T) {
1817
}
1918

2019
r, err := list.FindByName("upstream", "origin")
21-
assert.Equal(t, nil, err)
20+
assert.NoError(t, err)
2221
assert.Equal(t, "upstream", r.Name)
2322

2423
r, err = list.FindByName("nonexistent", "*")
25-
assert.Equal(t, nil, err)
24+
assert.NoError(t, err)
2625
assert.Equal(t, "mona", r.Name)
2726

2827
_, err = list.FindByName("nonexistent")
29-
assert.Equal(t, errors.New(`no GitHub remotes found`), err)
28+
assert.Error(t, err, "no GitHub remotes found")
3029
}
3130

3231
func Test_translateRemotes(t *testing.T) {

‎internal/config/config_file_test.go‎

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -17,12 +17,12 @@ hosts:
1717
oauth_token: OTOKEN
1818
`, "")()
1919
config, err := ParseConfig("config.yml")
20-
assert.Equal(t, nil, err)
20+
assert.NoError(t, err)
2121
user, err := config.Get("github.com", "user")
22-
assert.Equal(t, nil, err)
22+
assert.NoError(t, err)
2323
assert.Equal(t, "monalisa", user)
2424
token, err := config.Get("github.com", "oauth_token")
25-
assert.Equal(t, nil, err)
25+
assert.NoError(t, err)
2626
assert.Equal(t, "OTOKEN", token)
2727
}
2828

@@ -37,12 +37,12 @@ hosts:
3737
oauth_token: OTOKEN
3838
`, "")()
3939
config, err := ParseConfig("config.yml")
40-
assert.Equal(t, nil, err)
40+
assert.NoError(t, err)
4141
user, err := config.Get("github.com", "user")
42-
assert.Equal(t, nil, err)
42+
assert.NoError(t, err)
4343
assert.Equal(t, "monalisa", user)
4444
token, err := config.Get("github.com", "oauth_token")
45-
assert.Equal(t, nil, err)
45+
assert.NoError(t, err)
4646
assert.Equal(t, "OTOKEN", token)
4747
}
4848

@@ -53,12 +53,12 @@ github.com:
5353
oauth_token: OTOKEN
5454
`)()
5555
config, err := ParseConfig("config.yml")
56-
assert.Equal(t, nil, err)
56+
assert.NoError(t, err)
5757
user, err := config.Get("github.com", "user")
58-
assert.Equal(t, nil, err)
58+
assert.NoError(t, err)
5959
assert.Equal(t, "monalisa", user)
6060
token, err := config.Get("github.com", "oauth_token")
61-
assert.Equal(t, nil, err)
61+
assert.NoError(t, err)
6262
assert.Equal(t, "OTOKEN", token)
6363
}
6464

@@ -75,15 +75,15 @@ example.com:
7575
git_protocol: https
7676
`)()
7777
config, err := ParseConfig("config.yml")
78-
assert.Equal(t, nil, err)
78+
assert.NoError(t, err)
7979
val, err := config.Get("example.com", "git_protocol")
80-
assert.Equal(t, nil, err)
80+
assert.NoError(t, err)
8181
assert.Equal(t, "https", val)
8282
val, err = config.Get("github.com", "git_protocol")
83-
assert.Equal(t, nil, err)
83+
assert.NoError(t, err)
8484
assert.Equal(t, "ssh", val)
8585
val, err = config.Get("nonexistent.io", "git_protocol")
86-
assert.Equal(t, nil, err)
86+
assert.NoError(t, err)
8787
assert.Equal(t, "ssh", val)
8888
}
8989

@@ -100,7 +100,7 @@ github.com:
100100
defer StubBackupConfig()()
101101

102102
_, err := ParseConfig("config.yml")
103-
assert.Nil(t, err)
103+
assert.NoError(t, err)
104104

105105
expectedHosts := `github.com:
106106
user: keiyuri

‎internal/config/config_type_test.go‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -55,15 +55,15 @@ func Test_defaultConfig(t *testing.T) {
5555
assert.Equal(t, "", hostsBuf.String())
5656

5757
proto, err := cfg.Get("", "git_protocol")
58-
assert.Nil(t, err)
58+
assert.NoError(t, err)
5959
assert.Equal(t, "https", proto)
6060

6161
editor, err := cfg.Get("", "editor")
62-
assert.Nil(t, err)
62+
assert.NoError(t, err)
6363
assert.Equal(t, "", editor)
6464

6565
aliases, err := cfg.Aliases()
66-
assert.Nil(t, err)
66+
assert.NoError(t, err)
6767
assert.Equal(t, len(aliases.All()), 1)
6868
expansion, _ := aliases.Get("co")
6969
assert.Equal(t, expansion, "pr checkout")
@@ -74,13 +74,13 @@ func Test_ValidateValue(t *testing.T) {
7474
assert.EqualError(t, err, "invalid value")
7575

7676
err = ValidateValue("git_protocol", "ssh")
77-
assert.Nil(t, err)
77+
assert.NoError(t, err)
7878

7979
err = ValidateValue("editor", "vim")
80-
assert.Nil(t, err)
80+
assert.NoError(t, err)
8181

8282
err = ValidateValue("got", "123")
83-
assert.Nil(t, err)
83+
assert.NoError(t, err)
8484
}
8585

8686
func Test_ValidateKey(t *testing.T) {

‎internal/config/from_env_test.go‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -279,7 +279,9 @@ func TestInheritEnv(t *testing.T) {
279279
assert.Equal(t, tt.wants.token, val)
280280

281281
err := cfg.CheckWriteable(tt.hostname, "oauth_token")
282-
assert.Equal(t, tt.wants.writeable, err == nil)
282+
if tt.wants.writeable != (err == nil) {
283+
t.Errorf("CheckWriteable() = %v, wants %v", err, tt.wants.writeable)
284+
}
283285
})
284286
}
285287
}

‎internal/ghinstance/host_test.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -139,7 +139,7 @@ func TestHostnameValidator(t *testing.T) {
139139
assert.Error(t, err)
140140
return
141141
}
142-
assert.Equal(t, nil, err)
142+
assert.NoError(t, err)
143143
})
144144
}
145145
}

‎pkg/cmd/alias/delete/delete_test.go‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -76,9 +76,7 @@ func TestAliasDelete(t *testing.T) {
7676

7777
_, err = cmd.ExecuteC()
7878
if tt.wantErr != "" {
79-
if assert.Error(t, err) {
80-
assert.Equal(t, tt.wantErr, err.Error())
81-
}
79+
assert.EqualError(t, err, tt.wantErr)
8280
return
8381
}
8482
require.NoError(t, err)

‎pkg/cmd/alias/set/set_test.go‎

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -65,10 +65,7 @@ func TestAliasSet_gh_command(t *testing.T) {
6565
cfg := config.NewFromString(``)
6666

6767
_, err := runCommand(cfg, true, "pr 'pr status'")
68-
69-
if assert.Error(t, err) {
70-
assert.Equal(t, `could not create alias: "pr" is already a gh command`, err.Error())
71-
}
68+
assert.EqualError(t, err, `could not create alias: "pr" is already a gh command`)
7269
}
7370

7471
func TestAliasSet_empty_aliases(t *testing.T) {
@@ -210,9 +207,7 @@ func TestAliasSet_invalid_command(t *testing.T) {
210207
cfg := config.NewFromString(``)
211208

212209
_, err := runCommand(cfg, true, "co 'pe checkout'")
213-
if assert.Error(t, err) {
214-
assert.Equal(t, "could not create alias: pe checkout does not correspond to a gh command", err.Error())
215-
}
210+
assert.EqualError(t, err, "could not create alias: pe checkout does not correspond to a gh command")
216211
}
217212

218213
func TestShellAlias_flag(t *testing.T) {

‎pkg/cmd/auth/login/login_test.go‎

Lines changed: 7 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -193,7 +193,7 @@ func Test_loginRun_nontty(t *testing.T) {
193193
opts *LoginOptions
194194
httpStubs func(*httpmock.Registry)
195195
wantHosts string
196-
wantErr *regexp.Regexp
196+
wantErr string
197197
}{
198198
{
199199
name: "with token",
@@ -223,7 +223,7 @@ func Test_loginRun_nontty(t *testing.T) {
223223
httpStubs: func(reg *httpmock.Registry) {
224224
reg.Register(httpmock.REST("GET", ""), httpmock.ScopesResponder("read:org"))
225225
},
226-
wantErr: regexp.MustCompile(`missing required scope 'repo'`),
226+
wantErr: `could not validate token: missing required scope 'repo'`,
227227
},
228228
{
229229
name: "missing read scope",
@@ -234,7 +234,7 @@ func Test_loginRun_nontty(t *testing.T) {
234234
httpStubs: func(reg *httpmock.Registry) {
235235
reg.Register(httpmock.REST("GET", ""), httpmock.ScopesResponder("repo"))
236236
},
237-
wantErr: regexp.MustCompile(`missing required scope 'read:org'`),
237+
wantErr: `could not validate token: missing required scope 'read:org'`,
238238
},
239239
{
240240
name: "has admin scope",
@@ -282,14 +282,10 @@ func Test_loginRun_nontty(t *testing.T) {
282282
defer config.StubWriteConfig(&mainBuf, &hostsBuf)()
283283

284284
err := loginRun(tt.opts)
285-
assert.Equal(t, tt.wantErr == nil, err == nil)
286-
if err != nil {
287-
if tt.wantErr != nil {
288-
assert.True(t, tt.wantErr.MatchString(err.Error()))
289-
return
290-
} else {
291-
t.Fatalf("unexpected error: %s", err)
292-
}
285+
if tt.wantErr != "" {
286+
assert.EqualError(t, err, tt.wantErr)
287+
} else {
288+
assert.NoError(t, err)
293289
}
294290

295291
assert.Equal(t, "", stdout.String())

0 commit comments

Comments
 (0)