mirrors/pinafore
mirrors
/
pinafore
mirror of https://github.com/nolanlawson/pinafore.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

fix alts mixed with no-alts

This commit is contained in:
Nolan Lawson 2018-04-09 18:29:52 -07:00
parent 66752ececd
commit cef4be9873
2 changed files with 24 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
routes/_actions/compose.js
View File

@ -36,8 +36,8 @@ export async function postStatus (realm, text, inReplyToId, mediaIds,
postingStatus: true postingStatus: true
}) })
try { try {
await Promise.all(mediaDescriptions.filter(Boolean).map((description, i) => { await Promise.all(mediaDescriptions.map(async (description, i) => {
return putMediaDescription(instanceName, accessToken, mediaIds[i], description) return description && putMediaDescription(instanceName, accessToken, mediaIds[i], description)
})) }))
let status = await postStatusToServer(instanceName, accessToken, text, let status = await postStatusToServer(instanceName, accessToken, text,
inReplyToId, mediaIds, sensitive, spoilerText, visibility) inReplyToId, mediaIds, sensitive, spoilerText, visibility)

30
tests/spec/109-compose-media.js
View File

@ -1,7 +1,7 @@
import { import {
composeButton, getNthDeleteMediaButton, getNthMedia, getNthMediaAltInput, getNthStatusAndImage, getUrl, composeButton, getNthDeleteMediaButton, getNthMedia, getNthMediaAltInput, getNthStatusAndImage, getUrl,
homeNavButton, homeNavButton,
mediaButton, notificationsNavButton, sleep, mediaButton, notificationsNavButton,
uploadKittenImage uploadKittenImage
} from '../utils' } from '../utils'
import { foobarRole } from '../roles' import { foobarRole } from '../roles'
@ -9,11 +9,18 @@ import { foobarRole } from '../roles'
fixture`109-compose-media.js` fixture`109-compose-media.js`
.page`http://localhost:4002` .page`http://localhost:4002`
async function uploadTwoKittens (t) {
await (uploadKittenImage(1)())
await t.expect(getNthMedia(1).getAttribute('alt')).eql('kitten1.jpg')
await (uploadKittenImage(2)())
await t.expect(getNthMedia(1).getAttribute('alt')).eql('kitten1.jpg')
.expect(getNthMedia(2).getAttribute('alt')).eql('kitten2.jpg')
}
test('uploads alts for media', async t => { test('uploads alts for media', async t => {
await t.useRole(foobarRole) await t.useRole(foobarRole)
.expect(mediaButton.hasAttribute('disabled')).notOk() .expect(mediaButton.hasAttribute('disabled')).notOk()
await (uploadKittenImage(1)()) await uploadTwoKittens(t)
await (uploadKittenImage(2)())
await t.typeText(getNthMediaAltInput(2), 'kitten 2') await t.typeText(getNthMediaAltInput(2), 'kitten 2')
.typeText(getNthMediaAltInput(1), 'kitten 1') .typeText(getNthMediaAltInput(1), 'kitten 1')
.click(composeButton) .click(composeButton)
@ -36,14 +43,21 @@ test('uploads alts when deleting and re-uploading media', async t => {
.expect(getNthStatusAndImage(0, 0).getAttribute('alt')).eql('this will not be deleted') .expect(getNthStatusAndImage(0, 0).getAttribute('alt')).eql('this will not be deleted')
}) })
test('uploads alts mixed with no-alts', async t => {
await t.useRole(foobarRole)
.expect(mediaButton.hasAttribute('disabled')).notOk()
await uploadTwoKittens(t)
await t.typeText(getNthMediaAltInput(2), 'kitten numero dos')
.click(composeButton)
.expect(getNthStatusAndImage(0, 0).getAttribute('alt')).eql('')
.expect(getNthStatusAndImage(0, 1).getAttribute('alt')).eql('kitten numero dos')
})
test('saves alts to local storage', async t => { test('saves alts to local storage', async t => {
await t.useRole(foobarRole) await t.useRole(foobarRole)
.expect(mediaButton.hasAttribute('disabled')).notOk() .expect(mediaButton.hasAttribute('disabled')).notOk()
await (uploadKittenImage(1)()) await uploadTwoKittens(t)
await (uploadKittenImage(2)()) await t.typeText(getNthMediaAltInput(1), 'kitten numero uno')
await t.expect(getNthMedia(1).getAttribute('alt')).eql('kitten1.jpg')
.expect(getNthMedia(2).getAttribute('alt')).eql('kitten2.jpg')
.typeText(getNthMediaAltInput(1), 'kitten numero uno')
.typeText(getNthMediaAltInput(2), 'kitten numero dos') .typeText(getNthMediaAltInput(2), 'kitten numero dos')
.click(notificationsNavButton) .click(notificationsNavButton)
.expect(getUrl()).contains('/notifications') .expect(getUrl()).contains('/notifications')