Merge pull request #502 from innogames/mock_cleanup

test: cleanup mocks to find unwanted asserts
innogames · Nov 20, 2023 · 3bb5733 · 3bb5733
2 parents 4f4424f + c1e6761
commit 3bb5733
Show file tree

Hide file tree

Showing 39 changed files with 44 additions and 54 deletions.
diff --git a/bot/matcher/admin_test.go b/bot/matcher/admin_test.go
@@ -11,7 +11,7 @@ import (
 
 func TestAdmin(t *testing.T) {
 	t.Run("Test no Admin", func(t *testing.T) {
-		slackClient := &mocks.SlackClient{}
+		slackClient := mocks.NewSlackClient(t)
 
 		cfg := config.Config{}
 		cfg.AdminUsers = []string{

diff --git a/bot/matcher/group_test.go b/bot/matcher/group_test.go
@@ -22,7 +22,7 @@ func TestGroup(t *testing.T) {
 		NewRegexpMatcher(`add reaction :(?P<reaction>.*):`, testRunner),
 		NewAdminMatcher(
 			cfg.AdminUsers,
-			&mocks.SlackClient{},
+			mocks.NewSlackClient(t),
 			NewRegexpMatcher(`remove reaction :(?P<reaction>.*):`, testRunner),
 		),
 	)
@@ -62,7 +62,7 @@ func BenchmarkMatchChained(b *testing.B) {
 		NewPrefixMatcher(`prefix`, testRunner),
 		NewAdminMatcher(
 			config.UserList{},
-			&mocks.SlackClient{},
+			mocks.NewSlackClient(b),
 			NewTextMatcher(`text`, testRunner),
 		),
 		NewVoidMatcher(),

diff --git a/command/add_button_test.go b/command/add_button_test.go
@@ -10,7 +10,7 @@ import (
 )
 
 func TestAddButton(t *testing.T) {
-	slackClient := &mocks.SlackClient{}
+	slackClient := mocks.NewSlackClient(t)
 
 	base := bot.BaseCommand{SlackClient: slackClient}
 

diff --git a/command/add_link_test.go b/command/add_link_test.go
@@ -10,7 +10,7 @@ import (
 )
 
 func TestAddLink(t *testing.T) {
-	slackClient := &mocks.SlackClient{}
+	slackClient := mocks.NewSlackClient(t)
 	base := bot.BaseCommand{SlackClient: slackClient}
 
 	command := bot.Commands{}

diff --git a/command/admin/bot_log_test.go b/command/admin/bot_log_test.go
@@ -15,7 +15,7 @@ import (
 func TestBotLog(t *testing.T) {
 	testFile := "test.log"
 
-	slackClient := &mocks.SlackClient{}
+	slackClient := mocks.NewSlackClient(t)
 	base := bot.BaseCommand{SlackClient: slackClient}
 
 	client.AllUsers = config.UserMap{

diff --git a/command/admin/ping_test.go b/command/admin/ping_test.go
@@ -12,7 +12,7 @@ import (
 )
 
 func TestPing(t *testing.T) {
-	slackClient := &mocks.SlackClient{}
+	slackClient := mocks.NewSlackClient(t)
 	base := bot.BaseCommand{SlackClient: slackClient}
 
 	botLog := newPingCommand(base)

diff --git a/command/admin/stats_test.go b/command/admin/stats_test.go
@@ -12,7 +12,7 @@ import (
 )
 
 func TestStatsLog(t *testing.T) {
-	slackClient := &mocks.SlackClient{}
+	slackClient := mocks.NewSlackClient(t)
 	base := bot.BaseCommand{SlackClient: slackClient}
 
 	cfg := &config.Config{}

diff --git a/command/clouds/aws/aws_test.go b/command/clouds/aws/aws_test.go
@@ -11,7 +11,7 @@ import (
 )
 
 func TestGetCommands(t *testing.T) {
-	slackClient := &mocks.SlackClient{}
+	slackClient := mocks.NewSlackClient(t)
 	base := bot.BaseCommand{SlackClient: slackClient}
 
 	t.Run("AWS is not active", func(t *testing.T) {

diff --git a/command/cron/cron_test.go b/command/cron/cron_test.go
@@ -15,7 +15,7 @@ import (
 )
 
 func TestCron(t *testing.T) {
-	slackClient := &mocks.SlackClient{}
+	slackClient := mocks.NewSlackClient(t)
 	base := bot.BaseCommand{SlackClient: slackClient}
 
 	crons := []config.Cron{

diff --git a/command/custom_commmands/integration_test.go b/command/custom_commmands/integration_test.go
@@ -12,7 +12,7 @@ import (
 )
 
 func TestCustomCommands(t *testing.T) {
-	slackClient := &mocks.SlackClient{}
+	slackClient := mocks.NewSlackClient(t)
 	base := bot.BaseCommand{SlackClient: slackClient}
 
 	lock := mocks.LockInternalMessages()

diff --git a/command/custom_variables/integration_test.go b/command/custom_variables/integration_test.go
@@ -12,7 +12,7 @@ import (
 )
 
 func TestCustomCommands(t *testing.T) {
-	slackClient := &mocks.SlackClient{}
+	slackClient := mocks.NewSlackClient(t)
 	base := bot.BaseCommand{SlackClient: slackClient}
 
 	cfg := &config.Config{}

diff --git a/command/defined_commands_test.go b/command/defined_commands_test.go
@@ -12,7 +12,7 @@ import (
 )
 
 func TestInvalidMacro(t *testing.T) {
-	slackClient := &mocks.SlackClient{}
+	slackClient := mocks.NewSlackClient(t)
 	base := bot.BaseCommand{SlackClient: slackClient}
 
 	client.InternalMessages = make(chan msg.Message, 2)
@@ -55,7 +55,7 @@ func TestInvalidMacro(t *testing.T) {
 }
 
 func TestDefinedCommands(t *testing.T) {
-	slackClient := &mocks.SlackClient{}
+	slackClient := mocks.NewSlackClient(t)
 	base := bot.BaseCommand{SlackClient: slackClient}
 
 	lock := mocks.LockInternalMessages()

diff --git a/command/delay_test.go b/command/delay_test.go
@@ -15,7 +15,7 @@ import (
 
 func TestDelay(t *testing.T) {
 	client.InternalMessages = make(chan msg.Message, 2)
-	slackClient := &mocks.SlackClient{}
+	slackClient := mocks.NewSlackClient(t)
 
 	base := bot.BaseCommand{SlackClient: slackClient}
 

diff --git a/command/games/number_guesser_test.go b/command/games/number_guesser_test.go
@@ -11,7 +11,7 @@ import (
 )
 
 func TestNumberGuesser(t *testing.T) {
-	slackClient := &mocks.SlackClient{}
+	slackClient := mocks.NewSlackClient(t)
 	base := bot.BaseCommand{SlackClient: slackClient}
 
 	command := NewNumberGuesserCommand(base)

diff --git a/command/games/quiz_test.go b/command/games/quiz_test.go
@@ -13,7 +13,7 @@ import (
 )
 
 func TestQuiz(t *testing.T) {
-	slackClient := &mocks.SlackClient{}
+	slackClient := mocks.NewSlackClient(t)
 	base := bot.BaseCommand{SlackClient: slackClient}
 
 	ts := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {

diff --git a/command/help_test.go b/command/help_test.go
@@ -14,7 +14,7 @@ import (
 func TestHelp(t *testing.T) {
 	cfg := config.Config{}
 	cfg.Jenkins.Host = "bitbucket.example.com"
-	slackClient := &mocks.SlackClient{}
+	slackClient := mocks.NewSlackClient(t)
 
 	base := bot.BaseCommand{SlackClient: slackClient}
 

diff --git a/command/jenkins/client/start_build_test.go b/command/jenkins/client/start_build_test.go
@@ -18,7 +18,7 @@ import (
 )
 
 func TestStartBuild(t *testing.T) {
-	slackClient := &mocks.SlackClient{}
+	slackClient := mocks.NewSlackClient(t)
 	cfg := config.JobConfig{}
 	message := msg.Message{}
 
@@ -143,7 +143,7 @@ func TestGetAttachment(t *testing.T) {
 }
 
 func TestSendBuildStartedMessage(t *testing.T) {
-	slackClient := &mocks.SlackClient{}
+	slackClient := mocks.NewSlackClient(t)
 	ref := msg.MessageRef{}
 
 	job := &gojenkins.Job{

diff --git a/command/jenkins/commands_test.go b/command/jenkins/commands_test.go
@@ -20,7 +20,7 @@ func getTestJenkinsCommand() (*mocks.SlackClient, *mocks.Client, jenkinsCommand)
 }
 
 func TestGetCommands(t *testing.T) {
-	slackClient := &mocks.SlackClient{}
+	slackClient := mocks.NewSlackClient(t)
 	base := bot.BaseCommand{SlackClient: slackClient}
 
 	t.Run("Jenkins is not active", func(t *testing.T) {

diff --git a/command/jira/commands_test.go b/command/jira/commands_test.go
@@ -9,7 +9,7 @@ import (
 )
 
 func TestCommands(t *testing.T) {
-	slackClient := &mocks.SlackClient{}
+	slackClient := mocks.NewSlackClient(t)
 
 	cfg := &config.Jira{
 		Host:    "https://issues.apache.org/jira/",

diff --git a/command/jira/comment_test.go b/command/jira/comment_test.go
@@ -13,7 +13,7 @@ import (
 )
 
 func TestCommentJira(t *testing.T) {
-	slackClient := &mocks.SlackClient{}
+	slackClient := mocks.NewSlackClient(t)
 
 	mux := http.NewServeMux()
 	server := httptest.NewServer(mux)

diff --git a/command/jira/search_test.go b/command/jira/search_test.go
@@ -14,7 +14,7 @@ import (
 )
 
 func TestJiraSearch(t *testing.T) {
-	slackClient := &mocks.SlackClient{}
+	slackClient := mocks.NewSlackClient(t)
 
 	cfg := &config.Jira{
 		Host:    "https://issues.apache.org/jira/",

diff --git a/command/jira/watch_test.go b/command/jira/watch_test.go
@@ -11,7 +11,7 @@ import (
 )
 
 func TestWatchJira(t *testing.T) {
-	slackClient := &mocks.SlackClient{}
+	slackClient := mocks.NewSlackClient(t)
 
 	// todo fake http client
 	cfg := &config.Jira{

diff --git a/command/openai/dalle_test.go b/command/openai/dalle_test.go
@@ -19,7 +19,7 @@ func TestDalle(t *testing.T) {
 	// init memory based storage
 	storage.InitStorage("")
 
-	slackClient := &mocks.SlackClient{}
+	slackClient := mocks.NewSlackClient(t)
 	base := bot.BaseCommand{SlackClient: slackClient}
 
 	t.Run("test http error", func(t *testing.T) {

diff --git a/command/openai/openai_test.go b/command/openai/openai_test.go
@@ -61,7 +61,7 @@ func TestOpenai(t *testing.T) {
 	// init memory based storage
 	storage.InitStorage("")
 
-	slackClient := &mocks.SlackClient{}
+	slackClient := mocks.NewSlackClient(t)
 	base := bot.BaseCommand{SlackClient: slackClient}
 
 	t.Run("Openai is not active", func(t *testing.T) {
@@ -157,7 +157,6 @@ data: [DONE]`,
 		mocks.AssertReaction(slackClient, ":coffee:", message)
 		mocks.AssertRemoveReaction(slackClient, ":coffee:", message)
 		mocks.AssertSlackMessage(slackClient, message, "...", mock.Anything)
-		mocks.AssertSlackMessage(slackClient, message, "The answer is 3", mock.Anything)
 
 		actual = commands.Run(message)
 		queue.WaitTillHavingNoQueuedMessage()

diff --git a/command/pool/commands_test.go b/command/pool/commands_test.go
@@ -15,7 +15,7 @@ import (
 var _ bot.Runnable = &poolCommands{}
 
 func TestPools(t *testing.T) {
-	slackClient := &mocks.SlackClient{}
+	slackClient := mocks.NewSlackClient(t)
 	base := bot.BaseCommand{SlackClient: slackClient}
 
 	t.Run("Pools are not active", func(t *testing.T) {

diff --git a/command/pullrequest/bitbucket_test.go b/command/pullrequest/bitbucket_test.go
@@ -18,7 +18,7 @@ import (
 )
 
 func TestBitbucketNotActive(t *testing.T) {
-	slackClient := &mocks.SlackClient{}
+	slackClient := mocks.NewSlackClient(t)
 	base := bot.BaseCommand{SlackClient: slackClient}
 
 	cfg := &config.DefaultConfig
@@ -42,7 +42,7 @@ func TestBitbucketNotActive(t *testing.T) {
 }
 
 func TestBitbucketFakeServer(t *testing.T) {
-	slackClient := &mocks.SlackClient{}
+	slackClient := mocks.NewSlackClient(t)
 	base := bot.BaseCommand{SlackClient: slackClient}
 
 	server := spawnBitbucketTestServer()
@@ -65,8 +65,6 @@ func TestBitbucketFakeServer(t *testing.T) {
 		message.Text = server.URL + "/projects/myProject/repos/myRepo/pull-requests/1339 please review ASAP!"
 
 		slackClient.On("GetReactions", message.GetMessageRef(), slack.NewGetReactionsParameters()).Return([]slack.ItemReaction{}, nil)
-		mocks.AssertReaction(slackClient, "white_check_mark", message)
-		mocks.AssertReaction(slackClient, "twisted_rightwards_arrows", message)
 
 		actual := command.Run(message)
 		assert.True(t, actual)

diff --git a/command/pullrequest/github_test.go b/command/pullrequest/github_test.go
@@ -18,7 +18,7 @@ import (
 )
 
 func TestGithub(t *testing.T) {
-	slackClient := &mocks.SlackClient{}
+	slackClient := mocks.NewSlackClient(t)
 	base := bot.BaseCommand{SlackClient: slackClient}
 
 	cfg := &config.DefaultConfig

diff --git a/command/pullrequest/gitlab_test.go b/command/pullrequest/gitlab_test.go
@@ -14,7 +14,7 @@ import (
 )
 
 func TestGitlab(t *testing.T) {
-	slackClient := &mocks.SlackClient{}
+	slackClient := mocks.NewSlackClient(t)
 	base := bot.BaseCommand{SlackClient: slackClient}
 
 	server := spawnTestServer()

diff --git a/command/pullrequest/pull_request_test.go b/command/pullrequest/pull_request_test.go
@@ -30,7 +30,7 @@ func (t *testFetcher) getHelp() []bot.Help {
 }
 
 func TestGetCommands(t *testing.T) {
-	slackClient := &mocks.SlackClient{}
+	slackClient := mocks.NewSlackClient(t)
 	base := bot.BaseCommand{SlackClient: slackClient}
 
 	cfg := &config.Config{}
@@ -82,7 +82,6 @@ func TestPullRequest(t *testing.T) {
 		slackClient.
 			On("GetReactions", msgRef, slack.NewGetReactionsParameters()).Return(nil, nil)
 
-		mocks.AssertRemoveReaction(slackClient, "eyes", message)
 		mocks.AssertReaction(slackClient, "project_approve", message)
 		mocks.AssertReaction(slackClient, "twisted_rightwards_arrows", message)
 
@@ -102,8 +101,6 @@ func TestPullRequest(t *testing.T) {
 		}
 		message.Text = "vcd.example.com/projects/foo/repos/bar/pull-requests/1337"
 
-		mocks.AssertRemoveReaction(slackClient, "eyes", message)
-		mocks.AssertRemoveReaction(slackClient, "project_approve", message)
 		mocks.AssertReaction(slackClient, "x", message)
 
 		actual := commands.Run(message)
@@ -122,8 +119,6 @@ func TestPullRequest(t *testing.T) {
 		}
 		message.Text = "vcd.example.com/projects/foo/repos/bar/pull-requests/1337"
 
-		mocks.AssertRemoveReaction(slackClient, "eyed", message)
-		mocks.AssertRemoveReaction(slackClient, "x", message)
 		mocks.AssertReaction(slackClient, "approve_backend", message)
 
 		actual := commands.Run(message)

diff --git a/command/queue/queue_test.go b/command/queue/queue_test.go
@@ -16,7 +16,7 @@ import (
 
 func TestQueue(t *testing.T) {
 	client.InternalMessages = make(chan msg.Message, 2)
-	slackClient := &mocks.SlackClient{}
+	slackClient := mocks.NewSlackClient(t)
 	base := bot.BaseCommand{SlackClient: slackClient}
 
 	message := msg.Message{}
@@ -83,7 +83,6 @@ func TestQueue(t *testing.T) {
 
 		mocks.AssertReaction(slackClient, waitIcon, message)
 		mocks.AssertReaction(slackClient, doneIcon, message)
-		mocks.AssertRemoveReaction(slackClient, waitIcon, message)
 
 		actual := command.Run(message)
 		assert.True(t, actual)
@@ -164,7 +163,7 @@ func TestQueue(t *testing.T) {
 
 func TestFallbackQueue(t *testing.T) {
 	client.InternalMessages = make(chan msg.Message, 2)
-	slackClient := &mocks.SlackClient{}
+	slackClient := mocks.NewSlackClient(t)
 	base := bot.BaseCommand{SlackClient: slackClient}
 
 	message := msg.Message{}

diff --git a/command/random_test.go b/command/random_test.go
@@ -10,7 +10,7 @@ import (
 )
 
 func TestRandom(t *testing.T) {
-	slackClient := &mocks.SlackClient{}
+	slackClient := mocks.NewSlackClient(t)
 	base := bot.BaseCommand{SlackClient: slackClient}
 
 	randomCommand := NewRandomCommand(base).(*randomCommand)

diff --git a/command/reaction_test.go b/command/reaction_test.go
@@ -10,7 +10,7 @@ import (
 )
 
 func TestReaction(t *testing.T) {
-	slackClient := &mocks.SlackClient{}
+	slackClient := mocks.NewSlackClient(t)
 	base := bot.BaseCommand{SlackClient: slackClient}
 
 	reaction := NewReactionCommand(base)

diff --git a/command/reply_test.go b/command/reply_test.go
@@ -11,7 +11,7 @@ import (
 )
 
 func TestReply(t *testing.T) {
-	slackClient := &mocks.SlackClient{}
+	slackClient := mocks.NewSlackClient(t)
 	base := bot.BaseCommand{SlackClient: slackClient}
 
 	reply := NewReplyCommand(base)