From d8093519db8c2f74ad49ef8249b3173f5c35c7d3 Mon Sep 17 00:00:00 2001 From: theresa Date: Tue, 30 Aug 2022 13:22:44 +0200 Subject: [PATCH] Tests: Skip upload tests on mobile --- .../acceptance-public/photos-upload-delete.js | 423 ++++++++++-------- 1 file changed, 226 insertions(+), 197 deletions(-) diff --git a/frontend/tests/acceptance/acceptance-public/photos-upload-delete.js b/frontend/tests/acceptance/acceptance-public/photos-upload-delete.js index 857a43cda..19063a573 100644 --- a/frontend/tests/acceptance/acceptance-public/photos-upload-delete.js +++ b/frontend/tests/acceptance/acceptance-public/photos-upload-delete.js @@ -26,73 +26,78 @@ const library = new Library(); test.meta("testID", "photos-upload-delete-001").meta({ type: "short", mode: "public" })( "Common: Upload + Delete jpg/json", async (t) => { - await menu.openNav(); - const InitialOriginalsCount = await Selector(".nav-originals .nav-count", { timeout: 5000 }) - .innerText; - await t.expect(fs.existsSync("../storage/acceptance/originals/2020/10")).notOk(); - await toolbar.search("digikam"); - const PhotoCount = await photo.getPhotoCount("all"); + if (t.browser.platform === "mobile") { + console.log("Skipped on mobile"); + } else { + await menu.openNav(); + const InitialOriginalsCount = await Selector(".nav-originals .nav-count", { timeout: 5000 }) + .innerText; + await t.expect(fs.existsSync("../storage/acceptance/originals/2020/10")).notOk(); + await toolbar.search("digikam"); + const PhotoCount = await photo.getPhotoCount("all"); - await t.expect(PhotoCount).eql(0); + await t.expect(PhotoCount).eql(0); - await toolbar.triggerToolbarAction("upload"); - await t - .setFilesToUpload(Selector(".input-upload"), [ - "../../upload-files/digikam.jpg", - "../../upload-files/digikam.json", - ]) - .wait(15000); - const PhotoCountAfterUpload = await photo.getPhotoCount("all"); + await toolbar.triggerToolbarAction("upload"); + await t + .setFilesToUpload(Selector(".input-upload"), [ + "../../upload-files/digikam.jpg", + "../../upload-files/digikam.json", + ]) + .wait(15000); + const PhotoCountAfterUpload = await photo.getPhotoCount("all"); - await t.expect(PhotoCountAfterUpload).eql(1); + await t.expect(PhotoCountAfterUpload).eql(1); - const UploadedPhoto = await photo.getNthPhotoUid("all", 0); - await t.navigateTo("/library/files/2020/10"); - const FileCount = await originals.getFileCount(); + const UploadedPhoto = await photo.getNthPhotoUid("all", 0); + await t.navigateTo("/library/files/2020/10"); + const FileCount = await originals.getFileCount(); - await t.expect(FileCount).eql(2); + await t.expect(FileCount).eql(2); - await menu.openNav(); - const OriginalsCountAfterUpload = await Selector(".nav-originals .nav-count", { timeout: 5000 }) - .innerText; - await t.expect(parseInt(InitialOriginalsCount) + 2).eql(parseInt(OriginalsCountAfterUpload)); + await menu.openNav(); + const OriginalsCountAfterUpload = await Selector(".nav-originals .nav-count", { + timeout: 5000, + }).innerText; + await t.expect(parseInt(InitialOriginalsCount) + 2).eql(parseInt(OriginalsCountAfterUpload)); - await menu.openPage("browse"); - await toolbar.search("digikam"); - await photo.triggerHoverAction("uid", UploadedPhoto, "select"); - await contextmenu.triggerContextMenuAction("edit", ""); - await t.click(photoedit.filesTab); + await menu.openPage("browse"); + await toolbar.search("digikam"); + await photo.triggerHoverAction("uid", UploadedPhoto, "select"); + await contextmenu.triggerContextMenuAction("edit", ""); + await t.click(photoedit.filesTab); - await t - .expect(Selector("div.caption").withText(".json").visible) - .ok() - .expect(Selector("div.caption").withText(".jpg").visible) - .ok(); + await t + .expect(Selector("div.caption").withText(".json").visible) + .ok() + .expect(Selector("div.caption").withText(".jpg").visible) + .ok(); - await t.click(photoedit.dialogClose); + await t.click(photoedit.dialogClose); - if (t.browser.platform !== "mobile") { - await t.expect(fs.existsSync("../storage/acceptance/originals/2020/10")).ok(); - const originalsLength = fs.readdirSync("../storage/acceptance/originals/2020/10").length; - await t.expect(originalsLength).eql(2); - } + if (t.browser.platform !== "mobile") { + await t.expect(fs.existsSync("../storage/acceptance/originals/2020/10")).ok(); + const originalsLength = fs.readdirSync("../storage/acceptance/originals/2020/10").length; + await t.expect(originalsLength).eql(2); + } - await contextmenu.triggerContextMenuAction("archive", ""); - await menu.openPage("archive"); - await photo.triggerHoverAction("uid", UploadedPhoto, "select"); - await contextmenu.triggerContextMenuAction("delete", ""); - await menu.openPage("browse"); - await toolbar.search("digikam"); - await photo.checkPhotoVisibility(UploadedPhoto, false); - await t.navigateTo("/library/files/2020/10"); - const FileCountAfterDelete = await originals.getFileCount(); + await contextmenu.triggerContextMenuAction("archive", ""); + await menu.openPage("archive"); + await photo.triggerHoverAction("uid", UploadedPhoto, "select"); + await contextmenu.triggerContextMenuAction("delete", ""); + await menu.openPage("browse"); + await toolbar.search("digikam"); + await photo.checkPhotoVisibility(UploadedPhoto, false); + await t.navigateTo("/library/files/2020/10"); + const FileCountAfterDelete = await originals.getFileCount(); - await t.expect(FileCountAfterDelete).eql(0); - if (t.browser.platform !== "mobile") { - const originalsLengthAfterDelete = fs.readdirSync( - "../storage/acceptance/originals/2020/10" - ).length; - await t.expect(originalsLengthAfterDelete).eql(0); + await t.expect(FileCountAfterDelete).eql(0); + if (t.browser.platform !== "mobile") { + const originalsLengthAfterDelete = fs.readdirSync( + "../storage/acceptance/originals/2020/10" + ).length; + await t.expect(originalsLengthAfterDelete).eql(0); + } } } ); @@ -100,66 +105,72 @@ test.meta("testID", "photos-upload-delete-001").meta({ type: "short", mode: "pub test.meta("testID", "photos-upload-delete-002").meta({ mode: "public" })( "Common: Upload + Delete video", async (t) => { - await t.expect(fs.existsSync("../storage/acceptance/originals/2020/06")).notOk(); - await toolbar.search("korn"); - const PhotoCount = await photo.getPhotoCount("all"); + if (t.browser.platform === "mobile") { + console.log("Skipped on mobile"); + } else { + await t.expect(fs.existsSync("../storage/acceptance/originals/2020/06")).notOk(); + await toolbar.search("korn"); + const PhotoCount = await photo.getPhotoCount("all"); - await t.expect(PhotoCount).eql(0); + await t.expect(PhotoCount).eql(0); - await toolbar.triggerToolbarAction("upload"); - await t.setFilesToUpload(Selector(".input-upload"), ["../../upload-files/korn.mp4"]).wait(15000); - const PhotoCountAfterUpload = await photo.getPhotoCount("all"); + await toolbar.triggerToolbarAction("upload"); + await t + .setFilesToUpload(Selector(".input-upload"), ["../../upload-files/korn.mp4"]) + .wait(15000); + const PhotoCountAfterUpload = await photo.getPhotoCount("all"); - await t.expect(PhotoCountAfterUpload).eql(1); + await t.expect(PhotoCountAfterUpload).eql(1); - const UploadedPhoto = await photo.getNthPhotoUid("all", 0); - await t.navigateTo("/library/files/2020/06"); - const FileCount = await originals.getFileCount(); + const UploadedPhoto = await photo.getNthPhotoUid("all", 0); + await t.navigateTo("/library/files/2020/06"); + const FileCount = await originals.getFileCount(); - await t.expect(FileCount).eql(1); + await t.expect(FileCount).eql(1); - await menu.openPage("browse"); - await toolbar.search("korn"); - await photo.triggerHoverAction("uid", UploadedPhoto, "select"); - await contextmenu.triggerContextMenuAction("edit", ""); - await t.click(photoedit.filesTab); + await menu.openPage("browse"); + await toolbar.search("korn"); + await photo.triggerHoverAction("uid", UploadedPhoto, "select"); + await contextmenu.triggerContextMenuAction("edit", ""); + await t.click(photoedit.filesTab); - await t - .expect(Selector("div.caption").withText(".mp4").visible) - .ok() - .expect(Selector("div.caption").withText(".jpg").visible) - .ok(); + await t + .expect(Selector("div.caption").withText(".mp4").visible) + .ok() + .expect(Selector("div.caption").withText(".jpg").visible) + .ok(); - await t.click(photoedit.dialogClose); + await t.click(photoedit.dialogClose); - if (t.browser.platform !== "mobile") { - await t.expect(fs.existsSync("../storage/acceptance/originals/2020/06")).ok(); - const originalsLength = fs.readdirSync("../storage/acceptance/originals/2020/06").length; - await t.expect(originalsLength).eql(1); - const sidecarLength = fs.readdirSync("../storage/acceptance/originals/2020/06").length; - await t.expect(sidecarLength).eql(1); - } + if (t.browser.platform !== "mobile") { + await t.expect(fs.existsSync("../storage/acceptance/originals/2020/06")).ok(); + const originalsLength = fs.readdirSync("../storage/acceptance/originals/2020/06").length; + await t.expect(originalsLength).eql(1); + const sidecarLength = fs.readdirSync("../storage/acceptance/originals/2020/06").length; + await t.expect(sidecarLength).eql(1); + } - await contextmenu.triggerContextMenuAction("archive", ""); - await menu.openPage("archive"); - await photo.triggerHoverAction("uid", UploadedPhoto, "select"); - await contextmenu.triggerContextMenuAction("delete", ""); - await menu.openPage("browse"); - await toolbar.search("korn"); - await photo.checkPhotoVisibility(UploadedPhoto, false); - await t.navigateTo("/library/files/2020/06"); - const FileCountAfterDelete = await originals.getFileCount(); + await contextmenu.triggerContextMenuAction("archive", ""); + await menu.openPage("archive"); + await photo.triggerHoverAction("uid", UploadedPhoto, "select"); + await contextmenu.triggerContextMenuAction("delete", ""); + await menu.openPage("browse"); + await toolbar.search("korn"); + await photo.checkPhotoVisibility(UploadedPhoto, false); + await t.navigateTo("/library/files/2020/06"); + const FileCountAfterDelete = await originals.getFileCount(); - await t.expect(FileCountAfterDelete).eql(0); - if (t.browser.platform !== "mobile") { - const originalsLengthAfterDelete = fs.readdirSync( - "../storage/acceptance/originals/2020/06" - ).length; - await t.expect(originalsLengthAfterDelete).eql(0); - const sidecarLengthAfterDelete = fs.readdirSync( - "../storage/acceptance/originals/2020/06" - ).length; - await t.expect(sidecarLengthAfterDelete).eql(0); + await t.expect(FileCountAfterDelete).eql(0); + if (t.browser.platform !== "mobile") { + const originalsLengthAfterDelete = fs.readdirSync( + "../storage/acceptance/originals/2020/06" + ).length; + await t.expect(originalsLengthAfterDelete).eql(0); + const sidecarLengthAfterDelete = fs.readdirSync( + "../storage/acceptance/originals/2020/06" + ).length; + await t.expect(sidecarLengthAfterDelete).eql(0); + } } } ); @@ -167,125 +178,143 @@ test.meta("testID", "photos-upload-delete-002").meta({ mode: "public" })( test.meta("testID", "photos-upload-delete-003").meta({ mode: "public" })( "Common: Upload to existing Album + Delete", async (t) => { - await menu.openPage("albums"); - await toolbar.search("Christmas"); - const AlbumUid = await album.getNthAlbumUid("all", 0); - await album.openAlbumWithUid(AlbumUid); - const PhotoCount = await photo.getPhotoCount("all"); - await toolbar.triggerToolbarAction("upload"); - await t - .click(Selector(".input-albums")) - .click(page.selectOption.withText("Christmas")) - .setFilesToUpload(Selector(".input-upload"), ["../../upload-files/ladybug.jpg"]) - .wait(15000); - const PhotoCountAfterUpload = await photo.getPhotoCount("all"); + if (t.browser.platform === "mobile") { + console.log("Skipped on mobile"); + } else { + await menu.openPage("albums"); + await toolbar.search("Christmas"); + const AlbumUid = await album.getNthAlbumUid("all", 0); + await album.openAlbumWithUid(AlbumUid); + const PhotoCount = await photo.getPhotoCount("all"); + await toolbar.triggerToolbarAction("upload"); + await t + .click(Selector(".input-albums")) + .click(page.selectOption.withText("Christmas")) + .setFilesToUpload(Selector(".input-upload"), ["../../upload-files/ladybug.jpg"]) + .wait(15000); + const PhotoCountAfterUpload = await photo.getPhotoCount("all"); - await t.expect(PhotoCountAfterUpload).eql(PhotoCount + 1); + await t.expect(PhotoCountAfterUpload).eql(PhotoCount + 1); - await menu.openPage("browse"); - await toolbar.search("ladybug"); - const UploadedPhotoUid = await photo.getNthPhotoUid("all", 0); - await photo.triggerHoverAction("uid", UploadedPhotoUid, "select"); - await contextmenu.triggerContextMenuAction("archive", ""); - await menu.openPage("archive"); - await photo.triggerHoverAction("uid", UploadedPhotoUid, "select"); - await contextmenu.triggerContextMenuAction("delete", ""); - await menu.openPage("browse"); - await toolbar.search("ladybug"); - await photo.checkPhotoVisibility(UploadedPhotoUid, false); - await menu.openPage("albums"); - await album.openAlbumWithUid(AlbumUid); - await photo.checkPhotoVisibility(UploadedPhotoUid, false); - const PhotoCountAfterDelete = await photo.getPhotoCount("all"); + await menu.openPage("browse"); + await toolbar.search("ladybug"); + const UploadedPhotoUid = await photo.getNthPhotoUid("all", 0); + await photo.triggerHoverAction("uid", UploadedPhotoUid, "select"); + await contextmenu.triggerContextMenuAction("archive", ""); + await menu.openPage("archive"); + await photo.triggerHoverAction("uid", UploadedPhotoUid, "select"); + await contextmenu.triggerContextMenuAction("delete", ""); + await menu.openPage("browse"); + await toolbar.search("ladybug"); + await photo.checkPhotoVisibility(UploadedPhotoUid, false); + await menu.openPage("albums"); + await album.openAlbumWithUid(AlbumUid); + await photo.checkPhotoVisibility(UploadedPhotoUid, false); + const PhotoCountAfterDelete = await photo.getPhotoCount("all"); - await t.expect(PhotoCountAfterDelete).eql(PhotoCount); + await t.expect(PhotoCountAfterDelete).eql(PhotoCount); + } } ); test.meta("testID", "photos-upload-delete-004").meta({ mode: "public" })( "Common: Upload jpg to new Album + Delete", async (t) => { - await menu.openPage("albums"); - const AlbumCount = await album.getAlbumCount("all"); - await toolbar.triggerToolbarAction("upload"); - await t - .click(Selector(".input-albums")) - .typeText(Selector(".input-albums input"), "NewCreatedAlbum") - .pressKey("enter") - .setFilesToUpload(Selector(".input-upload"), ["../../upload-files/digikam.jpg"]) - .wait(15000); if (t.browser.platform === "mobile") { - await t.eval(() => location.reload()); + console.log("Skipped on mobile"); } else { - await toolbar.triggerToolbarAction("reload"); + await menu.openPage("albums"); + const AlbumCount = await album.getAlbumCount("all"); + await toolbar.triggerToolbarAction("upload"); + await t + .click(Selector(".input-albums")) + .typeText(Selector(".input-albums input"), "NewCreatedAlbum") + .pressKey("enter") + .setFilesToUpload(Selector(".input-upload"), ["../../upload-files/digikam.jpg"]) + .wait(15000); + if (t.browser.platform === "mobile") { + await t.eval(() => location.reload()); + } else { + await toolbar.triggerToolbarAction("reload"); + } + const AlbumCountAfterUpload = await album.getAlbumCount("all"); + + await t.expect(AlbumCountAfterUpload).eql(AlbumCount + 1); + + await toolbar.search("NewCreatedAlbum"); + await album.openNthAlbum(0); + const PhotoCount = await photo.getPhotoCount("all"); + + await t.expect(PhotoCount).eql(1); + + await menu.openPage("browse"); + await toolbar.search("digikam"); + const UploadedPhotoUid = await photo.getNthPhotoUid("all", 0); + await photo.triggerHoverAction("uid", UploadedPhotoUid, "select"); + await contextmenu.triggerContextMenuAction("archive", ""); + await menu.openPage("archive"); + await photo.triggerHoverAction("uid", UploadedPhotoUid, "select"); + await contextmenu.triggerContextMenuAction("delete", ""); + await menu.openPage("browse"); + await toolbar.search("digikam"); + await photo.checkPhotoVisibility(UploadedPhotoUid, false); + await menu.openPage("albums"); + await toolbar.search("NewCreatedAlbum"); + await album.openNthAlbum(0); + await photo.checkPhotoVisibility(UploadedPhotoUid, false); + const PhotoCountAfterDelete = await photo.getPhotoCount("all"); + + await t.expect(PhotoCountAfterDelete).eql(0); + + await menu.openPage("albums"); + await toolbar.search("NewCreatedAlbum"); + await album.triggerHoverAction("nth", 0, "select"); + await contextmenu.checkContextMenuCount("1"); + await contextmenu.triggerContextMenuAction("delete", ""); } - const AlbumCountAfterUpload = await album.getAlbumCount("all"); - - await t.expect(AlbumCountAfterUpload).eql(AlbumCount + 1); - - await toolbar.search("NewCreatedAlbum"); - await album.openNthAlbum(0); - const PhotoCount = await photo.getPhotoCount("all"); - - await t.expect(PhotoCount).eql(1); - - await menu.openPage("browse"); - await toolbar.search("digikam"); - const UploadedPhotoUid = await photo.getNthPhotoUid("all", 0); - await photo.triggerHoverAction("uid", UploadedPhotoUid, "select"); - await contextmenu.triggerContextMenuAction("archive", ""); - await menu.openPage("archive"); - await photo.triggerHoverAction("uid", UploadedPhotoUid, "select"); - await contextmenu.triggerContextMenuAction("delete", ""); - await menu.openPage("browse"); - await toolbar.search("digikam"); - await photo.checkPhotoVisibility(UploadedPhotoUid, false); - await menu.openPage("albums"); - await toolbar.search("NewCreatedAlbum"); - await album.openNthAlbum(0); - await photo.checkPhotoVisibility(UploadedPhotoUid, false); - const PhotoCountAfterDelete = await photo.getPhotoCount("all"); - - await t.expect(PhotoCountAfterDelete).eql(0); - - await menu.openPage("albums"); - await toolbar.search("NewCreatedAlbum"); - await album.triggerHoverAction("nth", 0, "select"); - await contextmenu.checkContextMenuCount("1"); - await contextmenu.triggerContextMenuAction("delete", ""); } ); test.meta("testID", "photos-upload-delete-005").meta({ type: "short", mode: "public" })( "Common: Try uploading nsfw file", async (t) => { - await toolbar.triggerToolbarAction("upload"); - await t - .setFilesToUpload(Selector(".input-upload"), ["../../upload-files/hentai_2.jpg"]) - .wait(15000); - await menu.openPage("library"); - await t.click(library.logsTab); + if (t.browser.platform === "mobile") { + console.log("Skipped on mobile"); + } else { + await toolbar.triggerToolbarAction("upload"); + await t + .setFilesToUpload(Selector(".input-upload"), ["../../upload-files/hentai_2.jpg"]) + .wait(15000); + await menu.openPage("library"); + await t.click(library.logsTab); - await t.expect(Selector("p").withText("hentai_2.jpg might be offensive").visible).ok(); + await t.expect(Selector("p").withText("hentai_2.jpg might be offensive").visible).ok(); + } } ); test.meta("testID", "photos-upload-delete-006").meta({ type: "short", mode: "public" })( "Common: Try uploading txt file", async (t) => { - await menu.openNav(); - const InitialOriginalsCount = await Selector(".nav-originals .nav-count", { - timeout: 10000, - }).innerText; - await menu.openPage("browse"); + if (t.browser.platform === "mobile") { + console.log("Skipped on mobile"); + } else { + await menu.openNav(); + const InitialOriginalsCount = await Selector(".nav-originals .nav-count", { + timeout: 10000, + }).innerText; + await menu.openPage("browse"); - await toolbar.triggerToolbarAction("upload"); - await t.setFilesToUpload(Selector(".input-upload"), ["../../upload-files/foo.txt"]).wait(15000); - await menu.openNav(); - const OriginalsCountAfterUpload = await Selector(".nav-originals .nav-count", { - timeout: 10000, - }).innerText; + await toolbar.triggerToolbarAction("upload"); + await t + .setFilesToUpload(Selector(".input-upload"), ["../../upload-files/foo.txt"]) + .wait(15000); + await menu.openNav(); + const OriginalsCountAfterUpload = await Selector(".nav-originals .nav-count", { + timeout: 10000, + }).innerText; - await t.expect(parseInt(InitialOriginalsCount)).eql(parseInt(OriginalsCountAfterUpload)); + await t.expect(parseInt(InitialOriginalsCount)).eql(parseInt(OriginalsCountAfterUpload)); + } } );