Skip to content

Commit bf4bc15

Browse files
mislavmislav
committed
Migrate to new cmd stubber in merge tests
1 parent e566c61 commit bf4bc15

File tree

1 file changed

+38
-75
lines changed

1 file changed

+38
-75
lines changed

‎pkg/cmd/pr/merge/merge_test.go‎

Lines changed: 38 additions & 75 deletions
Original file line numberDiff line numberDiff line change
@@ -208,14 +208,8 @@ func TestPrMerge(t *testing.T) {
208208
assert.NotContains(t, input, "commitHeadline")
209209
}))
210210

211-
cs, cmdTeardown := test.InitCmdStubber()
212-
defer cmdTeardown()
213-
214-
cs.Stub("branch.blueberries.remote origin\nbranch.blueberries.merge refs/heads/blueberries") // git config --get-regexp ^branch\.master\.(remote|merge)
215-
cs.Stub("") // git config --get-regexp ^branch\.blueberries\.(remote|merge)$
216-
cs.Stub("") // git symbolic-ref --quiet --short HEAD
217-
cs.Stub("") // git checkout master
218-
cs.Stub("")
211+
_, cmdTeardown := run.Stub()
212+
defer cmdTeardown(t)
219213

220214
output, err := runCommand(http, "master", true, "pr merge 1 --merge")
221215
if err != nil {
@@ -251,14 +245,8 @@ func TestPrMerge_nontty(t *testing.T) {
251245
assert.NotContains(t, input, "commitHeadline")
252246
}))
253247

254-
cs, cmdTeardown := test.InitCmdStubber()
255-
defer cmdTeardown()
256-
257-
cs.Stub("branch.blueberries.remote origin\nbranch.blueberries.merge refs/heads/blueberries") // git config --get-regexp ^branch\.master\.(remote|merge)
258-
cs.Stub("") // git config --get-regexp ^branch\.blueberries\.(remote|merge)$
259-
cs.Stub("") // git symbolic-ref --quiet --short HEAD
260-
cs.Stub("") // git checkout master
261-
cs.Stub("")
248+
_, cmdTeardown := run.Stub()
249+
defer cmdTeardown(t)
262250

263251
output, err := runCommand(http, "master", false, "pr merge 1 --merge")
264252
if err != nil {
@@ -291,16 +279,14 @@ func TestPrMerge_withRepoFlag(t *testing.T) {
291279
assert.NotContains(t, input, "commitHeadline")
292280
}))
293281

294-
cs, cmdTeardown := test.InitCmdStubber()
295-
defer cmdTeardown()
282+
_, cmdTeardown := run.Stub()
283+
defer cmdTeardown(t)
296284

297285
output, err := runCommand(http, "master", true, "pr merge 1 --merge -R OWNER/REPO")
298286
if err != nil {
299287
t.Fatalf("error running command `pr merge`: %v", err)
300288
}
301289

302-
assert.Equal(t, 0, len(cs.Calls))
303-
304290
r := regexp.MustCompile(`Merged pull request #1 \(The title of the PR\)`)
305291

306292
if !r.MatchString(output.Stderr()) {
@@ -326,14 +312,13 @@ func TestPrMerge_deleteBranch(t *testing.T) {
326312
httpmock.REST("DELETE", "repos/OWNER/REPO/git/refs/heads/blueberries"),
327313
httpmock.StringResponse(`{}`))
328314

329-
cs, cmdTeardown := test.InitCmdStubber()
330-
defer cmdTeardown()
315+
cs, cmdTeardown := run.Stub()
316+
defer cmdTeardown(t)
331317

332-
cs.Stub("") // git config --get-regexp ^branch\.blueberries\.(remote|merge)$
333-
cs.Stub("") // git checkout master
334-
cs.Stub("") // git rev-parse --verify blueberries`
335-
cs.Stub("") // git branch -d
336-
cs.Stub("") // git push origin --delete blueberries
318+
cs.Register(`git config --get-regexp.+branch\\\.blueberries\\\.`, 0, "")
319+
cs.Register(`git checkout master`, 0, "")
320+
cs.Register(`git rev-parse --verify refs/heads/blueberries`, 0, "")
321+
cs.Register(`git branch -D blueberries`, 0, "")
337322

338323
output, err := runCommand(http, "blueberries", true, `pr merge --merge --delete-branch`)
339324
if err != nil {
@@ -361,13 +346,11 @@ func TestPrMerge_deleteNonCurrentBranch(t *testing.T) {
361346
httpmock.REST("DELETE", "repos/OWNER/REPO/git/refs/heads/blueberries"),
362347
httpmock.StringResponse(`{}`))
363348

364-
cs, cmdTeardown := test.InitCmdStubber()
365-
defer cmdTeardown()
349+
cs, cmdTeardown := run.Stub()
350+
defer cmdTeardown(t)
366351

367-
// We don't expect the default branch to be checked out, just that blueberries is deleted
368-
cs.Stub("") // git rev-parse --verify blueberries
369-
cs.Stub("") // git branch -d blueberries
370-
cs.Stub("") // git push origin --delete blueberries
352+
cs.Register(`git rev-parse --verify refs/heads/blueberries`, 0, "")
353+
cs.Register(`git branch -D blueberries`, 0, "")
371354

372355
output, err := runCommand(http, "master", true, `pr merge --merge --delete-branch blueberries`)
373356
if err != nil {
@@ -392,14 +375,10 @@ func TestPrMerge_noPrNumberGiven(t *testing.T) {
392375
assert.NotContains(t, input, "commitHeadline")
393376
}))
394377

395-
cs, cmdTeardown := test.InitCmdStubber()
396-
defer cmdTeardown()
378+
cs, cmdTeardown := run.Stub()
379+
defer cmdTeardown(t)
397380

398-
cs.Stub("branch.blueberries.remote origin\nbranch.blueberries.merge refs/heads/blueberries") // git config --get-regexp ^branch\.master\.(remote|merge)
399-
cs.Stub("") // git config --get-regexp ^branch\.blueberries\.(remote|merge)$
400-
cs.Stub("") // git symbolic-ref --quiet --short HEAD
401-
cs.Stub("") // git checkout master
402-
cs.Stub("") // git branch -d
381+
cs.Register(`git config --get-regexp.+branch\\\.blueberries\\\.`, 0, "")
403382

404383
output, err := runCommand(http, "blueberries", true, "pr merge --merge")
405384
if err != nil {
@@ -435,13 +414,8 @@ func TestPrMerge_rebase(t *testing.T) {
435414
assert.NotContains(t, input, "commitHeadline")
436415
}))
437416

438-
cs, cmdTeardown := test.InitCmdStubber()
439-
defer cmdTeardown()
440-
441-
cs.Stub("") // git config --get-regexp ^branch\.blueberries\.(remote|merge)$
442-
cs.Stub("") // git symbolic-ref --quiet --short HEAD
443-
cs.Stub("") // git checkout master
444-
cs.Stub("") // git branch -d
417+
_, cmdTeardown := run.Stub()
418+
defer cmdTeardown(t)
445419

446420
output, err := runCommand(http, "master", true, "pr merge 2 --rebase")
447421
if err != nil {
@@ -477,13 +451,8 @@ func TestPrMerge_squash(t *testing.T) {
477451
assert.Equal(t, "The title of the PR (#3)", input["commitHeadline"].(string))
478452
}))
479453

480-
cs, cmdTeardown := test.InitCmdStubber()
481-
defer cmdTeardown()
482-
483-
cs.Stub("") // git config --get-regexp ^branch\.blueberries\.(remote|merge)$
484-
cs.Stub("") // git symbolic-ref --quiet --short HEAD
485-
cs.Stub("") // git checkout master
486-
cs.Stub("") // git branch -d
454+
_, cmdTeardown := run.Stub()
455+
defer cmdTeardown(t)
487456

488457
output, err := runCommand(http, "master", true, "pr merge 3 --squash")
489458
if err != nil {
@@ -577,14 +546,13 @@ func TestPRMerge_interactive(t *testing.T) {
577546
httpmock.REST("DELETE", "repos/OWNER/REPO/git/refs/heads/blueberries"),
578547
httpmock.StringResponse(`{}`))
579548

580-
cs, cmdTeardown := test.InitCmdStubber()
581-
defer cmdTeardown()
549+
cs, cmdTeardown := run.Stub()
550+
defer cmdTeardown(t)
582551

583-
cs.Stub("") // git config --get-regexp ^branch\.blueberries\.(remote|merge)$
584-
cs.Stub("") // git symbolic-ref --quiet --short HEAD
585-
cs.Stub("") // git checkout master
586-
cs.Stub("") // git push origin --delete blueberries
587-
cs.Stub("") // git branch -d
552+
cs.Register(`git config --get-regexp.+branch\\\.blueberries\\\.`, 0, "")
553+
cs.Register(`git checkout master`, 0, "")
554+
cs.Register(`git rev-parse --verify refs/heads/blueberries`, 0, "")
555+
cs.Register(`git branch -D blueberries`, 0, "")
588556

589557
as, surveyTeardown := prompt.InitAskStubber()
590558
defer surveyTeardown()
@@ -635,14 +603,13 @@ func TestPRMerge_interactiveWithDeleteBranch(t *testing.T) {
635603
httpmock.REST("DELETE", "repos/OWNER/REPO/git/refs/heads/blueberries"),
636604
httpmock.StringResponse(`{}`))
637605

638-
cs, cmdTeardown := test.InitCmdStubber()
639-
defer cmdTeardown()
606+
cs, cmdTeardown := run.Stub()
607+
defer cmdTeardown(t)
640608

641-
cs.Stub("") // git config --get-regexp ^branch\.blueberries\.(remote|merge)$
642-
cs.Stub("") // git symbolic-ref --quiet --short HEAD
643-
cs.Stub("") // git checkout master
644-
cs.Stub("") // git push origin --delete blueberries
645-
cs.Stub("") // git branch -d
609+
cs.Register(`git config --get-regexp.+branch\\\.blueberries\\\.`, 0, "")
610+
cs.Register(`git checkout master`, 0, "")
611+
cs.Register(`git rev-parse --verify refs/heads/blueberries`, 0, "")
612+
cs.Register(`git branch -D blueberries`, 0, "")
646613

647614
as, surveyTeardown := prompt.InitAskStubber()
648615
defer surveyTeardown()
@@ -679,14 +646,10 @@ func TestPRMerge_interactiveCancelled(t *testing.T) {
679646
"number": 3
680647
}] } } } }`))
681648

682-
cs, cmdTeardown := test.InitCmdStubber()
683-
defer cmdTeardown()
649+
cs, cmdTeardown := run.Stub()
650+
defer cmdTeardown(t)
684651

685-
cs.Stub("") // git config --get-regexp ^branch\.blueberries\.(remote|merge)$
686-
cs.Stub("") // git symbolic-ref --quiet --short HEAD
687-
cs.Stub("") // git checkout master
688-
cs.Stub("") // git push origin --delete blueberries
689-
cs.Stub("") // git branch -d
652+
cs.Register(`git config --get-regexp.+branch\\\.blueberries\\\.`, 0, "")
690653

691654
as, surveyTeardown := prompt.InitAskStubber()
692655
defer surveyTeardown()

0 commit comments

Comments
 (0)