Replacing require.nil in model package (#16953)

* Replacing require.nil in model package

* Fixing tests

* Update model/file_info_test.go

Co-authored-by: Doug Lauder <wiggin77@warpmail.net>

* Update model/file_info_test.go

Co-authored-by: Doug Lauder <wiggin77@warpmail.net>

Co-authored-by: Doug Lauder <wiggin77@warpmail.net>
Co-authored-by: Mattermod <mattermod@users.noreply.github.com>

model/access_test.go

@@ -29,41 +29,41 @@ func TestAccessIsValid(t *testing.T) {
 	require.NotNil(t, ad.IsValid())
 
 	ad.ClientId = NewRandomString(28)
-	require.Error(t, ad.IsValid())
+	require.NotNil(t, ad.IsValid())
 
 	ad.ClientId = ""
-	require.Error(t, ad.IsValid())
+	require.NotNil(t, ad.IsValid())
 
 	ad.ClientId = NewId()
 	require.NotNil(t, ad.IsValid())
 
 	ad.UserId = NewRandomString(28)
-	require.Error(t, ad.IsValid())
+	require.NotNil(t, ad.IsValid())
 
 	ad.UserId = ""
-	require.Error(t, ad.IsValid())
+	require.NotNil(t, ad.IsValid())
 
 	ad.UserId = NewId()
-	require.Error(t, ad.IsValid())
+	require.NotNil(t, ad.IsValid())
 
 	ad.Token = NewRandomString(22)
-	require.Error(t, ad.IsValid())
+	require.NotNil(t, ad.IsValid())
 
 	ad.Token = NewId()
 	require.NotNil(t, ad.IsValid())
 
 	ad.RefreshToken = NewRandomString(28)
-	require.Error(t, ad.IsValid())
+	require.NotNil(t, ad.IsValid())
 
 	ad.RefreshToken = NewId()
 	require.NotNil(t, ad.IsValid())
 
 	ad.RedirectUri = ""
-	require.Error(t, ad.IsValid())
+	require.NotNil(t, ad.IsValid())
 
 	ad.RedirectUri = NewRandomString(28)
-	require.Error(t, ad.IsValid())
+	require.NotNil(t, ad.IsValid())
 
 	ad.RedirectUri = "http://example.com"
-	require.Error(t, ad.IsValid(), ad.IsValid())
+	require.Nil(t, ad.IsValid())
 }

model/bundle_info_test.go

@@ -29,5 +29,5 @@ func TestBundleInfoForPath(t *testing.T) {
 	assert.Equal(t, info.Path, dir)
 	assert.NotNil(t, info.Manifest)
 	assert.Equal(t, info.ManifestPath, path)
-	assert.Nil(t, info.ManifestError)
+	assert.NoError(t, info.ManifestError)
 }

model/channel_member_test.go

@@ -21,31 +21,31 @@ func TestChannelMemberJson(t *testing.T) {
 func TestChannelMemberIsValid(t *testing.T) {
 	o := ChannelMember{}
 
-	require.Error(t, o.IsValid(), "should be invalid")
+	require.NotNil(t, o.IsValid(), "should be invalid")
 
 	o.ChannelId = NewId()
-	require.Error(t, o.IsValid(), "should be invalid")
+	require.NotNil(t, o.IsValid(), "should be invalid")
 
 	o.NotifyProps = GetDefaultChannelNotifyProps()
 	o.UserId = NewId()
 
 	o.NotifyProps["desktop"] = "junk"
-	require.Error(t, o.IsValid(), "should be invalid")
+	require.NotNil(t, o.IsValid(), "should be invalid")
 
 	o.NotifyProps["desktop"] = "123456789012345678901"
-	require.Error(t, o.IsValid(), "should be invalid")
+	require.NotNil(t, o.IsValid(), "should be invalid")
 
 	o.NotifyProps["desktop"] = CHANNEL_NOTIFY_ALL
-	require.Error(t, o.IsValid(), "should be invalid")
+	require.Nil(t, o.IsValid(), "should be valid")
 
 	o.NotifyProps["mark_unread"] = "123456789012345678901"
-	require.Error(t, o.IsValid(), "should be invalid")
+	require.NotNil(t, o.IsValid(), "should be invalid")
 
 	o.NotifyProps["mark_unread"] = CHANNEL_MARK_UNREAD_ALL
-	require.Error(t, o.IsValid(), "should be invalid")
+	require.Nil(t, o.IsValid(), "should be valid")
 
 	o.Roles = ""
-	require.Error(t, o.IsValid(), "should be invalid")
+	require.Nil(t, o.IsValid(), "should be invalid")
 }
 
 func TestChannelUnreadJson(t *testing.T) {

model/channel_test.go

@@ -53,41 +53,41 @@ func TestChannelPatch(t *testing.T) {
 func TestChannelIsValid(t *testing.T) {
 	o := Channel{}
 
-	require.Error(t, o.IsValid())
+	require.NotNil(t, o.IsValid())
 
 	o.Id = NewId()
-	require.Error(t, o.IsValid())
+	require.NotNil(t, o.IsValid())
 
 	o.CreateAt = GetMillis()
-	require.Error(t, o.IsValid())
+	require.NotNil(t, o.IsValid())
 
 	o.UpdateAt = GetMillis()
-	require.Error(t, o.IsValid())
+	require.NotNil(t, o.IsValid())
 
 	o.DisplayName = strings.Repeat("01234567890", 20)
-	require.Error(t, o.IsValid())
+	require.NotNil(t, o.IsValid())
 
 	o.DisplayName = "1234"
 	o.Name = "ZZZZZZZ"
-	require.Error(t, o.IsValid())
+	require.NotNil(t, o.IsValid())
 
 	o.Name = "zzzzz"
-	require.Error(t, o.IsValid())
+	require.NotNil(t, o.IsValid())
 
 	o.Type = "U"
-	require.Error(t, o.IsValid())
+	require.NotNil(t, o.IsValid())
 
 	o.Type = "P"
-	require.Error(t, o.IsValid())
+	require.Nil(t, o.IsValid())
 
 	o.Header = strings.Repeat("01234567890", 100)
-	require.Error(t, o.IsValid())
+	require.NotNil(t, o.IsValid())
 
 	o.Header = "1234"
 	require.Nil(t, o.IsValid())
 
 	o.Purpose = strings.Repeat("01234567890", 30)
-	require.Error(t, o.IsValid())
+	require.NotNil(t, o.IsValid())
 
 	o.Purpose = "1234"
 	require.Nil(t, o.IsValid())

model/command_autocomplete_test.go

@@ -12,34 +12,34 @@ import (
 
 func TestAutocompleteData(t *testing.T) {
 	ad := NewAutocompleteData("jira", "", "Available commands:")
-	assert.Nil(t, ad.IsValid())
+	assert.NoError(t, ad.IsValid())
 	ad.RoleID = "some_id"
-	assert.NotNil(t, ad.IsValid())
+	assert.Error(t, ad.IsValid())
 	ad.RoleID = SYSTEM_ADMIN_ROLE_ID
-	assert.Nil(t, ad.IsValid())
+	assert.NoError(t, ad.IsValid())
 	ad.AddDynamicListArgument("help", "/some/url", true)
-	assert.Nil(t, ad.IsValid())
+	assert.NoError(t, ad.IsValid())
 	ad.AddNamedTextArgument("name", "help", "[text]", "", true)
-	assert.Nil(t, ad.IsValid())
+	assert.NoError(t, ad.IsValid())
 
 	ad = getAutocompleteData()
-	assert.Nil(t, ad.IsValid())
+	assert.NoError(t, ad.IsValid())
 	command := NewAutocompleteData("", "", "")
 	ad.AddCommand(command)
-	assert.NotNil(t, ad.IsValid())
+	assert.Error(t, ad.IsValid())
 
 	ad = getAutocompleteData()
 	command = NewAutocompleteData("disconnect", "", "disconnect")
 	command.AddTextArgument("help", "[text]", "")
 	command.AddNamedTextArgument("some", "help", "[text]", "", true)
 	ad.AddCommand(command)
-	assert.Nil(t, ad.IsValid())
+	assert.NoError(t, ad.IsValid())
 
 	ad = getAutocompleteData()
 	command = NewAutocompleteData("disconnect", "", "disconnect")
 	command.AddDynamicListArgument("help", "valid_url", true)
 	ad.AddCommand(command)
-	assert.Nil(t, ad.IsValid())
+	assert.NoError(t, ad.IsValid())
 
 	ad = getAutocompleteData()
 	command = NewAutocompleteData("disconnect", "", "disconnect")
@@ -53,24 +53,24 @@ func TestAutocompleteData(t *testing.T) {
 	}
 	command.AddStaticListArgument("help", true, items)
 	ad.AddCommand(command)
-	assert.NotNil(t, ad.IsValid())
+	assert.Error(t, ad.IsValid())
 
 	ad = getAutocompleteData()
 	ad.AddCommand(nil)
-	assert.NotNil(t, ad.IsValid())
+	assert.Error(t, ad.IsValid())
 
 	ad = getAutocompleteData()
 	command = NewAutocompleteData("Disconnect", "", "")
 	ad.AddCommand(command)
-	assert.NotNil(t, ad.IsValid())
+	assert.Error(t, ad.IsValid())
 }
 
 func TestAutocompleteDataJSON(t *testing.T) {
 	ad := getAutocompleteData()
 	b, err := ad.ToJSON()
-	assert.Nil(t, err)
+	assert.NoError(t, err)
 	ad2, err := AutocompleteDataFromJSON(b)
-	assert.Nil(t, err)
+	assert.NoError(t, err)
 	assert.True(t, ad2.Equals(ad))
 }
 
@@ -101,7 +101,7 @@ func TestUpdateRelativeURLsForPluginCommands(t *testing.T) {
 	ad := getAutocompleteData()
 	baseURL, _ := url.Parse("http://localhost:8065/plugins/com.mattermost.demo-plugin")
 	err := ad.UpdateRelativeURLsForPluginCommands(baseURL)
-	assert.Nil(t, err)
+	assert.NoError(t, err)
 	arg, ok := ad.SubCommands[0].Arguments[2].Data.(*AutocompleteDynamicListArg)
 	assert.True(t, ok)
 	assert.Equal(t, "http://localhost:8065/plugins/com.mattermost.demo-plugin/other/url", arg.FetchURL)

model/command_webhook_test.go

@@ -32,10 +32,15 @@ func TestCommandWebhookIsValid(t *testing.T) {
 	}{
 		{func() {}, ""},
 		{func() { h.Id = "asd" }, "model.command_hook.id.app_error"},
+		{func() { h.Id = NewId() }, ""},
 		{func() { h.CreateAt = 0 }, "model.command_hook.create_at.app_error"},
+		{func() { h.CreateAt = GetMillis() }, ""},
 		{func() { h.CommandId = "asd" }, "model.command_hook.command_id.app_error"},
+		{func() { h.CommandId = NewId() }, ""},
 		{func() { h.UserId = "asd" }, "model.command_hook.user_id.app_error"},
+		{func() { h.UserId = NewId() }, ""},
 		{func() { h.ChannelId = "asd" }, "model.command_hook.channel_id.app_error"},
+		{func() { h.ChannelId = NewId() }, ""},
 		{func() { h.RootId = "asd" }, "model.command_hook.root_id.app_error"},
 		{func() { h.RootId = NewId() }, ""},
 		{func() { h.ParentId = "asd" }, "model.command_hook.parent_id.app_error"},
@@ -46,7 +51,7 @@ func TestCommandWebhookIsValid(t *testing.T) {
 		err := h.IsValid()
 
 		if test.ExpectedError == "" {
-			assert.Error(t, err, "hook should be valid")
+			assert.Nil(t, err, "hook should be valid")
 		} else {
 			require.NotNil(t, err)
 			assert.Equal(t, test.ExpectedError, err.Id, "expected "+test.ExpectedError+" error")

model/config_test.go

@@ -391,7 +391,7 @@ func TestMessageExportSettingsIsValidEnableExportNotSet(t *testing.T) {
 	mes := &MessageExportSettings{}
 
 	// should fail fast because mes.EnableExport is not set
-	require.Error(t, mes.isValid())
+	require.NotNil(t, mes.isValid())
 }
 
 func TestMessageExportSettingsIsValidEnableExportFalse(t *testing.T) {
@@ -409,17 +409,17 @@ func TestMessageExportSettingsIsValidExportFromTimestampInvalid(t *testing.T) {
 	}
 
 	// should fail fast because export from timestamp isn't set
-	require.Error(t, mes.isValid())
+	require.NotNil(t, mes.isValid())
 
 	mes.ExportFromTimestamp = NewInt64(-1)
 
 	// should fail fast because export from timestamp isn't valid
-	require.Error(t, mes.isValid())
+	require.NotNil(t, mes.isValid())
 
 	mes.ExportFromTimestamp = NewInt64(GetMillis() + 10000)
 
 	// should fail fast because export from timestamp is greater than current time
-	require.Error(t, mes.isValid())
+	require.NotNil(t, mes.isValid())
 }
 
 func TestMessageExportSettingsIsValidDailyRunTimeInvalid(t *testing.T) {
@@ -429,12 +429,12 @@ func TestMessageExportSettingsIsValidDailyRunTimeInvalid(t *testing.T) {
 	}
 
 	// should fail fast because daily runtime isn't set
-	require.Error(t, mes.isValid())
+	require.NotNil(t, mes.isValid())
 
 	mes.DailyRunTime = NewString("33:33:33")
 
 	// should fail fast because daily runtime is invalid format
-	require.Error(t, mes.isValid())
+	require.NotNil(t, mes.isValid())
 }
 
 func TestMessageExportSettingsIsValidBatchSizeInvalid(t *testing.T) {
@@ -445,7 +445,7 @@ func TestMessageExportSettingsIsValidBatchSizeInvalid(t *testing.T) {
 	}
 
 	// should fail fast because batch size isn't set
-	require.Error(t, mes.isValid())
+	require.NotNil(t, mes.isValid())
 }
 
 func TestMessageExportSettingsIsValidExportFormatInvalid(t *testing.T) {
@@ -457,7 +457,7 @@ func TestMessageExportSettingsIsValidExportFormatInvalid(t *testing.T) {
 	}
 
 	// should fail fast because export format isn't set
-	require.Error(t, mes.isValid())
+	require.NotNil(t, mes.isValid())
 }
 
 func TestMessageExportSettingsIsValidGlobalRelayEmailAddressInvalid(t *testing.T) {
@@ -470,7 +470,7 @@ func TestMessageExportSettingsIsValidGlobalRelayEmailAddressInvalid(t *testing.T
 	}
 
 	// should fail fast because global relay email address isn't set
-	require.Error(t, mes.isValid())
+	require.NotNil(t, mes.isValid())
 }
 
 func TestMessageExportSettingsIsValidActiance(t *testing.T) {
@@ -496,7 +496,7 @@ func TestMessageExportSettingsIsValidGlobalRelaySettingsMissing(t *testing.T) {
 	}
 
 	// should fail because globalrelay settings are missing
-	require.Error(t, mes.isValid())
+	require.NotNil(t, mes.isValid())
 }
 
 func TestMessageExportSettingsIsValidGlobalRelaySettingsInvalidCustomerType(t *testing.T) {
@@ -515,7 +515,7 @@ func TestMessageExportSettingsIsValidGlobalRelaySettingsInvalidCustomerType(t *t
 	}
 
 	// should fail because customer type is invalid
-	require.Error(t, mes.isValid())
+	require.NotNil(t, mes.isValid())
 }
 
 // func TestMessageExportSettingsIsValidGlobalRelaySettingsInvalidEmailAddress(t *testing.T) {
@@ -590,7 +590,7 @@ func TestMessageExportSettingsGlobalRelaySettings(t *testing.T) {
 			if tt.success {
 				require.Nil(t, mes.isValid())
 			} else {
-				require.Error(t, mes.isValid())
+				require.NotNil(t, mes.isValid())
 			}
 		})
 	}

model/file_info_test.go

@@ -77,13 +77,13 @@ func TestGetInfoForFile(t *testing.T) {
 	fakeFile := make([]byte, 1000)
 
 	pngFile, err := ioutil.ReadFile("../tests/test.png")
-	require.Nilf(t, err, "Failed to load test.png")
+	require.NoError(t, err, "Failed to load test.png")
 
 	// base 64 encoded version of handtinywhite.gif from http://probablyprogramming.com/2009/03/15/the-tiniest-gif-ever
 	gifFile, _ := base64.StdEncoding.DecodeString("R0lGODlhAQABAIABAP///wAAACwAAAAAAQABAAACAkQBADs=")
 
 	animatedGifFile, err := ioutil.ReadFile("../tests/testgif.gif")
-	require.Nilf(t, err, "Failed to load testgif.gif")
+	require.NoError(t, err, "Failed to load testgif.gif")
 
 	var ttc = []struct {
 		testName                string

model/incoming_webhook_test.go

@@ -21,55 +21,55 @@ func TestIncomingWebhookJson(t *testing.T) {
 func TestIncomingWebhookIsValid(t *testing.T) {
 	o := IncomingWebhook{}
 
-	require.Error(t, o.IsValid())
+	require.NotNil(t, o.IsValid())
 
 	o.Id = NewId()
-	require.Error(t, o.IsValid())
+	require.NotNil(t, o.IsValid())
 
 	o.CreateAt = GetMillis()
-	require.Error(t, o.IsValid())
+	require.NotNil(t, o.IsValid())
 
 	o.UpdateAt = GetMillis()
-	require.Error(t, o.IsValid())
+	require.NotNil(t, o.IsValid())
 
 	o.UserId = "123"
-	require.Error(t, o.IsValid())
+	require.NotNil(t, o.IsValid())
 
 	o.UserId = NewId()
-	require.Error(t, o.IsValid())
+	require.NotNil(t, o.IsValid())
 
 	o.ChannelId = "123"
-	require.Error(t, o.IsValid())
+	require.NotNil(t, o.IsValid())
 
 	o.ChannelId = NewId()
-	require.Error(t, o.IsValid())
+	require.NotNil(t, o.IsValid())
 
 	o.TeamId = "123"
-	require.Error(t, o.IsValid())
+	require.NotNil(t, o.IsValid())
 
 	o.TeamId = NewId()
 	require.Nil(t, o.IsValid())
 
 	o.DisplayName = strings.Repeat("1", 65)
-	require.Error(t, o.IsValid())
+	require.NotNil(t, o.IsValid())
 
 	o.DisplayName = strings.Repeat("1", 64)
 	require.Nil(t, o.IsValid())
 
 	o.Description = strings.Repeat("1", 501)
-	require.Error(t, o.IsValid())
+	require.NotNil(t, o.IsValid())
 
 	o.Description = strings.Repeat("1", 500)
 	require.Nil(t, o.IsValid())
 
 	o.Username = strings.Repeat("1", 65)
-	require.Error(t, o.IsValid())
+	require.NotNil(t, o.IsValid())
 
 	o.Username = strings.Repeat("1", 64)
 	require.Nil(t, o.IsValid())
 
 	o.IconURL = strings.Repeat("1", 1025)
-	require.Error(t, o.IsValid())
+	require.NotNil(t, o.IsValid())
 
 	o.IconURL = strings.Repeat("1", 1024)
 	require.Nil(t, o.IsValid())

model/integration_action_test.go

@@ -19,7 +19,7 @@ import (
 func TestTriggerIdDecodeAndVerification(t *testing.T) {
 
 	key, err := ecdsa.GenerateKey(elliptic.P256(), rand.Reader)
-	require.Nil(t, err)
+	require.NoError(t, err)
 
 	t.Run("should succeed decoding and validation", func(t *testing.T) {
 		userId := NewId()
@@ -77,7 +77,7 @@ func TestTriggerIdDecodeAndVerification(t *testing.T) {
 	t.Run("should fail on bad key", func(t *testing.T) {
 		_, triggerId, err := GenerateTriggerId(NewId(), key)
 		newKey, keyErr := ecdsa.GenerateKey(elliptic.P256(), rand.Reader)
-		require.Nil(t, keyErr)
+		require.NoError(t, keyErr)
 		_, _, err = DecodeAndVerifyTriggerId(triggerId, newKey)
 		require.NotNil(t, err)
 		assert.Equal(t, "interactive_message.decode_trigger_id.verify_signature_failed", err.Id)

model/link_metadata_test.go

@@ -169,7 +169,7 @@ func TestLinkMetadataDeserializeDataToConcreteType(t *testing.T) {
 
 		err := metadata.DeserializeDataToConcreteType()
 
-		assert.Nil(t, err)
+		assert.NoError(t, err)
 		assert.IsType(t, &PostImage{}, metadata.Data)
 		assert.Equal(t, *image, *metadata.Data.(*PostImage))
 	})
@@ -187,7 +187,7 @@ func TestLinkMetadataDeserializeDataToConcreteType(t *testing.T) {
 
 		b, err := json.Marshal(og)
 
-		require.Nil(t, err)
+		require.NoError(t, err)
 
 		metadata := &LinkMetadata{
 			Type: LINK_METADATA_TYPE_OPENGRAPH,
@@ -198,7 +198,7 @@ func TestLinkMetadataDeserializeDataToConcreteType(t *testing.T) {
 
 		err = metadata.DeserializeDataToConcreteType()
 
-		assert.Nil(t, err)
+		assert.NoError(t, err)
 		assert.IsType(t, &opengraph.OpenGraph{}, metadata.Data)
 		assert.Equal(t, *og, *metadata.Data.(*opengraph.OpenGraph))
 	})
@@ -211,7 +211,7 @@ func TestLinkMetadataDeserializeDataToConcreteType(t *testing.T) {
 
 		err := metadata.DeserializeDataToConcreteType()
 
-		assert.Nil(t, err)
+		assert.NoError(t, err)
 	})
 
 	t.Run("should ignore an invalid type", func(t *testing.T) {
@@ -222,7 +222,7 @@ func TestLinkMetadataDeserializeDataToConcreteType(t *testing.T) {
 
 		err := metadata.DeserializeDataToConcreteType()
 
-		assert.Nil(t, err)
+		assert.NoError(t, err)
 	})
 
 	t.Run("should return error for invalid data", func(t *testing.T) {
@@ -233,7 +233,7 @@ func TestLinkMetadataDeserializeDataToConcreteType(t *testing.T) {
 
 		err := metadata.DeserializeDataToConcreteType()
 
-		assert.NotNil(t, err)
+		assert.Error(t, err)
 	})
 }
 

model/preference_test.go

@@ -57,7 +57,7 @@ func TestPreferencePreUpdate(t *testing.T) {
 	preference.PreUpdate()
 
 	var props map[string]string
-	require.Nil(t, json.NewDecoder(strings.NewReader(preference.Value)).Decode(&props))
+	require.NoError(t, json.NewDecoder(strings.NewReader(preference.Value)).Decode(&props))
 
 	require.Equal(t, "#ff0000", props["color"], "shouldn't have changed valid props")
 	require.Equal(t, "#faf", props["color2"], "shouldn't have changed valid props")

model/push_notification_test.go

@@ -16,19 +16,19 @@ func TestPushNotification(t *testing.T) {
 		json := msg.ToJson()
 		result, err := PushNotificationFromJson(strings.NewReader(json))
 
-		require.Nil(t, err)
+		require.NoError(t, err)
 		require.Equal(t, msg.Platform, result.Platform, "ids do not match")
 	})
 
 	t.Run("should throw an error when the message is nil", func(t *testing.T) {
 		_, err := PushNotificationFromJson(nil)
-		require.NotNil(t, err)
+		require.Error(t, err)
 		require.Equal(t, "push notification data can't be nil", err.Error())
 	})
 
 	t.Run("should throw an error when the message parsing fails", func(t *testing.T) {
 		_, err := PushNotificationFromJson(strings.NewReader(""))
-		require.NotNil(t, err)
+		require.Error(t, err)
 		require.Equal(t, "EOF", err.Error())
 	})
 }
@@ -39,19 +39,19 @@ func TestPushNotificationAck(t *testing.T) {
 		json := msg.ToJson()
 		result, err := PushNotificationAckFromJson(strings.NewReader(json))
 
-		require.Nil(t, err)
+		require.NoError(t, err)
 		require.Equal(t, msg.ClientPlatform, result.ClientPlatform, "ids do not match")
 	})
 
 	t.Run("should throw an error when the message is nil", func(t *testing.T) {
 		_, err := PushNotificationAckFromJson(nil)
-		require.NotNil(t, err)
+		require.Error(t, err)
 		require.Equal(t, "push notification data can't be nil", err.Error())
 	})
 
 	t.Run("should throw an error when the message parsing fails", func(t *testing.T) {
 		_, err := PushNotificationAckFromJson(strings.NewReader(""))
-		require.NotNil(t, err)
+		require.Error(t, err)
 		require.Equal(t, "EOF", err.Error())
 	})
 }

model/team_member_test.go

@@ -21,11 +21,11 @@ func TestTeamMemberJson(t *testing.T) {
 func TestTeamMemberIsValid(t *testing.T) {
 	o := TeamMember{}
 
-	require.Error(t, o.IsValid(), "should be invalid")
+	require.NotNil(t, o.IsValid(), "should be invalid")
 
 	o.TeamId = NewId()
 
-	require.Error(t, o.IsValid(), "should be invalid")
+	require.NotNil(t, o.IsValid(), "should be invalid")
 }
 
 func TestUnreadMemberJson(t *testing.T) {

model/terms_of_service_test.go

@@ -13,19 +13,19 @@ import (
 func TestTermsOfServiceIsValid(t *testing.T) {
 	s := TermsOfService{}
 
-	assert.Error(t, s.IsValid(), "should be invalid")
+	assert.NotNil(t, s.IsValid(), "should be invalid")
 
 	s.Id = NewId()
-	assert.Error(t, s.IsValid(), "should be invalid")
+	assert.NotNil(t, s.IsValid(), "should be invalid")
 
 	s.CreateAt = GetMillis()
-	assert.Error(t, s.IsValid(), "should be invalid")
+	assert.NotNil(t, s.IsValid(), "should be invalid")
 
 	s.UserId = NewId()
-	assert.Error(t, s.IsValid(), "should be invalid")
+	assert.Nil(t, s.IsValid(), "should be valid")
 
 	s.Text = strings.Repeat("0", POST_MESSAGE_MAX_RUNES_V2+1)
-	assert.Error(t, s.IsValid(), "should be invalid")
+	assert.NotNil(t, s.IsValid(), "should be invalid")
 
 	s.Text = strings.Repeat("0", POST_MESSAGE_MAX_RUNES_V2)
 	assert.Nil(t, s.IsValid(), "should be valid")

model/user_terms_of_Service_test.go

@@ -13,13 +13,13 @@ import (
 
 func TestUserTermsOfServiceIsValid(t *testing.T) {
 	s := UserTermsOfService{}
-	require.Error(t, s.IsValid(), "should be invalid")
+	require.NotNil(t, s.IsValid(), "should be invalid")
 
 	s.UserId = NewId()
-	require.Error(t, s.IsValid(), "should be invalid")
+	require.NotNil(t, s.IsValid(), "should be invalid")
 
 	s.TermsOfServiceId = NewId()
-	require.Error(t, s.IsValid(), "should be invalid")
+	require.NotNil(t, s.IsValid(), "should be invalid")
 
 	s.CreateAt = GetMillis()
 	require.Nil(t, s.IsValid(), "should be valid")

model/user_test.go

@@ -126,11 +126,11 @@ func TestUserIsValid(t *testing.T) {
 	require.True(t, HasExpectedUserIsValidError(err, "nickname", user.Id), "expected user is valid error: %s", err.Error())
 
 	user.Nickname = strings.Repeat("a", 64)
-	require.Error(t, user.IsValid())
+	require.Nil(t, user.IsValid())
 
 	user.FirstName = ""
 	user.LastName = ""
-	require.Error(t, user.IsValid())
+	require.Nil(t, user.IsValid())
 
 	user.FirstName = strings.Repeat("a", 65)
 	err = user.IsValid()
@@ -143,7 +143,7 @@ func TestUserIsValid(t *testing.T) {
 
 	user.LastName = strings.Repeat("a", 64)
 	user.Position = strings.Repeat("a", 128)
-	require.Error(t, user.IsValid())
+	require.Nil(t, user.IsValid())
 
 	user.Position = strings.Repeat("a", 129)
 	err = user.IsValid()

model/websocket_client_test.go

@@ -22,7 +22,7 @@ func dummyWebsocketHandler(t *testing.T) http.HandlerFunc {
 			WriteBufferSize: 1024,
 		}
 		conn, err := upgrader.Upgrade(w, req, nil)
-		require.Nil(t, err)
+		require.NoError(t, err)
 		var buf []byte
 		for {
 			_, buf, err = conn.ReadMessage()