command_help_test, cors_test: use testify (#12941)

* command_help_test, cors_test: use testify

* cors_test: remove extraneous lines

* command_help_test: remove extraneous lines

* command_help_test: set checks to nonterminal

api4/command_help_test.go

@@ -7,6 +7,7 @@ import (
 	"testing"
 
 	"github.com/mattermost/mattermost-server/model"
+	"github.com/stretchr/testify/assert"
 )
 
 func TestHelpCommand(t *testing.T) {
@@ -23,15 +24,11 @@ func TestHelpCommand(t *testing.T) {
 
 	th.App.UpdateConfig(func(cfg *model.Config) { *cfg.SupportSettings.HelpLink = "" })
 	rs1, _ := Client.ExecuteCommand(channel.Id, "/help ")
-	if rs1.GotoLocation != model.SUPPORT_SETTINGS_DEFAULT_HELP_LINK {
+	assert.Equal(t, rs1.GotoLocation, model.SUPPORT_SETTINGS_DEFAULT_HELP_LINK, "failed to default help link")
-		t.Fatal("failed to default help link")
-	}
 
 	th.App.UpdateConfig(func(cfg *model.Config) {
 		*cfg.SupportSettings.HelpLink = "https://docs.mattermost.com/guides/user.html"
 	})
 	rs2, _ := Client.ExecuteCommand(channel.Id, "/help ")
-	if rs2.GotoLocation != "https://docs.mattermost.com/guides/user.html" {
+	assert.Equal(t, rs2.GotoLocation, "https://docs.mattermost.com/guides/user.html", "failed to help link")
-		t.Fatal("failed to help link")
-	}
 }

api4/cors_test.go

@@ -7,6 +7,7 @@ import (
 
 	"github.com/mattermost/mattermost-server/model"
 	"github.com/stretchr/testify/assert"
+	"github.com/stretchr/testify/require"
 )
 
 const (
@@ -127,16 +128,12 @@ func TestCORSRequestHandling(t *testing.T) {
 			url := fmt.Sprintf("%v/api/v4/system/ping", host)
 
 			req, err := http.NewRequest("GET", url, nil)
-			if err != nil {
+			require.NoError(t, err)
-				t.Fatal(err)
-			}
 			testcase.ModifyRequest(req)
 
 			client := &http.Client{}
 			resp, err := client.Do(req)
-			if err != nil {
+			require.NoError(t, err)
-				t.Fatal(err)
-			}
 			assert.Equal(t, http.StatusOK, resp.StatusCode)
 			assert.Equal(t, testcase.ExpectedAllowOrigin, resp.Header.Get(acAllowOrigin))
 			assert.Equal(t, testcase.ExpectedExposeHeaders, resp.Header.Get(acExposeHeaders))
@@ -146,5 +143,4 @@ func TestCORSRequestHandling(t *testing.T) {
 			assert.Equal(t, "", resp.Header.Get(acAllowHeaders))
 		})
 	}
-
 }