From 0e29f1f5bb68a48d9b837d7f4e0a16370734955b Mon Sep 17 00:00:00 2001 From: tobi <31960611+tsmethurst@users.noreply.github.com> Date: Tue, 9 May 2023 12:16:10 +0200 Subject: [feature] Enable federation in/out of profile PropertyValue fields (#1722) Co-authored-by: kim Co-authored-by: kim <89579420+NyaaaWhatsUpDoc@users.noreply.github.com> --- internal/validate/formvalidation_test.go | 57 +++++++++++++++----------------- 1 file changed, 27 insertions(+), 30 deletions(-) (limited to 'internal/validate/formvalidation_test.go') diff --git a/internal/validate/formvalidation_test.go b/internal/validate/formvalidation_test.go index fa59977b9..9cfa07700 100644 --- a/internal/validate/formvalidation_test.go +++ b/internal/validate/formvalidation_test.go @@ -24,7 +24,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/suite" - "github.com/superseriousbusiness/gotosocial/internal/api/model" + "github.com/superseriousbusiness/gotosocial/internal/gtsmodel" "github.com/superseriousbusiness/gotosocial/internal/validate" ) @@ -268,37 +268,34 @@ func (suite *ValidationTestSuite) TestValidateReason() { } } -func (suite *ValidationTestSuite) TestValidateProfileFieldsCount() { - noFields := []model.UpdateField{} - fewFields := []model.UpdateField{{}, {}} - tooManyFields := []model.UpdateField{{}, {}, {}, {}, {}} - err := validate.ProfileFieldsCount(tooManyFields) - if assert.Error(suite.T(), err) { - assert.Equal(suite.T(), errors.New("cannot have more than 4 profile fields"), err) - } - - err = validate.ProfileFieldsCount(noFields) - assert.NoError(suite.T(), err) - - err = validate.ProfileFieldsCount(fewFields) - assert.NoError(suite.T(), err) -} - func (suite *ValidationTestSuite) TestValidateProfileField() { - shortProfileField := "pronouns" - tooLongProfileField := "Lorem ipsum dolor sit amet, consectetur adipiscing elit. Integer eu bibendum elit. Sed ac interdum nisi. Vestibulum vulputate eros quis euismod imperdiet. Nulla sit amet dui sit amet lorem consectetur iaculis. Mauris eget lacinia metus. Curabitur nec dui eleifend massa nunc." - trimmedProfileField := "Lorem ipsum dolor sit amet, consectetur adipiscing elit. Integer eu bibendum elit. Sed ac interdum nisi. Vestibulum vulputate eros quis euismod imperdiet. Nulla sit amet dui sit amet lorem consectetur iaculis. Mauris eget lacinia metus. Curabitur nec dui " - - validated := validate.ProfileField(&shortProfileField) - assert.Equal(suite.T(), shortProfileField, validated) - - validated = validate.ProfileField(&tooLongProfileField) - assert.Len(suite.T(), validated, 255) - assert.Equal(suite.T(), trimmedProfileField, validated) + var ( + shortProfileField = "pronouns" + tooLongProfileField = "Lorem ipsum dolor sit amet, consectetur adipiscing elit. Integer eu bibendum elit. Sed ac interdum nisi. Vestibulum vulputate eros quis euismod imperdiet. Nulla sit amet dui sit amet lorem consectetur iaculis. Mauris eget lacinia metus. Curabitur nec dui eleifend massa nunc." + trimmedProfileField = "Lorem ipsum dolor sit amet, consectetur adipiscing elit. Integer eu bibendum elit. Sed ac interdum nisi. Vestibulum vulputate eros quis euismod imperdiet. Nulla sit amet dui sit amet lorem consectetur iaculis. Mauris eget lacinia metus. Curabitur nec dui " + err error + ) + + okFields := []*gtsmodel.Field{ + { + Name: "example", + Value: shortProfileField, + }, + } + err = validate.ProfileFields(okFields) + suite.NoError(err) + suite.Equal(shortProfileField, okFields[0].Value) - validated = validate.ProfileField(&trimmedProfileField) - assert.Len(suite.T(), validated, 255) - assert.Equal(suite.T(), trimmedProfileField, validated) + dodgyFields := []*gtsmodel.Field{ + { + Name: "example", + Value: tooLongProfileField, + }, + } + err = validate.ProfileFields(dodgyFields) + suite.NoError(err) + suite.Equal(trimmedProfileField, dodgyFields[0].Value) + suite.Len(dodgyFields[0].Value, 255) } func TestValidationTestSuite(t *testing.T) { -- cgit v1.2.3