Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[chore/bugfix/horror] Allow expires_in and poll choices to be parsed from strings #2346

Merged
merged 3 commits into from Nov 10, 2023
Merged

[chore/bugfix/horror] Allow expires_in and poll choices to be parsed from strings #2346

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
c06243d
allow multiple values for test form fields
tsmethurst Nov 10, 2023
7b77b56
allow json poll fields to parse as floats or strings
tsmethurst Nov 10, 2023
81f0f73
tests, lint
tsmethurst Nov 10, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
44 changes: 22 additions & 22 deletions internal/api/auth/token_test.go
View file
Open in desktop
Expand Up @@ -58,11 +58,11 @@ func (suite *TokenTestSuite) TestRetrieveClientCredentialsOK() {

requestBody, w, err := testrig.CreateMultipartFormData(
"", "",
map[string]string{
"grant_type": "client_credentials",
"client_id": testClient.ID,
"client_secret": testClient.Secret,
"redirect_uri": "http://localhost:8080",
map[string][]string{
"grant_type": {"client_credentials"},
"client_id": {testClient.ID},
"client_secret": {testClient.Secret},
"redirect_uri": {"http://localhost:8080"},
})
if err != nil {
panic(err)
Expand Down Expand Up @@ -104,12 +104,12 @@ func (suite *TokenTestSuite) TestRetrieveAuthorizationCodeOK() {

requestBody, w, err := testrig.CreateMultipartFormData(
"", "",
map[string]string{
"grant_type": "authorization_code",
"client_id": testClient.ID,
"client_secret": testClient.Secret,
"redirect_uri": "http://localhost:8080",
"code": testUserAuthorizationToken.Code,
map[string][]string{
"grant_type": {"authorization_code"},
"client_id": {testClient.ID},
"client_secret": {testClient.Secret},
"redirect_uri": {"http://localhost:8080"},
"code": {testUserAuthorizationToken.Code},
})
if err != nil {
panic(err)
Expand Down Expand Up @@ -149,11 +149,11 @@ func (suite *TokenTestSuite) TestRetrieveAuthorizationCodeNoCode() {

requestBody, w, err := testrig.CreateMultipartFormData(
"", "",
map[string]string{
"grant_type": "authorization_code",
"client_id": testClient.ID,
"client_secret": testClient.Secret,
"redirect_uri": "http://localhost:8080",
map[string][]string{
"grant_type": {"authorization_code"},
"client_id": {testClient.ID},
"client_secret": {testClient.Secret},
"redirect_uri": {"http://localhost:8080"},
})
if err != nil {
panic(err)
Expand Down Expand Up @@ -181,12 +181,12 @@ func (suite *TokenTestSuite) TestRetrieveAuthorizationCodeWrongGrantType() {

requestBody, w, err := testrig.CreateMultipartFormData(
"", "",
map[string]string{
"grant_type": "client_credentials",
"client_id": testClient.ID,
"client_secret": testClient.Secret,
"redirect_uri": "http://localhost:8080",
"code": "peepeepoopoo",
map[string][]string{
"grant_type": {"client_credentials"},
"client_id": {testClient.ID},
"client_secret": {testClient.Secret},
"redirect_uri": {"http://localhost:8080"},
"code": {"peepeepoopoo"},
})
if err != nil {
panic(err)
Expand Down
10 changes: 5 additions & 5 deletions internal/api/client/accounts/accountdelete_test.go
View file
Open in desktop
Expand Up @@ -36,8 +36,8 @@ func (suite *AccountDeleteTestSuite) TestAccountDeletePOSTHandler() {
// we're deleting zork
requestBody, w, err := testrig.CreateMultipartFormData(
"", "",
map[string]string{
"password": "password",
map[string][]string{
"password": {"password"},
})
if err != nil {
panic(err)
Expand All @@ -58,8 +58,8 @@ func (suite *AccountDeleteTestSuite) TestAccountDeletePOSTHandlerWrongPassword()
// we're deleting zork
requestBody, w, err := testrig.CreateMultipartFormData(
"", "",
map[string]string{
"password": "aaaaaaaaaaaaaaaaaaaaaaaaaaaa",
map[string][]string{
"password": {"aaaaaaaaaaaaaaaaaaaaaaaaaaaa"},
})
if err != nil {
panic(err)
Expand All @@ -80,7 +80,7 @@ func (suite *AccountDeleteTestSuite) TestAccountDeletePOSTHandlerNoPassword() {
// we're deleting zork
requestBody, w, err := testrig.CreateMultipartFormData(
"", "",
map[string]string{})
map[string][]string{})
if err != nil {
panic(err)
}
Expand Down
114 changes: 59 additions & 55 deletions internal/api/client/accounts/accountupdate_test.go
View file
Open in desktop
Expand Up @@ -38,15 +38,19 @@ type AccountUpdateTestSuite struct {
AccountStandardTestSuite
}

func (suite *AccountUpdateTestSuite) updateAccountFromForm(data map[string]string, expectedHTTPStatus int, expectedBody string) (*apimodel.Account, error) {
func (suite *AccountUpdateTestSuite) updateAccountFromForm(data map[string][]string, expectedHTTPStatus int, expectedBody string) (*apimodel.Account, error) {
form := url.Values{}
for key, val := range data {
form[key] = []string{val}
if form.Has(key) {
form[key] = append(form[key], val...)
} else {
form[key] = val
}
}
return suite.updateAccount([]byte(form.Encode()), "application/x-www-form-urlencoded", expectedHTTPStatus, expectedBody)
}

func (suite *AccountUpdateTestSuite) updateAccountFromFormData(data map[string]string, expectedHTTPStatus int, expectedBody string) (*apimodel.Account, error) {
func (suite *AccountUpdateTestSuite) updateAccountFromFormData(data map[string][]string, expectedHTTPStatus int, expectedBody string) (*apimodel.Account, error) {
requestBody, w, err := testrig.CreateMultipartFormData("", "", data)
if err != nil {
suite.FailNow(err.Error())
Expand All @@ -55,7 +59,7 @@ func (suite *AccountUpdateTestSuite) updateAccountFromFormData(data map[string]s
return suite.updateAccount(requestBody.Bytes(), w.FormDataContentType(), expectedHTTPStatus, expectedBody)
}

func (suite *AccountUpdateTestSuite) updateAccountFromFormDataWithFile(fieldName string, fileName string, data map[string]string, expectedHTTPStatus int, expectedBody string) (*apimodel.Account, error) {
func (suite *AccountUpdateTestSuite) updateAccountFromFormDataWithFile(fieldName string, fileName string, data map[string][]string, expectedHTTPStatus int, expectedBody string) (*apimodel.Account, error) {
requestBody, w, err := testrig.CreateMultipartFormData(fieldName, fileName, data)
if err != nil {
suite.FailNow(err.Error())
Expand Down Expand Up @@ -116,12 +120,12 @@ func (suite *AccountUpdateTestSuite) updateAccount(
}

func (suite *AccountUpdateTestSuite) TestUpdateAccountBasicForm() {
data := map[string]string{
"note": "this is my new bio read it and weep",
"fields_attributes[0][name]": "pronouns",
"fields_attributes[0][value]": "they/them",
"fields_attributes[1][name]": "Website",
"fields_attributes[1][value]": "https://example.com",
data := map[string][]string{
"note": {"this is my new bio read it and weep"},
"fields_attributes[0][name]": {"pronouns"},
"fields_attributes[0][value]": {"they/them"},
"fields_attributes[1][name]": {"Website"},
"fields_attributes[1][value]": {"https://example.com"},
}

apimodelAccount, err := suite.updateAccountFromForm(data, http.StatusOK, "")
Expand All @@ -142,12 +146,12 @@ func (suite *AccountUpdateTestSuite) TestUpdateAccountBasicForm() {
}

func (suite *AccountUpdateTestSuite) TestUpdateAccountBasicFormData() {
data := map[string]string{
"note": "this is my new bio read it and weep",
"fields_attributes[0][name]": "pronouns",
"fields_attributes[0][value]": "they/them",
"fields_attributes[1][name]": "Website",
"fields_attributes[1][value]": "https://example.com",
data := map[string][]string{
"note": {"this is my new bio read it and weep"},
"fields_attributes[0][name]": {"pronouns"},
"fields_attributes[0][value]": {"they/them"},
"fields_attributes[1][name]": {"Website"},
"fields_attributes[1][value]": {"https://example.com"},
}

apimodelAccount, err := suite.updateAccountFromFormData(data, http.StatusOK, "")
Expand Down Expand Up @@ -202,8 +206,8 @@ func (suite *AccountUpdateTestSuite) TestUpdateAccountBasicJSON() {
}

func (suite *AccountUpdateTestSuite) TestUpdateAccountLockForm() {
data := map[string]string{
"locked": "true",
data := map[string][]string{
"locked": {"true"},
}

apimodelAccount, err := suite.updateAccountFromForm(data, http.StatusOK, "")
Expand All @@ -215,8 +219,8 @@ func (suite *AccountUpdateTestSuite) TestUpdateAccountLockForm() {
}

func (suite *AccountUpdateTestSuite) TestUpdateAccountLockFormData() {
data := map[string]string{
"locked": "true",
data := map[string][]string{
"locked": {"true"},
}

apimodelAccount, err := suite.updateAccountFromFormData(data, http.StatusOK, "")
Expand All @@ -242,8 +246,8 @@ func (suite *AccountUpdateTestSuite) TestUpdateAccountLockJSON() {
}

func (suite *AccountUpdateTestSuite) TestUpdateAccountUnlockForm() {
data := map[string]string{
"locked": "false",
data := map[string][]string{
"locked": {"false"},
}

apimodelAccount, err := suite.updateAccountFromForm(data, http.StatusOK, "")
Expand All @@ -255,8 +259,8 @@ func (suite *AccountUpdateTestSuite) TestUpdateAccountUnlockForm() {
}

func (suite *AccountUpdateTestSuite) TestUpdateAccountUnlockFormData() {
data := map[string]string{
"locked": "false",
data := map[string][]string{
"locked": {"false"},
}

apimodelAccount, err := suite.updateAccountFromFormData(data, http.StatusOK, "")
Expand Down Expand Up @@ -289,8 +293,8 @@ func (suite *AccountUpdateTestSuite) TestUpdateAccountCache() {
suite.FailNow(err.Error())
}

data := map[string]string{
"note": "this is my new bio read it and weep",
data := map[string][]string{
"note": {"this is my new bio read it and weep"},
}

apimodelAccount, err := suite.updateAccountFromFormData(data, http.StatusOK, "")
Expand All @@ -302,8 +306,8 @@ func (suite *AccountUpdateTestSuite) TestUpdateAccountCache() {
}

func (suite *AccountUpdateTestSuite) TestUpdateAccountDiscoverableForm() {
data := map[string]string{
"discoverable": "false",
data := map[string][]string{
"discoverable": {"false"},
}

apimodelAccount, err := suite.updateAccountFromForm(data, http.StatusOK, "")
Expand All @@ -320,8 +324,8 @@ func (suite *AccountUpdateTestSuite) TestUpdateAccountDiscoverableForm() {
}

func (suite *AccountUpdateTestSuite) TestUpdateAccountDiscoverableFormData() {
data := map[string]string{
"discoverable": "false",
data := map[string][]string{
"discoverable": {"false"},
}

apimodelAccount, err := suite.updateAccountFromFormData(data, http.StatusOK, "")
Expand Down Expand Up @@ -357,18 +361,18 @@ func (suite *AccountUpdateTestSuite) TestUpdateAccountDiscoverableJSON() {
}

func (suite *AccountUpdateTestSuite) TestUpdateAccountWithImageFormData() {
data := map[string]string{
"display_name": "updated zork display name!!!",
"note": "",
"locked": "true",
data := map[string][]string{
"display_name": {"updated zork display name!!!"},
"note": {""},
"locked": {"true"},
}

apimodelAccount, err := suite.updateAccountFromFormDataWithFile("header", "../../../../testrig/media/test-jpeg.jpg", data, http.StatusOK, "")
if err != nil {
suite.FailNow(err.Error())
}

suite.Equal(data["display_name"], apimodelAccount.DisplayName)
suite.Equal(data["display_name"][0], apimodelAccount.DisplayName)
suite.True(apimodelAccount.Locked)
suite.Empty(apimodelAccount.Note)
suite.Empty(apimodelAccount.Source.Note)
Expand All @@ -382,7 +386,7 @@ func (suite *AccountUpdateTestSuite) TestUpdateAccountWithImageFormData() {
}

func (suite *AccountUpdateTestSuite) TestUpdateAccountEmptyForm() {
data := make(map[string]string)
data := make(map[string][]string)

_, err := suite.updateAccountFromForm(data, http.StatusBadRequest, `{"error":"Bad Request: empty form submitted"}`)
if err != nil {
Expand All @@ -391,7 +395,7 @@ func (suite *AccountUpdateTestSuite) TestUpdateAccountEmptyForm() {
}

func (suite *AccountUpdateTestSuite) TestUpdateAccountEmptyFormData() {
data := make(map[string]string)
data := make(map[string][]string)

_, err := suite.updateAccountFromFormData(data, http.StatusBadRequest, `{"error":"Bad Request: empty form submitted"}`)
if err != nil {
Expand All @@ -400,38 +404,38 @@ func (suite *AccountUpdateTestSuite) TestUpdateAccountEmptyFormData() {
}

func (suite *AccountUpdateTestSuite) TestUpdateAccountSourceForm() {
data := map[string]string{
"source[privacy]": string(apimodel.VisibilityPrivate),
"source[language]": "de",
"source[sensitive]": "true",
"locked": "true",
data := map[string][]string{
"source[privacy]": {string(apimodel.VisibilityPrivate)},
"source[language]": {"de"},
"source[sensitive]": {"true"},
"locked": {"true"},
}

apimodelAccount, err := suite.updateAccountFromForm(data, http.StatusOK, "")
if err != nil {
suite.FailNow(err.Error())
}

suite.Equal(data["source[language]"], apimodelAccount.Source.Language)
suite.Equal(data["source[language]"][0], apimodelAccount.Source.Language)
suite.EqualValues(apimodel.VisibilityPrivate, apimodelAccount.Source.Privacy)
suite.True(apimodelAccount.Source.Sensitive)
suite.True(apimodelAccount.Locked)
}

func (suite *AccountUpdateTestSuite) TestUpdateAccountSourceFormData() {
data := map[string]string{
"source[privacy]": string(apimodel.VisibilityPrivate),
"source[language]": "de",
"source[sensitive]": "true",
"locked": "true",
data := map[string][]string{
"source[privacy]": {string(apimodel.VisibilityPrivate)},
"source[language]": {"de"},
"source[sensitive]": {"true"},
"locked": {"true"},
}

apimodelAccount, err := suite.updateAccountFromFormData(data, http.StatusOK, "")
if err != nil {
suite.FailNow(err.Error())
}

suite.Equal(data["source[language]"], apimodelAccount.Source.Language)
suite.Equal(data["source[language]"][0], apimodelAccount.Source.Language)
suite.EqualValues(apimodel.VisibilityPrivate, apimodelAccount.Source.Privacy)
suite.True(apimodelAccount.Source.Sensitive)
suite.True(apimodelAccount.Locked)
Expand Down Expand Up @@ -461,28 +465,28 @@ func (suite *AccountUpdateTestSuite) TestUpdateAccountSourceJSON() {
}

func (suite *AccountUpdateTestSuite) TestUpdateAccountSourceBadContentTypeFormData() {
data := map[string]string{
"source[status_content_type]": "text/markdown",
data := map[string][]string{
"source[status_content_type]": {"text/markdown"},
}

apimodelAccount, err := suite.updateAccountFromFormData(data, http.StatusOK, "")
if err != nil {
suite.FailNow(err.Error())
}

suite.Equal(data["source[status_content_type]"], apimodelAccount.Source.StatusContentType)
suite.Equal(data["source[status_content_type]"][0], apimodelAccount.Source.StatusContentType)

// Check the account in the database too.
dbAccount, err := suite.db.GetAccountByID(context.Background(), suite.testAccounts["local_account_1"].ID)
if err != nil {
suite.FailNow(err.Error())
}
suite.Equal(data["source[status_content_type]"], dbAccount.StatusContentType)
suite.Equal(data["source[status_content_type]"][0], dbAccount.StatusContentType)
}

func (suite *AccountUpdateTestSuite) TestAccountUpdateCredentialsPATCHHandlerUpdateStatusContentTypeBad() {
data := map[string]string{
"source[status_content_type]": "peepeepoopoo",
data := map[string][]string{
"source[status_content_type]": {"peepeepoopoo"},
}

_, err := suite.updateAccountFromFormData(data, http.StatusBadRequest, `{"error":"Bad Request: status content type 'peepeepoopoo' was not recognized, valid options are 'text/plain', 'text/markdown'"}`)
Expand Down