diff --git a/server/events/apply_command_runner_test.go b/server/events/apply_command_runner_test.go index aa1c5fcb47..ecb7aeb194 100644 --- a/server/events/apply_command_runner_test.go +++ b/server/events/apply_command_runner_test.go @@ -6,7 +6,6 @@ import ( "github.com/google/go-github/v51/github" . "github.com/petergtz/pegomock" - pegomock "github.com/petergtz/pegomock" "github.com/runatlantis/atlantis/server/core/db" "github.com/runatlantis/atlantis/server/core/locking" "github.com/runatlantis/atlantis/server/events" @@ -225,7 +224,7 @@ func TestApplyCommandRunner_ExecutionOrder(t *testing.T) { Description string ProjectContexts []command.ProjectContext ProjectResults []command.ProjectResult - RunnerInvokeMatch []*pegomock.EqMatcher + RunnerInvokeMatch []*EqMatcher ExpComment string }{ { @@ -252,9 +251,9 @@ func TestApplyCommandRunner_ExecutionOrder(t *testing.T) { Error: errors.New("Shabang!"), }, }, - RunnerInvokeMatch: []*pegomock.EqMatcher{ - pegomock.Once(), - pegomock.Once(), + RunnerInvokeMatch: []*EqMatcher{ + Once(), + Once(), }, ExpComment: "Ran Apply for 2 projects:\n\n" + "1. dir: `` workspace: ``\n1. dir: `` workspace: ``\n\n### 1. dir: `` workspace: ``\n```diff\nGreat success!\n```\n\n---\n### " + @@ -284,9 +283,9 @@ func TestApplyCommandRunner_ExecutionOrder(t *testing.T) { ApplySuccess: "Great success!", }, }, - RunnerInvokeMatch: []*pegomock.EqMatcher{ - pegomock.Once(), - pegomock.Never(), + RunnerInvokeMatch: []*EqMatcher{ + Once(), + Never(), }, ExpComment: "Ran Apply for dir: `` workspace: ``\n\n**Apply Error**\n```\nShabang!\n```", }, @@ -329,11 +328,11 @@ func TestApplyCommandRunner_ExecutionOrder(t *testing.T) { ApplySuccess: "Great success!", }, }, - RunnerInvokeMatch: []*pegomock.EqMatcher{ - pegomock.Once(), - pegomock.Once(), - pegomock.Never(), - pegomock.Never(), + RunnerInvokeMatch: []*EqMatcher{ + Once(), + Once(), + Never(), + Never(), }, ExpComment: "Ran Apply for 2 projects:\n\n" + "1. dir: `` workspace: ``\n1. dir: `` workspace: ``\n\n### 1. dir: `` workspace: ``\n```diff\nGreat success!\n```\n\n---\n### " + @@ -378,11 +377,11 @@ func TestApplyCommandRunner_ExecutionOrder(t *testing.T) { ApplySuccess: "Great success!", }, }, - RunnerInvokeMatch: []*pegomock.EqMatcher{ - pegomock.Once(), - pegomock.Once(), - pegomock.Once(), - pegomock.Once(), + RunnerInvokeMatch: []*EqMatcher{ + Once(), + Once(), + Once(), + Once(), }, ExpComment: "Ran Apply for 4 projects:\n\n" + "1. dir: `` workspace: ``\n1. dir: `` workspace: ``\n1. dir: `` workspace: ``\n1. dir: `` workspace: ``\n\n### 1. dir: `` workspace: ``\n```diff\nGreat success!\n```\n\n---\n### " + @@ -412,9 +411,9 @@ func TestApplyCommandRunner_ExecutionOrder(t *testing.T) { ApplySuccess: "Great success!", }, }, - RunnerInvokeMatch: []*pegomock.EqMatcher{ - pegomock.Once(), - pegomock.Once(), + RunnerInvokeMatch: []*EqMatcher{ + Once(), + Once(), }, ExpComment: "Ran Apply for 2 projects:\n\n" + "1. dir: `` workspace: ``\n1. dir: `` workspace: ``\n\n### 1. dir: `` workspace: ``\n**Apply Error**\n```\nShabang!\n```\n\n---\n### " +