mirror of
				https://github.com/superseriousbusiness/gotosocial.git
				synced 2025-10-31 04:22:25 -05:00 
			
		
		
		
	kim is a reply guy (#208)
* bun debug * bun trace logging hooks * more tests * fix up some stuffffff * drop the frontend cache until a proper fix is made * go fmt
This commit is contained in:
		
					parent
					
						
							
								64bd689e55
							
						
					
				
			
			
				commit
				
					
						9dc2255a8f
					
				
			
		
					 20 changed files with 537 additions and 163 deletions
				
			
		|  | @ -19,8 +19,8 @@ | |||
| package account_test | ||||
| 
 | ||||
| import ( | ||||
| 	"context" | ||||
| 	"encoding/json" | ||||
| 	"fmt" | ||||
| 	"io/ioutil" | ||||
| 	"net/http" | ||||
| 	"net/http/httptest" | ||||
|  | @ -37,22 +37,224 @@ type AccountUpdateTestSuite struct { | |||
| 	AccountStandardTestSuite | ||||
| } | ||||
| 
 | ||||
| func (suite *AccountUpdateTestSuite) TestAccountUpdateCredentialsPATCHHandlerSimple() { | ||||
| func (suite *AccountUpdateTestSuite) TestAccountUpdateCredentialsPATCHHandler() { | ||||
| 	// set up the request | ||||
| 	// we're updating the header image, the display name, and the locked status of zork | ||||
| 	// we're removing the note/bio | ||||
| 	// we're updating the note of zork | ||||
| 	newBio := "this is my new bio read it and weep" | ||||
| 	requestBody, w, err := testrig.CreateMultipartFormData( | ||||
| 		"header", "../../../../testrig/media/test-jpeg.jpg", | ||||
| 		"", "", | ||||
| 		map[string]string{ | ||||
| 			"display_name": "updated zork display name!!!", | ||||
| 			"note":         "", | ||||
| 			"locked":       "true", | ||||
| 			"note": newBio, | ||||
| 		}) | ||||
| 	if err != nil { | ||||
| 		panic(err) | ||||
| 	} | ||||
| 	bodyBytes := requestBody.Bytes() | ||||
| 	recorder := httptest.NewRecorder() | ||||
| 	ctx := suite.newContext(recorder, http.MethodPatch, requestBody.Bytes(), account.UpdateCredentialsPath, w.FormDataContentType()) | ||||
| 	ctx := suite.newContext(recorder, http.MethodPatch, bodyBytes, account.UpdateCredentialsPath, w.FormDataContentType()) | ||||
| 
 | ||||
| 	// call the handler | ||||
| 	suite.accountModule.AccountUpdateCredentialsPATCHHandler(ctx) | ||||
| 
 | ||||
| 	// 1. we should have OK because our request was valid | ||||
| 	suite.Equal(http.StatusOK, recorder.Code) | ||||
| 
 | ||||
| 	// 2. we should have no error message in the result body | ||||
| 	result := recorder.Result() | ||||
| 	defer result.Body.Close() | ||||
| 
 | ||||
| 	// check the response | ||||
| 	b, err := ioutil.ReadAll(result.Body) | ||||
| 	assert.NoError(suite.T(), err) | ||||
| 
 | ||||
| 	// unmarshal the returned account | ||||
| 	apimodelAccount := &apimodel.Account{} | ||||
| 	err = json.Unmarshal(b, apimodelAccount) | ||||
| 	suite.NoError(err) | ||||
| 
 | ||||
| 	// check the returned api model account | ||||
| 	// fields should be updated | ||||
| 	suite.Equal("<p>this is my new bio read it and weep</p>", apimodelAccount.Note) | ||||
| } | ||||
| 
 | ||||
| func (suite *AccountUpdateTestSuite) TestAccountUpdateCredentialsPATCHHandlerUnlockLock() { | ||||
| 	// set up the first request | ||||
| 	requestBody1, w1, err := testrig.CreateMultipartFormData( | ||||
| 		"", "", | ||||
| 		map[string]string{ | ||||
| 			"locked": "false", | ||||
| 		}) | ||||
| 	if err != nil { | ||||
| 		panic(err) | ||||
| 	} | ||||
| 	bodyBytes1 := requestBody1.Bytes() | ||||
| 	recorder1 := httptest.NewRecorder() | ||||
| 	ctx1 := suite.newContext(recorder1, http.MethodPatch, bodyBytes1, account.UpdateCredentialsPath, w1.FormDataContentType()) | ||||
| 
 | ||||
| 	// call the handler | ||||
| 	suite.accountModule.AccountUpdateCredentialsPATCHHandler(ctx1) | ||||
| 
 | ||||
| 	// 1. we should have OK because our request was valid | ||||
| 	suite.Equal(http.StatusOK, recorder1.Code) | ||||
| 
 | ||||
| 	// 2. we should have no error message in the result body | ||||
| 	result1 := recorder1.Result() | ||||
| 	defer result1.Body.Close() | ||||
| 
 | ||||
| 	// check the response | ||||
| 	b1, err := ioutil.ReadAll(result1.Body) | ||||
| 	assert.NoError(suite.T(), err) | ||||
| 
 | ||||
| 	// unmarshal the returned account | ||||
| 	apimodelAccount1 := &apimodel.Account{} | ||||
| 	err = json.Unmarshal(b1, apimodelAccount1) | ||||
| 	suite.NoError(err) | ||||
| 
 | ||||
| 	// check the returned api model account | ||||
| 	// fields should be updated | ||||
| 	suite.False(apimodelAccount1.Locked) | ||||
| 
 | ||||
| 	// set up the first request | ||||
| 	requestBody2, w2, err := testrig.CreateMultipartFormData( | ||||
| 		"", "", | ||||
| 		map[string]string{ | ||||
| 			"locked": "true", | ||||
| 		}) | ||||
| 	if err != nil { | ||||
| 		panic(err) | ||||
| 	} | ||||
| 	bodyBytes2 := requestBody2.Bytes() | ||||
| 	recorder2 := httptest.NewRecorder() | ||||
| 	ctx2 := suite.newContext(recorder2, http.MethodPatch, bodyBytes2, account.UpdateCredentialsPath, w2.FormDataContentType()) | ||||
| 
 | ||||
| 	// call the handler | ||||
| 	suite.accountModule.AccountUpdateCredentialsPATCHHandler(ctx2) | ||||
| 
 | ||||
| 	// 1. we should have OK because our request was valid | ||||
| 	suite.Equal(http.StatusOK, recorder1.Code) | ||||
| 
 | ||||
| 	// 2. we should have no error message in the result body | ||||
| 	result2 := recorder2.Result() | ||||
| 	defer result2.Body.Close() | ||||
| 
 | ||||
| 	// check the response | ||||
| 	b2, err := ioutil.ReadAll(result2.Body) | ||||
| 	suite.NoError(err) | ||||
| 
 | ||||
| 	// unmarshal the returned account | ||||
| 	apimodelAccount2 := &apimodel.Account{} | ||||
| 	err = json.Unmarshal(b2, apimodelAccount2) | ||||
| 	suite.NoError(err) | ||||
| 
 | ||||
| 	// check the returned api model account | ||||
| 	// fields should be updated | ||||
| 	suite.True(apimodelAccount2.Locked) | ||||
| } | ||||
| 
 | ||||
| func (suite *AccountUpdateTestSuite) TestAccountUpdateCredentialsPATCHHandlerGetAccountFirst() { | ||||
| 	// get the account first to make sure it's in the database cache -- when the account is updated via | ||||
| 	// the PATCH handler, it should invalidate the cache and not return the old version | ||||
| 	_, err := suite.db.GetAccountByID(context.Background(), suite.testAccounts["local_account_1"].ID) | ||||
| 	suite.NoError(err) | ||||
| 
 | ||||
| 	// set up the request | ||||
| 	// we're updating the note of zork | ||||
| 	newBio := "this is my new bio read it and weep" | ||||
| 	requestBody, w, err := testrig.CreateMultipartFormData( | ||||
| 		"", "", | ||||
| 		map[string]string{ | ||||
| 			"note": newBio, | ||||
| 		}) | ||||
| 	if err != nil { | ||||
| 		panic(err) | ||||
| 	} | ||||
| 	bodyBytes := requestBody.Bytes() | ||||
| 	recorder := httptest.NewRecorder() | ||||
| 	ctx := suite.newContext(recorder, http.MethodPatch, bodyBytes, account.UpdateCredentialsPath, w.FormDataContentType()) | ||||
| 
 | ||||
| 	// call the handler | ||||
| 	suite.accountModule.AccountUpdateCredentialsPATCHHandler(ctx) | ||||
| 
 | ||||
| 	// 1. we should have OK because our request was valid | ||||
| 	suite.Equal(http.StatusOK, recorder.Code) | ||||
| 
 | ||||
| 	// 2. we should have no error message in the result body | ||||
| 	result := recorder.Result() | ||||
| 	defer result.Body.Close() | ||||
| 
 | ||||
| 	// check the response | ||||
| 	b, err := ioutil.ReadAll(result.Body) | ||||
| 	assert.NoError(suite.T(), err) | ||||
| 
 | ||||
| 	// unmarshal the returned account | ||||
| 	apimodelAccount := &apimodel.Account{} | ||||
| 	err = json.Unmarshal(b, apimodelAccount) | ||||
| 	suite.NoError(err) | ||||
| 
 | ||||
| 	// check the returned api model account | ||||
| 	// fields should be updated | ||||
| 	suite.Equal("<p>this is my new bio read it and weep</p>", apimodelAccount.Note) | ||||
| } | ||||
| 
 | ||||
| func (suite *AccountUpdateTestSuite) TestAccountUpdateCredentialsPATCHHandlerTwoFields() { | ||||
| 	// set up the request | ||||
| 	// we're updating the note of zork, and setting locked to true | ||||
| 	newBio := "this is my new bio read it and weep" | ||||
| 	requestBody, w, err := testrig.CreateMultipartFormData( | ||||
| 		"", "", | ||||
| 		map[string]string{ | ||||
| 			"note":   newBio, | ||||
| 			"locked": "true", | ||||
| 		}) | ||||
| 	if err != nil { | ||||
| 		panic(err) | ||||
| 	} | ||||
| 	bodyBytes := requestBody.Bytes() | ||||
| 	recorder := httptest.NewRecorder() | ||||
| 	ctx := suite.newContext(recorder, http.MethodPatch, bodyBytes, account.UpdateCredentialsPath, w.FormDataContentType()) | ||||
| 
 | ||||
| 	// call the handler | ||||
| 	suite.accountModule.AccountUpdateCredentialsPATCHHandler(ctx) | ||||
| 
 | ||||
| 	// 1. we should have OK because our request was valid | ||||
| 	suite.Equal(http.StatusOK, recorder.Code) | ||||
| 
 | ||||
| 	// 2. we should have no error message in the result body | ||||
| 	result := recorder.Result() | ||||
| 	defer result.Body.Close() | ||||
| 
 | ||||
| 	// check the response | ||||
| 	b, err := ioutil.ReadAll(result.Body) | ||||
| 	assert.NoError(suite.T(), err) | ||||
| 
 | ||||
| 	// unmarshal the returned account | ||||
| 	apimodelAccount := &apimodel.Account{} | ||||
| 	err = json.Unmarshal(b, apimodelAccount) | ||||
| 	suite.NoError(err) | ||||
| 
 | ||||
| 	// check the returned api model account | ||||
| 	// fields should be updated | ||||
| 	suite.Equal("<p>this is my new bio read it and weep</p>", apimodelAccount.Note) | ||||
| 	suite.True(apimodelAccount.Locked) | ||||
| } | ||||
| 
 | ||||
| func (suite *AccountUpdateTestSuite) TestAccountUpdateCredentialsPATCHHandlerWithMedia() { | ||||
| 	// set up the request | ||||
| 	// we're updating the header image, the display name, and the locked status of zork | ||||
| 	// we're removing the note/bio | ||||
| 	requestBody, w, err := testrig.CreateMultipartFormData( | ||||
| 		"header", "../../../../testrig/media/test-jpeg.jpg", | ||||
| 		map[string]string{ | ||||
| 			"display_name": "updated zork display name!!!", | ||||
| 			"note":         "", | ||||
| 			"locked":       "true", | ||||
| 		}) | ||||
| 	if err != nil { | ||||
| 		panic(err) | ||||
| 	} | ||||
| 	bodyBytes := requestBody.Bytes() | ||||
| 	recorder := httptest.NewRecorder() | ||||
| 	ctx := suite.newContext(recorder, http.MethodPatch, bodyBytes, account.UpdateCredentialsPath, w.FormDataContentType()) | ||||
| 
 | ||||
| 	// call the handler | ||||
| 	suite.accountModule.AccountUpdateCredentialsPATCHHandler(ctx) | ||||
|  | @ -67,7 +269,6 @@ func (suite *AccountUpdateTestSuite) TestAccountUpdateCredentialsPATCHHandlerSim | |||
| 	// check the response | ||||
| 	b, err := ioutil.ReadAll(result.Body) | ||||
| 	assert.NoError(suite.T(), err) | ||||
| 	fmt.Println(string(b)) | ||||
| 
 | ||||
| 	// unmarshal the returned account | ||||
| 	apimodelAccount := &apimodel.Account{} | ||||
|  | @ -90,6 +291,74 @@ func (suite *AccountUpdateTestSuite) TestAccountUpdateCredentialsPATCHHandlerSim | |||
| 	suite.NotEqual("http://localhost:8080/fileserver/01F8MH1H7YV1Z7D2C8K2730QBF/header/small/01PFPMWK2FF0D9WMHEJHR07C3Q.jpeg", apimodelAccount.HeaderStatic) | ||||
| } | ||||
| 
 | ||||
| func (suite *AccountUpdateTestSuite) TestAccountUpdateCredentialsPATCHHandlerEmptyForm() { | ||||
| 	// set up the request | ||||
| 	bodyBytes := []byte{} | ||||
| 	recorder := httptest.NewRecorder() | ||||
| 	ctx := suite.newContext(recorder, http.MethodPatch, bodyBytes, account.UpdateCredentialsPath, "") | ||||
| 
 | ||||
| 	// call the handler | ||||
| 	suite.accountModule.AccountUpdateCredentialsPATCHHandler(ctx) | ||||
| 
 | ||||
| 	// 1. we should have OK because our request was valid | ||||
| 	suite.Equal(http.StatusBadRequest, recorder.Code) | ||||
| 
 | ||||
| 	// 2. we should have no error message in the result body | ||||
| 	result := recorder.Result() | ||||
| 	defer result.Body.Close() | ||||
| 
 | ||||
| 	// check the response | ||||
| 	b, err := ioutil.ReadAll(result.Body) | ||||
| 	assert.NoError(suite.T(), err) | ||||
| 	suite.Equal(`{"error":"empty form submitted"}`, string(b)) | ||||
| } | ||||
| 
 | ||||
| func (suite *AccountUpdateTestSuite) TestAccountUpdateCredentialsPATCHHandlerUpdateSource() { | ||||
| 	// set up the request | ||||
| 	// we're updating the language of zork | ||||
| 	newLanguage := "de" | ||||
| 	requestBody, w, err := testrig.CreateMultipartFormData( | ||||
| 		"", "", | ||||
| 		map[string]string{ | ||||
| 			"source[privacy]":   string(apimodel.VisibilityPrivate), | ||||
| 			"source[language]":  "de", | ||||
| 			"source[sensitive]": "true", | ||||
| 			"locked":            "true", | ||||
| 		}) | ||||
| 	if err != nil { | ||||
| 		panic(err) | ||||
| 	} | ||||
| 	bodyBytes := requestBody.Bytes() | ||||
| 	recorder := httptest.NewRecorder() | ||||
| 	ctx := suite.newContext(recorder, http.MethodPatch, bodyBytes, account.UpdateCredentialsPath, w.FormDataContentType()) | ||||
| 
 | ||||
| 	// call the handler | ||||
| 	suite.accountModule.AccountUpdateCredentialsPATCHHandler(ctx) | ||||
| 
 | ||||
| 	// 1. we should have OK because our request was valid | ||||
| 	suite.Equal(http.StatusOK, recorder.Code) | ||||
| 
 | ||||
| 	// 2. we should have no error message in the result body | ||||
| 	result := recorder.Result() | ||||
| 	defer result.Body.Close() | ||||
| 
 | ||||
| 	// check the response | ||||
| 	b, err := ioutil.ReadAll(result.Body) | ||||
| 	assert.NoError(suite.T(), err) | ||||
| 
 | ||||
| 	// unmarshal the returned account | ||||
| 	apimodelAccount := &apimodel.Account{} | ||||
| 	err = json.Unmarshal(b, apimodelAccount) | ||||
| 	suite.NoError(err) | ||||
| 
 | ||||
| 	// check the returned api model account | ||||
| 	// fields should be updated | ||||
| 	suite.Equal(newLanguage, apimodelAccount.Source.Language) | ||||
| 	suite.EqualValues(apimodel.VisibilityPrivate, apimodelAccount.Source.Privacy) | ||||
| 	suite.True(apimodelAccount.Source.Sensitive) | ||||
| 	suite.True(apimodelAccount.Locked) | ||||
| } | ||||
| 
 | ||||
| func TestAccountUpdateTestSuite(t *testing.T) { | ||||
| 	suite.Run(t, new(AccountUpdateTestSuite)) | ||||
| } | ||||
|  |  | |||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue