Skip to content

Commit

Permalink
Fix typo from master merge conflict
Browse files Browse the repository at this point in the history
  • Loading branch information
parmouraly committed Jun 4, 2020
1 parent ad512f1 commit abd2161
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion server/events/command_runner_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,6 @@ import (
"github.com/google/go-github/v28/github"
. "github.com/petergtz/pegomock"
"github.com/runatlantis/atlantis/server/events"
"github.com/runatlantis/atlantis/server/events/db"
"github.com/runatlantis/atlantis/server/events/mocks"
"github.com/runatlantis/atlantis/server/events/mocks/matchers"
"github.com/runatlantis/atlantis/server/events/models"
Expand Down Expand Up @@ -302,6 +301,7 @@ func TestRunApply_DiscardedProjects(t *testing.T) {
ThenReturn(tmp, nil)
ch.RunCommentCommand(fixtures.GithubRepo, &fixtures.GithubRepo, &pull, fixtures.User, fixtures.Pull.Num, &events.CommentCommand{Name: models.ApplyCommand})
vcsClient.VerifyWasCalled(Never()).MergePull(matchers.AnyModelsPullRequest())
}

func TestRunCommentCommand_DrainOngoing(t *testing.T) {
t.Log("if drain is ongoing then a message should be displayed")
Expand Down

0 comments on commit abd2161

Please sign in to comment.