From 5586f1fab9cefcf6b101aa393d2b9efd911f3009 Mon Sep 17 00:00:00 2001 From: theresa Date: Wed, 27 Jan 2021 10:14:18 +0100 Subject: [PATCH] Tests: Adapt page model --- frontend/tests/acceptance/albums.js | 4 ++-- frontend/tests/acceptance/labels.js | 2 +- frontend/tests/acceptance/originals.js | 2 +- frontend/tests/acceptance/page-model.js | 4 ++-- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/frontend/tests/acceptance/albums.js b/frontend/tests/acceptance/albums.js index b21392ec1..ebe122af8 100644 --- a/frontend/tests/acceptance/albums.js +++ b/frontend/tests/acceptance/albums.js @@ -52,7 +52,7 @@ test.meta("testID", "albums-002")("Update album", async (t) => { const SecondPhotoUid = await Selector("div.is-photo.type-image").nth(1).getAttribute("data-uid"); await page.selectPhotoFromUID(SecondPhotoUid); await page.selectFromUIDInFullscreen(FirstPhotoUid); - await page.addSelectedToAlbum("Animals"); + await page.addSelectedToAlbum("Animals", "album"); await page.openNav(); await t.click(Selector(".nav-albums")); if (t.browser.platform === "mobile") { @@ -204,7 +204,7 @@ test.meta("testID", "albums-007")("Create/delete album during add to album", asy const SecondPhotoUid = await Selector("div.is-photo.type-image").nth(1).getAttribute("data-uid"); await page.selectPhotoFromUID(SecondPhotoUid); await page.selectFromUIDInFullscreen(FirstPhotoUid); - await page.addSelectedToAlbum("NotYetExistingAlbum"); + await page.addSelectedToAlbum("NotYetExistingAlbum", "album"); await page.openNav(); await t.click(Selector(".nav-albums")); const countAlbumsAfterCreation = await Selector("a.is-album").count; diff --git a/frontend/tests/acceptance/labels.js b/frontend/tests/acceptance/labels.js index 67aeba2bc..ef9b62319 100644 --- a/frontend/tests/acceptance/labels.js +++ b/frontend/tests/acceptance/labels.js @@ -152,7 +152,7 @@ test.meta("testID", "labels-003")("Add label to album", async (t) => { const clipboardCount = await Selector("span.count-clipboard"); await t.expect(clipboardCount.textContent).eql("1"); - await page.addSelectedToAlbum("Christmas"); + await page.addSelectedToAlbum("Christmas", "album"); await page.openNav(); await t .click(Selector(".nav-albums")) diff --git a/frontend/tests/acceptance/originals.js b/frontend/tests/acceptance/originals.js index e40303f11..4b2ae9375 100644 --- a/frontend/tests/acceptance/originals.js +++ b/frontend/tests/acceptance/originals.js @@ -38,7 +38,7 @@ test.meta("testID", "originals-001")("Add original files to album", async (t) => await page.selectPhotoFromUID(KanadaUid); const clipboardCount = await Selector("span.count-clipboard", { timeout: 5000 }); await t.expect(clipboardCount.textContent).eql("1"); - await page.addSelectedToAlbum("KanadaVacation"); + await page.addSelectedToAlbum("KanadaVacation", "album"); await page.openNav(); await t .click(Selector(".nav-albums")); diff --git a/frontend/tests/acceptance/page-model.js b/frontend/tests/acceptance/page-model.js index b93f622d3..549c0d0a1 100644 --- a/frontend/tests/acceptance/page-model.js +++ b/frontend/tests/acceptance/page-model.js @@ -145,10 +145,10 @@ export default class Page { await t.click(Selector("button.action-menu")).click(Selector("button.action-remove")); } - async addSelectedToAlbum(name) { + async addSelectedToAlbum(name, type) { await t .click(Selector("button.action-menu")) - .click(Selector("button.action-album")) + .click(Selector("button.action-"+type)) .typeText(Selector(".input-album input"), name, { replace: true }) .pressKey("enter"); if (await Selector('div[role="listitem"]').withText(name).visible) {