From e6cde25466e03ec864cd9defed96957e741b5e7c Mon Sep 17 00:00:00 2001 From: Vyr Cossont Date: Thu, 2 Mar 2023 03:06:40 -0800 Subject: [feature] Advertise rich text formats, support content_type field (#1370) * Advertise rich text formats, support content_type field * Update JSON in instance patch tests * Replace format with content_type everywhere * update migration to work with both pg and sqlite * regenerate swagger docs * update instance serialization + tests * fix up * learn to code tobi please, i'm begging you --------- Co-authored-by: tsmethurst --- internal/api/client/accounts/accountupdate_test.go | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'internal/api/client/accounts/accountupdate_test.go') diff --git a/internal/api/client/accounts/accountupdate_test.go b/internal/api/client/accounts/accountupdate_test.go index 95387f3d7..f898e64da 100644 --- a/internal/api/client/accounts/accountupdate_test.go +++ b/internal/api/client/accounts/accountupdate_test.go @@ -414,13 +414,13 @@ func (suite *AccountUpdateTestSuite) TestAccountUpdateCredentialsPATCHHandlerUpd suite.True(apimodelAccount.Locked) } -func (suite *AccountUpdateTestSuite) TestAccountUpdateCredentialsPATCHHandlerUpdateStatusFormatOK() { +func (suite *AccountUpdateTestSuite) TestAccountUpdateCredentialsPATCHHandlerUpdateStatusContentTypeOK() { // set up the request // we're updating the language of zork requestBody, w, err := testrig.CreateMultipartFormData( "", "", map[string]string{ - "source[status_format]": "markdown", + "source[status_content_type]": "text/markdown", }) if err != nil { panic(err) @@ -450,22 +450,22 @@ func (suite *AccountUpdateTestSuite) TestAccountUpdateCredentialsPATCHHandlerUpd // check the returned api model account // fields should be updated - suite.Equal("markdown", apimodelAccount.Source.StatusFormat) + suite.Equal("text/markdown", apimodelAccount.Source.StatusContentType) dbAccount, err := suite.db.GetAccountByID(context.Background(), suite.testAccounts["local_account_1"].ID) if err != nil { suite.FailNow(err.Error()) } - suite.Equal(dbAccount.StatusFormat, "markdown") + suite.Equal(dbAccount.StatusContentType, "text/markdown") } -func (suite *AccountUpdateTestSuite) TestAccountUpdateCredentialsPATCHHandlerUpdateStatusFormatBad() { +func (suite *AccountUpdateTestSuite) TestAccountUpdateCredentialsPATCHHandlerUpdateStatusContentTypeBad() { // set up the request // we're updating the language of zork requestBody, w, err := testrig.CreateMultipartFormData( "", "", map[string]string{ - "source[status_format]": "peepeepoopoo", + "source[status_content_type]": "peepeepoopoo", }) if err != nil { panic(err) @@ -486,7 +486,7 @@ func (suite *AccountUpdateTestSuite) TestAccountUpdateCredentialsPATCHHandlerUpd b, err := ioutil.ReadAll(result.Body) suite.NoError(err) - suite.Equal(`{"error":"Bad Request: status format 'peepeepoopoo' was not recognized, valid options are 'plain', 'markdown'"}`, string(b)) + suite.Equal(`{"error":"Bad Request: status content type 'peepeepoopoo' was not recognized, valid options are 'text/plain', 'text/markdown'"}`, string(b)) } func TestAccountUpdateTestSuite(t *testing.T) { -- cgit v1.2.3