internal: made the queue_test.go more robust (#238)

* internal: made the queue_test.go more robust * internal: made the queue_test.go more robust
innogames · Oct 24, 2021 · a7fa9f7 · a7fa9f7
1 parent da8488d
commit a7fa9f7
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 8 deletions.
diff --git a/command/queue/queue_test.go b/command/queue/queue_test.go
@@ -62,16 +62,16 @@ func TestQueue(t *testing.T) {
 		actual := command.Run(message)
 		assert.True(t, actual)
 		assert.Empty(t, client.InternalMessages)
+	})
 
-		t.Run("Render template with not open PR", func(t *testing.T) {
-			tpl, err := util.CompileTemplate(`{{$count1 := countBackgroundJobs}}{{$count2 := countBackgroundJobsInChannel "C1234"}}{{$count1}} - {{$count2}}`)
-			assert.Nil(t, err)
+	t.Run("Render template with not open PR", func(t *testing.T) {
+		tpl, err := util.CompileTemplate(`{{$count1 := countBackgroundJobs}}{{$count2 := countBackgroundJobsInChannel "C1234"}}{{$count1}} - {{$count2}}`)
+		assert.Nil(t, err)
 
-			res, err := util.EvalTemplate(tpl, util.Parameters{})
-			assert.Nil(t, err)
+		res, err := util.EvalTemplate(tpl, util.Parameters{})
+		assert.Nil(t, err)
 
-			assert.Equal(t, "0 - 0", res)
-		})
+		assert.Equal(t, "0 - 0", res)
 	})
 
 	t.Run("Test queue command", func(t *testing.T) {
@@ -143,12 +143,16 @@ func TestQueue(t *testing.T) {
 		expectedMessage.Text = "reply test"
 		expectedMessage.Channel = "C1234"
 		assert.Equal(t, handledEvent, expectedMessage)
+
+		assert.Empty(t, client.InternalMessages)
 	})
 
 	t.Run("Test refresh queue command", func(t *testing.T) {
 		message.Text = "list queue"
 		message.UpdatedMessage = true
 
+		assert.Empty(t, client.InternalMessages)
+
 		mocks.AssertReaction(slackClient, processingReaction, message)
 		mocks.AssertRemoveReaction(slackClient, processingReaction, message)
 		mocks.AssertContainsSlackBlocks(t, slackClient, message, client.GetTextBlock("*0 queued commands*"))

diff --git a/mocks/testing.go b/mocks/testing.go
@@ -110,7 +110,14 @@ func AssertContainsSlackBlocks(t *testing.T, slackClient *SlackClient, message m
 		expectedJSONBlock, err := json.Marshal(block)
 		assert.Nil(t, err)
 
-		return strings.Contains(string(givenJSON), string(expectedJSONBlock))
+		if strings.Contains(string(givenJSON), string(expectedJSONBlock)) {
+			// all good!
+			return true
+		}
+
+		fmt.Println("not matching:", string(givenJSON), string(expectedJSONBlock))
+
+		return false
 	}), mock.Anything).Once().Return("")
 }