summaryrefslogtreecommitdiff
path: root/internal/apimodule/media
diff options
context:
space:
mode:
Diffstat (limited to 'internal/apimodule/media')
-rw-r--r--internal/apimodule/media/test/mediacreate_test.go (renamed from internal/apimodule/media/mediacreate_test.go)161
1 files changed, 85 insertions, 76 deletions
diff --git a/internal/apimodule/media/mediacreate_test.go b/internal/apimodule/media/test/mediacreate_test.go
index 8fca138ca..30bbb117a 100644
--- a/internal/apimodule/media/mediacreate_test.go
+++ b/internal/apimodule/media/test/mediacreate_test.go
@@ -16,19 +16,28 @@
along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-package media_test
+package test
import (
+ "bytes"
"context"
+ "encoding/json"
+ "fmt"
+ "io/ioutil"
+ "net/http"
+ "net/http/httptest"
"testing"
+ "github.com/gin-gonic/gin"
"github.com/sirupsen/logrus"
+ "github.com/stretchr/testify/assert"
"github.com/stretchr/testify/suite"
mediamodule "github.com/superseriousbusiness/gotosocial/internal/apimodule/media"
"github.com/superseriousbusiness/gotosocial/internal/config"
"github.com/superseriousbusiness/gotosocial/internal/db"
"github.com/superseriousbusiness/gotosocial/internal/db/gtsmodel"
"github.com/superseriousbusiness/gotosocial/internal/mastotypes"
+ mastomodel "github.com/superseriousbusiness/gotosocial/internal/mastotypes/mastomodel"
"github.com/superseriousbusiness/gotosocial/internal/media"
"github.com/superseriousbusiness/gotosocial/internal/oauth"
"github.com/superseriousbusiness/gotosocial/internal/storage"
@@ -84,7 +93,7 @@ func (suite *MediaCreateTestSuite) TearDownSuite() {
func (suite *MediaCreateTestSuite) SetupTest() {
testrig.StandardDBSetup(suite.db)
- testrig.StandardStorageSetup(suite.storage, "../../../testrig/media")
+ testrig.StandardStorageSetup(suite.storage, "../../../../testrig/media")
suite.testTokens = testrig.NewTestTokens()
suite.testClients = testrig.NewTestClients()
suite.testApplications = testrig.NewTestApplications()
@@ -104,80 +113,80 @@ func (suite *MediaCreateTestSuite) TearDownTest() {
func (suite *MediaCreateTestSuite) TestStatusCreatePOSTImageHandlerSuccessful() {
- // // set up the context for the request
- // t := suite.testTokens["local_account_1"]
- // oauthToken := oauth.TokenToOauthToken(t)
- // recorder := httptest.NewRecorder()
- // ctx, _ := gin.CreateTestContext(recorder)
- // ctx.Set(oauth.SessionAuthorizedApplication, suite.testApplications["application_1"])
- // ctx.Set(oauth.SessionAuthorizedToken, oauthToken)
- // ctx.Set(oauth.SessionAuthorizedUser, suite.testUsers["local_account_1"])
- // ctx.Set(oauth.SessionAuthorizedAccount, suite.testAccounts["local_account_1"])
-
- // // see what's in storage *before* the request
- // storageKeysBeforeRequest, err := suite.storage.ListKeys()
- // if err != nil {
- // panic(err)
- // }
-
- // // create the request
- // buf, w, err := testrig.CreateMultipartFormData("file", "../../../testrig/media/test-jpeg.jpg", map[string]string{
- // "description": "this is a test image -- a cool background from somewhere",
- // "focus": "-0.5,0.5",
- // })
- // if err != nil {
- // panic(err)
- // }
- // ctx.Request = httptest.NewRequest(http.MethodPost, fmt.Sprintf("http://localhost:8080/%s", mediamodule.BasePath), bytes.NewReader(buf.Bytes())) // the endpoint we're hitting
- // ctx.Request.Header.Set("Content-Type", w.FormDataContentType())
-
- // // do the actual request
- // suite.mediaModule.MediaCreatePOSTHandler(ctx)
-
- // // check what's in storage *after* the request
- // storageKeysAfterRequest, err := suite.storage.ListKeys()
- // if err != nil {
- // panic(err)
- // }
-
- // // check response
- // suite.EqualValues(http.StatusAccepted, recorder.Code)
-
- // result := recorder.Result()
- // defer result.Body.Close()
- // b, err := ioutil.ReadAll(result.Body)
- // assert.NoError(suite.T(), err)
- // fmt.Println(string(b))
-
- // attachmentReply := &mastomodel.Attachment{}
- // err = json.Unmarshal(b, attachmentReply)
- // assert.NoError(suite.T(), err)
-
- // assert.Equal(suite.T(), "this is a test image -- a cool background from somewhere", attachmentReply.Description)
- // assert.Equal(suite.T(), "image", attachmentReply.Type)
- // assert.EqualValues(suite.T(), mastomodel.MediaMeta{
- // Original: mastomodel.MediaDimensions{
- // Width: 1920,
- // Height: 1080,
- // Size: "1920x1080",
- // Aspect: 1.7777778,
- // },
- // Small: mastomodel.MediaDimensions{
- // Width: 256,
- // Height: 144,
- // Size: "256x144",
- // Aspect: 1.7777778,
- // },
- // Focus: mastomodel.MediaFocus{
- // X: -0.5,
- // Y: 0.5,
- // },
- // }, attachmentReply.Meta)
- // assert.Equal(suite.T(), "LjCZnlvyRkRn_NvzRjWF?urqV@f9", attachmentReply.Blurhash)
- // assert.NotEmpty(suite.T(), attachmentReply.ID)
- // assert.NotEmpty(suite.T(), attachmentReply.URL)
- // assert.NotEmpty(suite.T(), attachmentReply.PreviewURL)
- // assert.Equal(suite.T(), len(storageKeysBeforeRequest)+2, len(storageKeysAfterRequest)) // 2 images should be added to storage: the original and the thumbnail
+ // set up the context for the request
+ t := suite.testTokens["local_account_1"]
+ oauthToken := oauth.TokenToOauthToken(t)
+ recorder := httptest.NewRecorder()
+ ctx, _ := gin.CreateTestContext(recorder)
+ ctx.Set(oauth.SessionAuthorizedApplication, suite.testApplications["application_1"])
+ ctx.Set(oauth.SessionAuthorizedToken, oauthToken)
+ ctx.Set(oauth.SessionAuthorizedUser, suite.testUsers["local_account_1"])
+ ctx.Set(oauth.SessionAuthorizedAccount, suite.testAccounts["local_account_1"])
+
+ // see what's in storage *before* the request
+ storageKeysBeforeRequest, err := suite.storage.ListKeys()
+ if err != nil {
+ panic(err)
+ }
+
+ // create the request
+ buf, w, err := testrig.CreateMultipartFormData("file", "../../../../testrig/media/test-jpeg.jpg", map[string]string{
+ "description": "this is a test image -- a cool background from somewhere",
+ "focus": "-0.5,0.5",
+ })
+ if err != nil {
+ panic(err)
+ }
+ ctx.Request = httptest.NewRequest(http.MethodPost, fmt.Sprintf("http://localhost:8080/%s", mediamodule.BasePath), bytes.NewReader(buf.Bytes())) // the endpoint we're hitting
+ ctx.Request.Header.Set("Content-Type", w.FormDataContentType())
+
+ // do the actual request
+ suite.mediaModule.MediaCreatePOSTHandler(ctx)
+
+ // check what's in storage *after* the request
+ storageKeysAfterRequest, err := suite.storage.ListKeys()
+ if err != nil {
+ panic(err)
+ }
+
+ // check response
+ suite.EqualValues(http.StatusAccepted, recorder.Code)
+
+ result := recorder.Result()
+ defer result.Body.Close()
+ b, err := ioutil.ReadAll(result.Body)
+ assert.NoError(suite.T(), err)
+ fmt.Println(string(b))
+
+ attachmentReply := &mastomodel.Attachment{}
+ err = json.Unmarshal(b, attachmentReply)
+ assert.NoError(suite.T(), err)
+
+ assert.Equal(suite.T(), "this is a test image -- a cool background from somewhere", attachmentReply.Description)
+ assert.Equal(suite.T(), "image", attachmentReply.Type)
+ assert.EqualValues(suite.T(), mastomodel.MediaMeta{
+ Original: mastomodel.MediaDimensions{
+ Width: 1920,
+ Height: 1080,
+ Size: "1920x1080",
+ Aspect: 1.7777778,
+ },
+ Small: mastomodel.MediaDimensions{
+ Width: 256,
+ Height: 144,
+ Size: "256x144",
+ Aspect: 1.7777778,
+ },
+ Focus: mastomodel.MediaFocus{
+ X: -0.5,
+ Y: 0.5,
+ },
+ }, attachmentReply.Meta)
+ assert.Equal(suite.T(), "LjCZnlvyRkRn_NvzRjWF?urqV@f9", attachmentReply.Blurhash)
+ assert.NotEmpty(suite.T(), attachmentReply.ID)
+ assert.NotEmpty(suite.T(), attachmentReply.URL)
+ assert.NotEmpty(suite.T(), attachmentReply.PreviewURL)
+ assert.Equal(suite.T(), len(storageKeysBeforeRequest)+2, len(storageKeysAfterRequest)) // 2 images should be added to storage: the original and the thumbnail
}
func TestMediaCreateTestSuite(t *testing.T) {
generated by cgit v1.2.3 (git 2.46.0) at 2025-08-04 02:50:19 +0000