From fba4f4d19ee194ab64833a879786015d0ce9befb Mon Sep 17 00:00:00 2001 From: vilmibm Date: Fri, 13 Mar 2020 13:31:52 -0500 Subject: [PATCH] InitCmdStubber --- command/pr_create_test.go | 25 +++++++++---------------- command/testing.go | 6 ++++++ 2 files changed, 15 insertions(+), 16 deletions(-) diff --git a/command/pr_create_test.go b/command/pr_create_test.go index 85091c45a..28ba03a9f 100644 --- a/command/pr_create_test.go +++ b/command/pr_create_test.go @@ -10,7 +10,6 @@ import ( "testing" "github.com/cli/cli/context" - "github.com/cli/cli/utils" "github.com/AlecAivazis/survey/v2" "github.com/AlecAivazis/survey/v2/core" @@ -26,9 +25,8 @@ func TestPRCreate(t *testing.T) { } } } } `)) - cs := CmdStubber{} - teardown := utils.SetPrepareCmd(createStubbedPrepareCmd(&cs)) - defer teardown() + cs, cmdTeardown := InitCmdStubber() + defer cmdTeardown() cs.Stub("") // git status cs.Stub("1234567890,commit 0\n2345678901,commit 1") // git log @@ -65,9 +63,8 @@ func TestPRCreate_web(t *testing.T) { http := initFakeHTTP() http.StubRepoResponse("OWNER", "REPO") - cs := CmdStubber{} - teardown := utils.SetPrepareCmd(createStubbedPrepareCmd(&cs)) - defer teardown() + cs, cmdTeardown := InitCmdStubber() + defer cmdTeardown() cs.Stub("") // git status cs.Stub("1234567890,commit 0\n2345678901,commit 1") // git log @@ -97,9 +94,8 @@ func TestPRCreate_ReportsUncommittedChanges(t *testing.T) { } } } } `)) - cs := CmdStubber{} - teardown := utils.SetPrepareCmd(createStubbedPrepareCmd(&cs)) - defer teardown() + cs, cmdTeardown := InitCmdStubber() + defer cmdTeardown() cs.Stub(" M git/git.go") // git status cs.Stub("1234567890,commit 0\n2345678901,commit 1") // git log @@ -164,9 +160,8 @@ func TestPRCreate_cross_repo_same_branch(t *testing.T) { } } } } `)) - cs := CmdStubber{} - teardown := utils.SetPrepareCmd(createStubbedPrepareCmd(&cs)) - defer teardown() + cs, cmdTeardown := InitCmdStubber() + defer cmdTeardown() cs.Stub("") // git status cs.Stub("1234567890,commit 0\n2345678901,commit 1") // git log @@ -300,9 +295,7 @@ func TestPRCreate_survey_preview_defaults(t *testing.T) { } } } } `)) - // TODO initCmdStubber in command/testing - cs := CmdStubber{} - cmdTeardown := utils.SetPrepareCmd(createStubbedPrepareCmd(&cs)) + cs, cmdTeardown := InitCmdStubber() defer cmdTeardown() cs.Stub("") // git status diff --git a/command/testing.go b/command/testing.go index b8b191c69..83f96cc2a 100644 --- a/command/testing.go +++ b/command/testing.go @@ -21,6 +21,12 @@ type CmdStubber struct { Calls []*exec.Cmd } +func InitCmdStubber() (*CmdStubber, func()) { + cs := CmdStubber{} + teardown := utils.SetPrepareCmd(createStubbedPrepareCmd(&cs)) + return &cs, teardown +} + func (cs *CmdStubber) Stub(desiredOutput string) { // TODO maybe have some kind of command mapping but going simple for now cs.Stubs = append(cs.Stubs, &test.OutputStub{[]byte(desiredOutput)})