Skip to content

Commit 45f4a1f

Browse files
cristiand391cristiand391
committed
Equal: flip arguments position
1 parent 3afb1d0 commit 45f4a1f

File tree

10 files changed

+182
-182
lines changed

10 files changed

+182
-182
lines changed

‎api/client_test.go‎

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

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

3737
req := http.Requests[0]
3838
reqBody, _ := ioutil.ReadAll(req.Body)
39-
assert.Equal(t, string(reqBody), `{"query":"QUERY","variables":{"name":"Mona"}}`)
40-
assert.Equal(t, req.Header.Get("Authorization"), "token OTOKEN")
39+
assert.Equal(t, `{"query":"QUERY","variables":{"name":"Mona"}}`, string(reqBody))
40+
assert.Equal(t, "token OTOKEN", req.Header.Get("Authorization"))
4141
}
4242

4343
func TestGraphQLError(t *testing.T) {
@@ -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, err, nil)
80+
assert.Equal(t, nil, err)
8181
}
8282

8383
func TestRESTError(t *testing.T) {

‎api/pull_request_test.go‎

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

3838
checks := pr.ChecksStatus()
39-
assert.Equal(t, checks.Total, 8)
40-
assert.Equal(t, checks.Pending, 3)
41-
assert.Equal(t, checks.Failing, 3)
42-
assert.Equal(t, checks.Passing, 2)
39+
assert.Equal(t, 8, checks.Total)
40+
assert.Equal(t, 3, checks.Pending)
41+
assert.Equal(t, 3, checks.Failing)
42+
assert.Equal(t, 2, checks.Passing)
4343
}

‎context/remote_test.go‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -18,15 +18,15 @@ func Test_Remotes_FindByName(t *testing.T) {
1818
}
1919

2020
r, err := list.FindByName("upstream", "origin")
21-
assert.Equal(t, err, nil)
22-
assert.Equal(t, r.Name, "upstream")
21+
assert.Equal(t, nil, err)
22+
assert.Equal(t, "upstream", r.Name)
2323

2424
r, err = list.FindByName("nonexistent", "*")
25-
assert.Equal(t, err, nil)
26-
assert.Equal(t, r.Name, "mona")
25+
assert.Equal(t, nil, err)
26+
assert.Equal(t, "mona", r.Name)
2727

2828
_, err = list.FindByName("nonexistent")
29-
assert.Equal(t, err, errors.New(`no GitHub remotes found`))
29+
assert.Equal(t, errors.New(`no GitHub remotes found`), err)
3030
}
3131

3232
func Test_translateRemotes(t *testing.T) {

‎git/remote_test.go‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -16,20 +16,20 @@ func Test_parseRemotes(t *testing.T) {
1616
"zardoz\thttps://example.com/zed.git (push)",
1717
}
1818
r := parseRemotes(remoteList)
19-
assert.Equal(t, len(r), 4)
19+
assert.Equal(t, 4, len(r))
2020

21-
assert.Equal(t, r[0].Name, "mona")
22-
assert.Equal(t, r[0].FetchURL.String(), "ssh://git@github.com/monalisa/myfork.git")
21+
assert.Equal(t, "mona", r[0].Name)
22+
assert.Equal(t, "ssh://git@github.com/monalisa/myfork.git", r[0].FetchURL.String())
2323
if r[0].PushURL != nil {
2424
t.Errorf("expected no PushURL, got %q", r[0].PushURL)
2525
}
26-
assert.Equal(t, r[1].Name, "origin")
27-
assert.Equal(t, r[1].FetchURL.Path, "/monalisa/octo-cat.git")
28-
assert.Equal(t, r[1].PushURL.Path, "/monalisa/octo-cat-push.git")
26+
assert.Equal(t, "origin", r[1].Name)
27+
assert.Equal(t, "/monalisa/octo-cat.git", r[1].FetchURL.Path)
28+
assert.Equal(t, "/monalisa/octo-cat-push.git", r[1].PushURL.Path)
2929

30-
assert.Equal(t, r[2].Name, "upstream")
31-
assert.Equal(t, r[2].FetchURL.Host, "example.com")
32-
assert.Equal(t, r[2].PushURL.Host, "github.com")
30+
assert.Equal(t, "upstream", r[2].Name)
31+
assert.Equal(t, "example.com", r[2].FetchURL.Host)
32+
assert.Equal(t, "github.com", r[2].PushURL.Host)
3333

34-
assert.Equal(t, r[3].Name, "zardoz")
34+
assert.Equal(t, "zardoz", r[3].Name)
3535
}

‎internal/config/config_file_test.go‎

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

2929
func Test_parseConfig_multipleHosts(t *testing.T) {
@@ -37,13 +37,13 @@ hosts:
3737
oauth_token: OTOKEN
3838
`, "")()
3939
config, err := ParseConfig("config.yml")
40-
assert.Equal(t, err, nil)
40+
assert.Equal(t, nil, err)
4141
user, err := config.Get("github.com", "user")
42-
assert.Equal(t, err, nil)
43-
assert.Equal(t, user, "monalisa")
42+
assert.Equal(t, nil, err)
43+
assert.Equal(t, "monalisa", user)
4444
token, err := config.Get("github.com", "oauth_token")
45-
assert.Equal(t, err, nil)
46-
assert.Equal(t, token, "OTOKEN")
45+
assert.Equal(t, nil, err)
46+
assert.Equal(t, "OTOKEN", token)
4747
}
4848

4949
func Test_parseConfig_hostsFile(t *testing.T) {
@@ -53,13 +53,13 @@ github.com:
5353
oauth_token: OTOKEN
5454
`)()
5555
config, err := ParseConfig("config.yml")
56-
assert.Equal(t, err, nil)
56+
assert.Equal(t, nil, err)
5757
user, err := config.Get("github.com", "user")
58-
assert.Equal(t, err, nil)
59-
assert.Equal(t, user, "monalisa")
58+
assert.Equal(t, nil, err)
59+
assert.Equal(t, "monalisa", user)
6060
token, err := config.Get("github.com", "oauth_token")
61-
assert.Equal(t, err, nil)
62-
assert.Equal(t, token, "OTOKEN")
61+
assert.Equal(t, nil, err)
62+
assert.Equal(t, "OTOKEN", token)
6363
}
6464

6565
func Test_parseConfig_hostFallback(t *testing.T) {
@@ -75,16 +75,16 @@ example.com:
7575
git_protocol: https
7676
`)()
7777
config, err := ParseConfig("config.yml")
78-
assert.Equal(t, err, nil)
78+
assert.Equal(t, nil, err)
7979
val, err := config.Get("example.com", "git_protocol")
80-
assert.Equal(t, err, nil)
81-
assert.Equal(t, val, "https")
80+
assert.Equal(t, nil, err)
81+
assert.Equal(t, "https", val)
8282
val, err = config.Get("github.com", "git_protocol")
83-
assert.Equal(t, err, nil)
84-
assert.Equal(t, val, "ssh")
83+
assert.Equal(t, nil, err)
84+
assert.Equal(t, "ssh", val)
8585
val, err = config.Get("nonexistent.io", "git_protocol")
86-
assert.Equal(t, err, nil)
87-
assert.Equal(t, val, "ssh")
86+
assert.Equal(t, nil, err)
87+
assert.Equal(t, "ssh", val)
8888
}
8989

9090
func Test_ParseConfig_migrateConfig(t *testing.T) {

‎pkg/cmd/issue/create/create_test.go‎

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -112,7 +112,7 @@ func TestIssueCreate(t *testing.T) {
112112
t.Errorf("error running command `issue create`: %v", err)
113113
}
114114

115-
assert.Equal(t, output.String(), "https://github.com/OWNER/REPO/issues/12\n")
115+
assert.Equal(t, "https://github.com/OWNER/REPO/issues/12\n", output.String())
116116
}
117117

118118
func TestIssueCreate_recover(t *testing.T) {
@@ -144,9 +144,9 @@ func TestIssueCreate_recover(t *testing.T) {
144144
"URL": "https://github.com/OWNER/REPO/issues/12"
145145
} } } }
146146
`, func(inputs map[string]interface{}) {
147-
assert.Equal(t, inputs["title"], "recovered title")
148-
assert.Equal(t, inputs["body"], "recovered body")
149-
assert.Equal(t, inputs["labelIds"], []interface{}{"BUGID", "TODOID"})
147+
assert.Equal(t, "recovered title", inputs["title"])
148+
assert.Equal(t, "recovered body", inputs["body"])
149+
assert.Equal(t, []interface{}{"BUGID", "TODOID"}, inputs["labelIds"])
150150
}))
151151

152152
as, teardown := prompt.InitAskStubber()
@@ -193,7 +193,7 @@ func TestIssueCreate_recover(t *testing.T) {
193193
t.Errorf("error running command `issue create`: %v", err)
194194
}
195195

196-
assert.Equal(t, output.String(), "https://github.com/OWNER/REPO/issues/12\n")
196+
assert.Equal(t, "https://github.com/OWNER/REPO/issues/12\n", output.String())
197197
}
198198

199199
func TestIssueCreate_nonLegacyTemplate(t *testing.T) {
@@ -251,7 +251,7 @@ func TestIssueCreate_nonLegacyTemplate(t *testing.T) {
251251
t.Errorf("error running command `issue create`: %v", err)
252252
}
253253

254-
assert.Equal(t, output.String(), "https://github.com/OWNER/REPO/issues/12\n")
254+
assert.Equal(t, "https://github.com/OWNER/REPO/issues/12\n", output.String())
255255
}
256256

257257
func TestIssueCreate_continueInBrowser(t *testing.T) {
@@ -368,12 +368,12 @@ func TestIssueCreate_metadata(t *testing.T) {
368368
"URL": "https://github.com/OWNER/REPO/issues/12"
369369
} } } }
370370
`, func(inputs map[string]interface{}) {
371-
assert.Equal(t, inputs["title"], "TITLE")
372-
assert.Equal(t, inputs["body"], "BODY")
373-
assert.Equal(t, inputs["assigneeIds"], []interface{}{"MONAID"})
374-
assert.Equal(t, inputs["labelIds"], []interface{}{"BUGID", "TODOID"})
375-
assert.Equal(t, inputs["projectIds"], []interface{}{"ROADMAPID"})
376-
assert.Equal(t, inputs["milestoneId"], "BIGONEID")
371+
assert.Equal(t, "TITLE", inputs["title"])
372+
assert.Equal(t, "BODY", inputs["body"])
373+
assert.Equal(t, []interface{}{"MONAID"}, inputs["assigneeIds"])
374+
assert.Equal(t, []interface{}{"BUGID", "TODOID"}, inputs["labelIds"])
375+
assert.Equal(t, []interface{}{"ROADMAPID"}, inputs["projectIds"])
376+
assert.Equal(t, "BIGONEID", inputs["milestoneId"])
377377
if v, ok := inputs["userIds"]; ok {
378378
t.Errorf("did not expect userIds: %v", v)
379379
}
@@ -387,7 +387,7 @@ func TestIssueCreate_metadata(t *testing.T) {
387387
t.Errorf("error running command `issue create`: %v", err)
388388
}
389389

390-
assert.Equal(t, output.String(), "https://github.com/OWNER/REPO/issues/12\n")
390+
assert.Equal(t, "https://github.com/OWNER/REPO/issues/12\n", output.String())
391391
}
392392

393393
func TestIssueCreate_disabledIssues(t *testing.T) {
@@ -429,9 +429,9 @@ func TestIssueCreate_web(t *testing.T) {
429429
t.Fatal("expected a command to run")
430430
}
431431
url := seenCmd.Args[len(seenCmd.Args)-1]
432-
assert.Equal(t, url, "https://github.com/OWNER/REPO/issues/new")
433-
assert.Equal(t, output.String(), "")
434-
assert.Equal(t, output.Stderr(), "Opening github.com/OWNER/REPO/issues/new in your browser.\n")
432+
assert.Equal(t, "https://github.com/OWNER/REPO/issues/new", url)
433+
assert.Equal(t, "", output.String())
434+
assert.Equal(t, "Opening github.com/OWNER/REPO/issues/new in your browser.\n", output.Stderr())
435435
}
436436

437437
func TestIssueCreate_webTitleBody(t *testing.T) {
@@ -454,7 +454,7 @@ func TestIssueCreate_webTitleBody(t *testing.T) {
454454
t.Fatal("expected a command to run")
455455
}
456456
url := strings.ReplaceAll(seenCmd.Args[len(seenCmd.Args)-1], "^", "")
457-
assert.Equal(t, url, "https://github.com/OWNER/REPO/issues/new?body=mybody&title=mytitle")
458-
assert.Equal(t, output.String(), "")
459-
assert.Equal(t, output.Stderr(), "Opening github.com/OWNER/REPO/issues/new in your browser.\n")
457+
assert.Equal(t, "https://github.com/OWNER/REPO/issues/new?body=mybody&title=mytitle", url)
458+
assert.Equal(t, "", output.String())
459+
assert.Equal(t, "Opening github.com/OWNER/REPO/issues/new in your browser.\n", output.Stderr())
460460
}

‎pkg/cmd/issue/list/list_test.go‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ func TestIssueList_nontty(t *testing.T) {
7171
t.Errorf("error running command `issue list`: %v", err)
7272
}
7373

74-
assert.Equal(t, output.Stderr(), "")
74+
assert.Equal(t, "", output.Stderr())
7575
test.ExpectLines(t, output.String(),
7676
`1[\t]+number won[\t]+label[\t]+\d+`,
7777
`2[\t]+number too[\t]+label[\t]+\d+`,
@@ -139,11 +139,11 @@ func TestIssueList_tty_withFlags(t *testing.T) {
139139
t.Errorf("error running command `issue list`: %v", err)
140140
}
141141

142-
assert.Equal(t, output.Stderr(), "")
143-
assert.Equal(t, output.String(), `
142+
assert.Equal(t, "", output.Stderr())
143+
assert.Equal(t, `
144144
No issues match your search in OWNER/REPO
145145
146-
`)
146+
`, output.String())
147147
}
148148

149149
func TestIssueList_withInvalidLimitFlag(t *testing.T) {
@@ -183,8 +183,8 @@ func TestIssueList_nullAssigneeLabels(t *testing.T) {
183183

184184
_, assigneeDeclared := reqBody.Variables["assignee"]
185185
_, labelsDeclared := reqBody.Variables["labels"]
186-
assert.Equal(t, assigneeDeclared, false)
187-
assert.Equal(t, labelsDeclared, false)
186+
assert.Equal(t, false, assigneeDeclared)
187+
assert.Equal(t, false, labelsDeclared)
188188
}
189189

190190
func TestIssueList_disabledIssues(t *testing.T) {
@@ -223,14 +223,14 @@ func TestIssueList_web(t *testing.T) {
223223

224224
expectedURL := "https://github.com/OWNER/REPO/issues?q=is%3Aissue+assignee%3Apeter+label%3Abug+label%3Adocs+author%3Ajohn+mentions%3Afrank+milestone%3Av1.1"
225225

226-
assert.Equal(t, output.String(), "")
227-
assert.Equal(t, output.Stderr(), "Opening github.com/OWNER/REPO/issues in your browser.\n")
226+
assert.Equal(t, "", output.String())
227+
assert.Equal(t, "Opening github.com/OWNER/REPO/issues in your browser.\n", output.Stderr())
228228

229229
if seenCmd == nil {
230230
t.Fatal("expected a command to run")
231231
}
232232
url := seenCmd.Args[len(seenCmd.Args)-1]
233-
assert.Equal(t, url, expectedURL)
233+
assert.Equal(t, expectedURL, url)
234234
}
235235

236236
func TestIssueList_milestoneNotFound(t *testing.T) {

0 commit comments

Comments
 (0)