From f9a7a16a78fac86d3bb64397f688625c0e692dc1 Mon Sep 17 00:00:00 2001 From: Luciano Magro Mores Date: Wed, 30 Oct 2019 10:08:40 -0300 Subject: [PATCH] Convert api4/webhook_test.go t.Fatal calls into require/assert calls (#12904) --- api4/webhook_test.go | 182 ++++++++++++------------------------------- 1 file changed, 49 insertions(+), 133 deletions(-) diff --git a/api4/webhook_test.go b/api4/webhook_test.go index ac7b85fae5..0ffaf44776 100644 --- a/api4/webhook_test.go +++ b/api4/webhook_test.go @@ -33,17 +33,9 @@ func TestCreateIncomingWebhook(t *testing.T) { rhook, resp := th.SystemAdminClient.CreateIncomingWebhook(hook) CheckNoError(t, resp) - if rhook.ChannelId != hook.ChannelId { - t.Fatal("channel ids didn't match") - } - - if rhook.UserId != th.SystemAdminUser.Id { - t.Fatal("user ids didn't match") - } - - if rhook.TeamId != th.BasicTeam.Id { - t.Fatal("team ids didn't match") - } + require.Equal(t, hook.ChannelId, rhook.ChannelId, "channel ids didn't match") + require.Equal(t, th.SystemAdminUser.Id, rhook.UserId, "user ids didn't match") + require.Equal(t, th.BasicTeam.Id, rhook.TeamId, "team ids didn't match") hook.ChannelId = "junk" _, resp = th.SystemAdminClient.CreateIncomingWebhook(hook) @@ -136,16 +128,12 @@ func TestGetIncomingWebhooks(t *testing.T) { } } - if !found { - t.Fatal("missing hook") - } + require.True(t, found, "missing hook") hooks, resp = th.SystemAdminClient.GetIncomingWebhooks(0, 1, "") CheckNoError(t, resp) - if len(hooks) != 1 { - t.Fatal("should only be 1") - } + require.Len(t, hooks, 1, "should only be 1 hook") hooks, resp = th.SystemAdminClient.GetIncomingWebhooksForTeam(th.BasicTeam.Id, 0, 1000, "") CheckNoError(t, resp) @@ -157,16 +145,12 @@ func TestGetIncomingWebhooks(t *testing.T) { } } - if !found { - t.Fatal("missing hook") - } + require.True(t, found, "missing hook") hooks, resp = th.SystemAdminClient.GetIncomingWebhooksForTeam(model.NewId(), 0, 1000, "") CheckNoError(t, resp) - if len(hooks) != 0 { - t.Fatal("no hooks should be returned") - } + require.Len(t, hooks, 0, "no hooks should be returned") _, resp = Client.GetIncomingWebhooks(0, 1000, "") CheckForbiddenStatus(t, resp) @@ -335,11 +319,10 @@ func TestDeleteIncomingWebhook(t *testing.T) { rhook, resp = Client.CreateIncomingWebhook(hook) CheckNoError(t, resp) - if status, resp = Client.DeleteIncomingWebhook(rhook.Id); !status { - t.Fatal("Delete should have succeeded") - } else { - CheckOKStatus(t, resp) - } + status, resp = Client.DeleteIncomingWebhook(rhook.Id) + require.True(t, status, "Delete should have succeeded") + + CheckOKStatus(t, resp) // Get now should not return this deleted hook _, resp = Client.GetIncomingWebhook(rhook.Id, "") @@ -378,13 +361,9 @@ func TestCreateOutgoingWebhook(t *testing.T) { rhook, resp := th.SystemAdminClient.CreateOutgoingWebhook(hook) CheckNoError(t, resp) - if rhook.ChannelId != hook.ChannelId { - t.Fatal("channel ids didn't match") - } else if rhook.CreatorId != th.SystemAdminUser.Id { - t.Fatal("user ids didn't match") - } else if rhook.TeamId != th.BasicChannel.TeamId { - t.Fatal("team ids didn't match") - } + assert.Equal(t, hook.ChannelId, rhook.ChannelId, "channel ids didn't match") + assert.Equal(t, th.SystemAdminUser.Id, rhook.CreatorId, "user ids didn't match") + assert.Equal(t, th.BasicChannel.TeamId, rhook.TeamId, "team ids didn't match") hook.ChannelId = "junk" _, resp = th.SystemAdminClient.CreateOutgoingWebhook(hook) @@ -436,16 +415,12 @@ func TestGetOutgoingWebhooks(t *testing.T) { } } - if !found { - t.Fatal("missing hook") - } + require.True(t, found, "missing hook") hooks, resp = th.SystemAdminClient.GetOutgoingWebhooks(0, 1, "") CheckNoError(t, resp) - if len(hooks) != 1 { - t.Fatal("should only be 1") - } + require.Len(t, hooks, 1, "should only be 1 hook") hooks, resp = th.SystemAdminClient.GetOutgoingWebhooksForTeam(th.BasicTeam.Id, 0, 1000, "") CheckNoError(t, resp) @@ -457,16 +432,12 @@ func TestGetOutgoingWebhooks(t *testing.T) { } } - if !found { - t.Fatal("missing hook") - } + require.True(t, found, "missing hook") hooks, resp = th.SystemAdminClient.GetOutgoingWebhooksForTeam(model.NewId(), 0, 1000, "") CheckNoError(t, resp) - if len(hooks) != 0 { - t.Fatal("no hooks should be returned") - } + require.Len(t, hooks, 0, "no hooks should be returned") hooks, resp = th.SystemAdminClient.GetOutgoingWebhooksForChannel(th.BasicChannel.Id, 0, 1000, "") CheckNoError(t, resp) @@ -478,9 +449,7 @@ func TestGetOutgoingWebhooks(t *testing.T) { } } - if !found { - t.Fatal("missing hook") - } + require.True(t, found, "missing hook") _, resp = th.SystemAdminClient.GetOutgoingWebhooksForChannel(model.NewId(), 0, 1000, "") CheckForbiddenStatus(t, resp) @@ -647,9 +616,8 @@ func TestGetOutgoingWebhook(t *testing.T) { getHook, resp := th.SystemAdminClient.GetOutgoingWebhook(rhook.Id) CheckNoError(t, resp) - if getHook.Id != rhook.Id { - t.Fatal("failed to retrieve the correct outgoing hook") - } + + require.Equal(t, getHook.Id, rhook.Id, "failed to retrieve the correct outgoing hook") _, resp = Client.GetOutgoingWebhook(rhook.Id) CheckForbiddenStatus(t, resp) @@ -694,29 +662,13 @@ func TestUpdateIncomingHook(t *testing.T) { updatedHook, resp := th.SystemAdminClient.UpdateIncomingWebhook(createdHook) CheckNoError(t, resp) - if updatedHook != nil { - if updatedHook.DisplayName != "hook2" { - t.Fatal("Hook name is not updated") - } - if updatedHook.Description != "description" { - t.Fatal("Hook description is not updated") - } - - if updatedHook.ChannelId != th.BasicChannel2.Id { - t.Fatal("Hook channel is not updated") - } - - if updatedHook.Username != "" { - t.Fatal("Hook username was incorrectly updated") - } - - if updatedHook.IconURL != "" { - t.Fatal("Hook icon was incorrectly updated") - } - } else { - t.Fatal("should not be nil") - } + require.NotNil(t, updatedHook, "should not be nil") + require.Exactly(t, "hook2", updatedHook.DisplayName, "Hook name is not updated") + require.Exactly(t, "description", updatedHook.Description, "Hook description is not updated") + require.Equal(t, updatedHook.ChannelId, th.BasicChannel2.Id, "Hook channel is not updated") + require.Empty(t, updatedHook.Username, "Hook username was incorrectly updated") + require.Empty(t, updatedHook.IconURL, "Hook icon was incorrectly updated") //updatedHook, _ = th.App.GetIncomingWebhook(createdHook.Id) assert.Equal(t, updatedHook.ChannelId, createdHook.ChannelId) @@ -734,29 +686,13 @@ func TestUpdateIncomingHook(t *testing.T) { updatedHook, resp := th.SystemAdminClient.UpdateIncomingWebhook(createdHook) CheckNoError(t, resp) - if updatedHook != nil { - if updatedHook.DisplayName != "hook2" { - t.Fatal("Hook name is not updated") - } - if updatedHook.Description != "description" { - t.Fatal("Hook description is not updated") - } - - if updatedHook.ChannelId != th.BasicChannel2.Id { - t.Fatal("Hook channel is not updated") - } - - if updatedHook.Username != "username" { - t.Fatal("Hook username is not updated") - } - - if updatedHook.IconURL != "icon" { - t.Fatal("Hook icon is not updated") - } - } else { - t.Fatal("should not be nil") - } + require.NotNil(t, updatedHook, "should not be nil") + require.Exactly(t, "hook2", updatedHook.DisplayName, "Hook name is not updated") + require.Exactly(t, "description", updatedHook.Description, "Hook description is not updated") + require.Equal(t, updatedHook.ChannelId, th.BasicChannel2.Id, "Hook channel is not updated") + require.Exactly(t, "username", updatedHook.Username, "Hook username is not updated") + require.Exactly(t, "icon", updatedHook.IconURL, "Hook icon is not updated") //updatedHook, _ = th.App.GetIncomingWebhook(createdHook.Id) assert.Equal(t, updatedHook.ChannelId, createdHook.ChannelId) @@ -781,13 +717,8 @@ func TestUpdateIncomingHook(t *testing.T) { updatedHook, resp := th.SystemAdminClient.UpdateIncomingWebhook(createdHook) CheckNoError(t, resp) - if updatedHook != nil { - if updatedHook.UpdateAt == createdHook.UpdateAt { - t.Fatal("failed - hook updateAt is not updated") - } - } else { - t.Fatal("should not be nil") - } + require.NotNil(t, updatedHook, "should not be nil") + require.NotEqual(t, createdHook.UpdateAt, updatedHook.UpdateAt, "failed - hook updateAt is not updated") }) t.Run("UpdateNonExistentHook", func(t *testing.T) { @@ -837,9 +768,7 @@ func TestUpdateIncomingHook(t *testing.T) { t.Run("UpdateByDifferentUser", func(t *testing.T) { updatedHook, resp := Client.UpdateIncomingWebhook(createdHook) CheckNoError(t, resp) - if updatedHook.UserId == th.BasicUser2.Id { - t.Fatal("Hook's creator userId is not retained") - } + require.NotEqual(t, th.BasicUser2.Id, updatedHook.UserId, "Hook's creator userId is not retained") }) t.Run("IncomingHooksDisabled", func(t *testing.T) { @@ -932,9 +861,7 @@ func TestRegenOutgoingHookToken(t *testing.T) { regenHookToken, resp := th.SystemAdminClient.RegenOutgoingHookToken(rhook.Id) CheckNoError(t, resp) - if regenHookToken.Token == rhook.Token { - t.Fatal("regen didn't work properly") - } + require.NotEqual(t, rhook.Token, regenHookToken.Token, "regen didn't work properly") _, resp = Client.RegenOutgoingHookToken(rhook.Id) CheckForbiddenStatus(t, resp) @@ -969,12 +896,9 @@ func TestUpdateOutgoingHook(t *testing.T) { updatedHook, resp := th.SystemAdminClient.UpdateOutgoingWebhook(createdHook) CheckNoError(t, resp) - if updatedHook.DisplayName != "Cats" { - t.Fatal("did not update") - } - if updatedHook.Description != "Get me some cats" { - t.Fatal("did not update") - } + + require.Exactly(t, "Cats", updatedHook.DisplayName, "did not update") + require.Exactly(t, "Get me some cats", updatedHook.Description, "did not update") }) t.Run("OutgoingHooksDisabled", func(t *testing.T) { @@ -995,9 +919,7 @@ func TestUpdateOutgoingHook(t *testing.T) { updatedHook2, resp := th.SystemAdminClient.UpdateOutgoingWebhook(createdHook2) CheckNoError(t, resp) - if updatedHook2.CreateAt != createdHook2.CreateAt { - t.Fatal("failed - hook create at should not be changed") - } + require.Equal(t, createdHook2.CreateAt, updatedHook2.CreateAt, "failed - hook create at should not be changed") }) t.Run("ModifyUpdateAt", func(t *testing.T) { @@ -1006,9 +928,7 @@ func TestUpdateOutgoingHook(t *testing.T) { updatedHook2, resp := th.SystemAdminClient.UpdateOutgoingWebhook(createdHook) CheckNoError(t, resp) - if updatedHook2.UpdateAt == createdHook.UpdateAt { - t.Fatal("failed - hook updateAt is not updated") - } + require.NotEqual(t, createdHook.UpdateAt, updatedHook2.UpdateAt, "failed - hook updateAt is not updated") }) t.Run("UpdateNonExistentHook", func(t *testing.T) { @@ -1048,12 +968,9 @@ func TestUpdateOutgoingHook(t *testing.T) { createdHook.DisplayName = "Basic user 2" updatedHook, resp := Client.UpdateOutgoingWebhook(createdHook) CheckNoError(t, resp) - if updatedHook.DisplayName != "Basic user 2" { - t.Fatal("should apply the change") - } - if updatedHook.CreatorId != th.SystemAdminUser.Id { - t.Fatal("hook creator should not be changed") - } + + require.Exactly(t, "Basic user 2", updatedHook.DisplayName, "should apply the change") + require.Equal(t, th.SystemAdminUser.Id, updatedHook.CreatorId, "hook creator should not be changed") }) t.Run("UpdateToExistingTriggerWordAndCallback", func(t *testing.T) { @@ -1167,11 +1084,10 @@ func TestDeleteOutgoingHook(t *testing.T) { rhook, resp = Client.CreateOutgoingWebhook(hook) CheckNoError(t, resp) - if status, resp = Client.DeleteOutgoingWebhook(rhook.Id); !status { - t.Fatal("Delete should have succeeded") - } else { - CheckOKStatus(t, resp) - } + status, resp = Client.DeleteOutgoingWebhook(rhook.Id) + + require.True(t, status, "Delete should have succeeded") + CheckOKStatus(t, resp) // Get now should not return this deleted hook _, resp = Client.GetIncomingWebhook(rhook.Id, "")