fixes + db changes (#204)

* fixes + db changes

* make duration more lenient

1 files changed, 74 insertions, 0 deletions

diff --git a/internal/api/client/account/accountverify_test.go b/internal/api/client/account/accountverify_test.go
index 85b0dce50..746d2f5fe 100644
--- a/internal/api/client/account/accountverify_test.go
+++ b/internal/api/client/account/accountverify_test.go
@@ -17,3 +17,77 @@
 */
 
 package account_test
+
+import (
+	"encoding/json"
+	"io/ioutil"
+	"net/http"
+	"net/http/httptest"
+	"testing"
+	"time"
+
+	"github.com/stretchr/testify/assert"
+	"github.com/stretchr/testify/suite"
+	"github.com/superseriousbusiness/gotosocial/internal/api/client/account"
+	apimodel "github.com/superseriousbusiness/gotosocial/internal/api/model"
+	"github.com/superseriousbusiness/gotosocial/internal/gtsmodel"
+)
+
+type AccountVerifyTestSuite struct {
+	AccountStandardTestSuite
+}
+
+func (suite *AccountVerifyTestSuite) TestAccountVerifyGet() {
+	testAccount := suite.testAccounts["local_account_1"]
+
+	// set up the request
+	recorder := httptest.NewRecorder()
+	ctx := suite.newContext(recorder, http.MethodPatch, nil, account.UpdateCredentialsPath, "")
+
+	// call the handler
+	suite.accountModule.AccountVerifyGETHandler(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)
+
+	createdAt, err := time.Parse(time.RFC3339, apimodelAccount.CreatedAt)
+	suite.NoError(err)
+	lastStatusAt, err := time.Parse(time.RFC3339, apimodelAccount.LastStatusAt)
+	suite.NoError(err)
+
+	suite.Equal(testAccount.ID, apimodelAccount.ID)
+	suite.Equal(testAccount.Username, apimodelAccount.Username)
+	suite.Equal(testAccount.Username, apimodelAccount.Acct)
+	suite.Equal(testAccount.DisplayName, apimodelAccount.DisplayName)
+	suite.Equal(testAccount.Locked, apimodelAccount.Locked)
+	suite.Equal(testAccount.Bot, apimodelAccount.Bot)
+	suite.WithinDuration(testAccount.CreatedAt, createdAt, 30*time.Second) // we lose a bit of accuracy serializing so fuzz this a bit
+	suite.Equal(testAccount.URL, apimodelAccount.URL)
+	suite.Equal("http://localhost:8080/fileserver/01F8MH1H7YV1Z7D2C8K2730QBF/avatar/original/01F8MH58A357CV5K7R7TJMSH6S.jpeg", apimodelAccount.Avatar)
+	suite.Equal("http://localhost:8080/fileserver/01F8MH1H7YV1Z7D2C8K2730QBF/avatar/small/01F8MH58A357CV5K7R7TJMSH6S.jpeg", apimodelAccount.AvatarStatic)
+	suite.Equal("http://localhost:8080/fileserver/01F8MH1H7YV1Z7D2C8K2730QBF/header/original/01PFPMWK2FF0D9WMHEJHR07C3Q.jpeg", apimodelAccount.Header)
+	suite.Equal("http://localhost:8080/fileserver/01F8MH1H7YV1Z7D2C8K2730QBF/header/small/01PFPMWK2FF0D9WMHEJHR07C3Q.jpeg", apimodelAccount.HeaderStatic)
+	suite.Zero(apimodelAccount.FollowersCount)
+	suite.Equal(2, apimodelAccount.FollowingCount)
+	suite.Equal(5, apimodelAccount.StatusesCount)
+	suite.WithinDuration(time.Now(), lastStatusAt, 5*time.Minute)
+	suite.EqualValues(gtsmodel.VisibilityPublic, apimodelAccount.Source.Privacy)
+	suite.Equal(testAccount.Language, apimodelAccount.Source.Language)
+}
+
+func TestAccountVerifyTestSuite(t *testing.T) {
+	suite.Run(t, new(AccountVerifyTestSuite))
+}