mirror of
				https://github.com/superseriousbusiness/gotosocial.git
				synced 2025-10-31 02:42:25 -05:00 
			
		
		
		
	Follow request improvements (#282)
* tiny doc update * add rejectfollowrequest to db * add follow request reject to processor * add reject handler * tidy up follow request api * tidy up federation call * regenerate swagger docs * api endpoint tests * processor test * add reject federatingdb handler * start writing reject tests * test reject follow request * go fmt * increase sleep for slow test setups * more relaxed time.sleep
This commit is contained in:
		
					parent
					
						
							
								107685e22e
							
						
					
				
			
			
				commit
				
					
						15621f5324
					
				
			
		
					 24 changed files with 1256 additions and 69 deletions
				
			
		
							
								
								
									
										87
									
								
								internal/api/client/followrequest/reject_test.go
									
										
									
									
									
										Normal file
									
								
							
							
						
						
									
										87
									
								
								internal/api/client/followrequest/reject_test.go
									
										
									
									
									
										Normal file
									
								
							|  | @ -0,0 +1,87 @@ | |||
| /* | ||||
|    GoToSocial | ||||
|    Copyright (C) 2021 GoToSocial Authors admin@gotosocial.org | ||||
| 
 | ||||
|    This program is free software: you can redistribute it and/or modify | ||||
|    it under the terms of the GNU Affero General Public License as published by | ||||
|    the Free Software Foundation, either version 3 of the License, or | ||||
|    (at your option) any later version. | ||||
| 
 | ||||
|    This program is distributed in the hope that it will be useful, | ||||
|    but WITHOUT ANY WARRANTY; without even the implied warranty of | ||||
|    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the | ||||
|    GNU Affero General Public License for more details. | ||||
| 
 | ||||
|    You should have received a copy of the GNU Affero General Public License | ||||
|    along with this program.  If not, see <http://www.gnu.org/licenses/>. | ||||
| */ | ||||
| 
 | ||||
| package followrequest_test | ||||
| 
 | ||||
| import ( | ||||
| 	"context" | ||||
| 	"fmt" | ||||
| 	"io/ioutil" | ||||
| 	"net/http" | ||||
| 	"net/http/httptest" | ||||
| 	"testing" | ||||
| 	"time" | ||||
| 
 | ||||
| 	"github.com/gin-gonic/gin" | ||||
| 	"github.com/stretchr/testify/assert" | ||||
| 	"github.com/stretchr/testify/suite" | ||||
| 	"github.com/superseriousbusiness/gotosocial/internal/api/client/followrequest" | ||||
| 	"github.com/superseriousbusiness/gotosocial/internal/gtsmodel" | ||||
| ) | ||||
| 
 | ||||
| type RejectTestSuite struct { | ||||
| 	FollowRequestStandardTestSuite | ||||
| } | ||||
| 
 | ||||
| func (suite *RejectTestSuite) TestReject() { | ||||
| 	requestingAccount := suite.testAccounts["remote_account_2"] | ||||
| 	targetAccount := suite.testAccounts["local_account_1"] | ||||
| 
 | ||||
| 	// put a follow request in the database | ||||
| 	fr := >smodel.FollowRequest{ | ||||
| 		ID:              "01FJ1S8DX3STJJ6CEYPMZ1M0R3", | ||||
| 		CreatedAt:       time.Now(), | ||||
| 		UpdatedAt:       time.Now(), | ||||
| 		URI:             fmt.Sprintf("%s/follow/01FJ1S8DX3STJJ6CEYPMZ1M0R3", requestingAccount.URI), | ||||
| 		AccountID:       requestingAccount.ID, | ||||
| 		TargetAccountID: targetAccount.ID, | ||||
| 	} | ||||
| 
 | ||||
| 	err := suite.db.Put(context.Background(), fr) | ||||
| 	suite.NoError(err) | ||||
| 
 | ||||
| 	recorder := httptest.NewRecorder() | ||||
| 	ctx := suite.newContext(recorder, http.MethodPost, []byte{}, fmt.Sprintf("/api/v1/follow_requests/%s/reject", requestingAccount.ID), "") | ||||
| 
 | ||||
| 	ctx.Params = gin.Params{ | ||||
| 		gin.Param{ | ||||
| 			Key:   followrequest.IDKey, | ||||
| 			Value: requestingAccount.ID, | ||||
| 		}, | ||||
| 	} | ||||
| 
 | ||||
| 	// call the handler | ||||
| 	suite.followRequestModule.FollowRequestRejectPOSTHandler(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) | ||||
| 
 | ||||
| 	suite.Equal(`{"id":"01FHMQX3GAABWSM0S2VZEC2SWC","following":false,"showing_reblogs":false,"notifying":false,"followed_by":false,"blocking":false,"blocked_by":false,"muting":false,"muting_notifications":false,"requested":false,"domain_blocking":false,"endorsed":false,"note":""}`, string(b)) | ||||
| } | ||||
| 
 | ||||
| func TestRejectTestSuite(t *testing.T) { | ||||
| 	suite.Run(t, &RejectTestSuite{}) | ||||
| } | ||||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue