Frontend: Adapt acceptance tests to changes

frontend/tests/acceptance/components.js

@@ -9,10 +9,6 @@ const page = new Page();
 
 test('#1 Test filter options', async t => {
     await t
-        .click('button.p-expand-search')
-        .expect(Selector('body').withText('object Object').exists).notOk()
-        .click('.p-navigation-albums')
-        .click(Selector('div.p-album').nth(0))
         .click('button.p-expand-search')
         .expect(Selector('body').withText('object Object').exists).notOk();
 });

frontend/tests/acceptance/labels.js

@@ -15,7 +15,7 @@ fixture `Test labels`
 const page = new Page();
 
 test('#1 Remove/Activate Add/Delete Label from photo', async t => {
-    await t.click(Selector('.p-navigation-labels'));
+    await t.click(Selector('.nav-labels'));
     const countImportantLabels = await Selector('div.p-label').count;
     await t
         .click(Selector('button.action-show-all'));
@@ -46,7 +46,7 @@ test('#1 Remove/Activate Add/Delete Label from photo', async t => {
         .expect(PhotoTitleAfterEdit).notContains('Beacon')
         .expect(PhotoKeywordsAfterEdit).notContains('beacon')
         .click(Selector('.action-close'))
-        .click(Selector('.p-navigation-labels'));
+        .click(Selector('.nav-labels'));
     await page.search('beacon');
     await t
         .expect(Selector('h3').withText('No labels matched your search').visible).ok();
@@ -65,7 +65,7 @@ test('#1 Remove/Activate Add/Delete Label from photo', async t => {
         .expect(PhotoKeywordsAfterUndo).contains('beacon')
         .expect(PhotoKeywordsAfterUndo).notContains('test')
         .click(Selector('.action-close'))
-        .click(Selector('.p-navigation-labels'));
+        .click(Selector('.nav-labels'));
     await page.search('test');
     await t
         .expect(Selector('h3').withText('No labels matched your search').visible).ok();
@@ -76,7 +76,7 @@ test('#1 Remove/Activate Add/Delete Label from photo', async t => {
 
 //TODO check title of second image after index
 test('#2 Rename Label', async t => {
-    await t.click(Selector('.p-navigation-labels'));
+    await t.click(Selector('.nav-labels'));
     await page.search('zebra');
     const LabelZebra = await Selector('div.p-label').nth(0).getAttribute('data-uid');
     await t
@@ -102,7 +102,7 @@ test('#2 Rename Label', async t => {
         .expect(FirstPhotoKeywordsAfterEdit).contains('horse')
         .expect(FirstPhotoTitleAfterEdit).notContains('Zebra')
         .click(Selector('.action-close'))
-        .click(Selector('.p-navigation-labels'));
+        .click(Selector('.nav-labels'));
     await page.search('horse');
     await t
         .expect(Selector('div').withAttribute('data-uid', LabelZebra).visible).ok()
@@ -114,7 +114,7 @@ test('#2 Rename Label', async t => {
         .typeText(Selector('.input-rename input'), 'Zebra', { replace: true })
         .pressKey('enter')
         .click(Selector('.action-close'))
-        .click(Selector('.p-navigation-labels'));
+        .click(Selector('.nav-labels'));
     await page.search('horse');
     await t
         .expect(Selector('h3').withText('No labels matched your search').visible).ok();
@@ -122,7 +122,7 @@ test('#2 Rename Label', async t => {
 
 test('#3 Add label to album', async t => {
     await t
-        .click(Selector('.p-navigation-albums'))
+        .click(Selector('.nav-albums'))
         .typeText(Selector('.p-albums-search input'), 'Christmas')
         .pressKey('enter');
     const AlbumUid = await Selector('div.p-album').nth(0).getAttribute('data-uid');
@@ -130,7 +130,7 @@ test('#3 Add label to album', async t => {
         .click(Selector('div.p-album').withAttribute('data-uid', AlbumUid));
     const PhotoCount = await Selector('div.p-photo').count;
     await t
-        .click(Selector('.p-navigation-labels'));
+        .click(Selector('.nav-labels'));
     await page.search('landscape');
     const LabelLandscape = await Selector('div.p-label').nth(1).getAttribute('data-uid');
     await t
@@ -138,7 +138,7 @@ test('#3 Add label to album', async t => {
     const FirstPhotoLandscape = await Selector('div.p-photo').nth(0).getAttribute('data-uid');
     const SecondPhotoLandscape = await Selector('div.p-photo').nth(1).getAttribute('data-uid');
     await t
-        .click('.p-navigation-labels');
+        .click('.nav-labels');
     await page.selectFromUID(LabelLandscape);
 
     const clipboardCount = await Selector('span.count-clipboard');
@@ -146,7 +146,7 @@ test('#3 Add label to album', async t => {
         .expect(clipboardCount.textContent).eql("1");
     await page.addSelectedToAlbum('Christmas');
     await t
-        .click(Selector('.p-navigation-albums'))
+        .click(Selector('.nav-albums'))
         .click(Selector('div.p-album').withAttribute('data-uid', AlbumUid));
     const PhotoCountAfterAdd = await Selector('div.p-photo').count;
     await t
@@ -163,14 +163,14 @@ test('#3 Add label to album', async t => {
 
 test('#4 Delete label', async t => {
     await t
-        .click(Selector('.p-navigation-labels'));
+        .click(Selector('.nav-labels'));
     await page.search('dome');
     const LabelDome = await Selector('div.p-label').nth(0).getAttribute('data-uid');
     await t
         .click(Selector('div.p-label').withAttribute('data-uid', LabelDome));
     const FirstPhotoDome = await Selector('div.p-photo').nth(0).getAttribute('data-uid');
     await t
-        .click('.p-navigation-labels')
+        .click('.nav-labels')
     await page.selectFromUID(LabelDome);
     const clipboardCount = await Selector('span.count-clipboard');
     await t
@@ -179,7 +179,7 @@ test('#4 Delete label', async t => {
     await page.search('dome');
     await t
         .expect(Selector('h3').withText('No labels matched your search').visible).ok()
-        .click('.p-navigation-photos')
+        .click('.nav-photos')
         .click(Selector('.action-title-edit').withAttribute('data-uid', FirstPhotoDome))
         .click(Selector('#tab-labels'))
         .expect(Selector('td').withText('No labels found').visible).ok()

frontend/tests/acceptance/library/import.js

@@ -10,20 +10,21 @@ const page = new Page();
 //TODO check metadata like camera, keywords, location etc are added
 test('#1 Import files from folder using copy', async t => {
     await t
-        .click(Selector('.p-navigation-labels'));
+        .click(Selector('.nav-labels'));
     await page.search('bakery');
     await t
         .expect(Selector('h3').withText('No labels matched your search').visible).ok();
    await t
-        .click(Selector('.p-navigation-library'))
+        .click(Selector('.nav-library'))
-        .click(Selector('#tab-import'))
+       //TODO Connecting... error must be moved somewhere else
-        .click(Selector('.input-import-folder input'))
+       .click(Selector('#tab-import'))
+        .click(Selector('.input-import-folder input'), {timeout: 5000})
         .click(Selector('div.v-list__tile__title').withText('/Bäckerei'))
         .click(Selector('.action-import'))
        //TODO replace wait
         .wait(60000)
         //.expect(Selector('span').withText('Done.').visible, {timeout: 60000}).ok()
-        .click(Selector('.p-navigation-labels'))
+        .click(Selector('.nav-labels'))
         .click(Selector('.action-reload'));
     await page.search('bakery');
     await t

frontend/tests/acceptance/library/originals.js

@@ -9,27 +9,27 @@ const page = new Page();
 //TODO check metadata like camera, keywords, location etc are added
 test('#1 Index files from folder', async t => {
     await t
-        .click(Selector('.p-navigation-labels'));
+        .click(Selector('.nav-labels'));
     await page.search('cheetah');
     await t
         .expect(Selector('h3').withText('No labels matched your search').visible).ok()
-        .click(Selector('.p-navigation-moments'))
+        .click(Selector('.nav-moments'))
         .expect(Selector('h3').withText('No moments matched your search').visible).ok();
     await t
-        .click(Selector('.p-navigation-library'))
+        .click(Selector('.nav-library'))
-        .click(Selector('#tab-originals'))
+        .click(Selector('#tab-index'))
         .click(Selector('.input-index-folder input'))
         .click(Selector('div.v-list__tile__title').withText('/moment'))
         .click(Selector('.action-index'))
         //TODO replace wait
         .wait(50000)
         .expect(Selector('span').withText('Done.').visible, {timeout: 60000}).ok()
-        .click(Selector('.p-navigation-labels'))
+        .click(Selector('.nav-labels'))
         .click(Selector('.action-reload'));
     await page.search('cheetah');
     await t
         .expect(Selector('.p-label').visible).ok()
-        .click(Selector('.p-navigation-moments'))
+        .click(Selector('.nav-moments'))
         .click(Selector('a').withText('South Africa 2013'))
         .expect(Selector('.p-photo').visible).ok();
 });

frontend/tests/acceptance/originals.js

@@ -9,15 +9,15 @@ const page = new Page();
 
 test('#1 Add originals files to album', async t => {
     await page.openNav();
-    await t.click(Selector('.p-navigation-albums'));
+    await t.click(Selector('.nav-albums'));
     await t
         .typeText(Selector('.p-albums-search input'), 'KanadaVacation')
         .pressKey('enter');
     await t
         .expect(Selector('h3').innerText).eql('No albums matched your search');
     await t
-        .click(Selector('div.p-navigation-library + div'))
+        .click(Selector('div.nav-library + div'))
-        .click(Selector('.p-navigation-originals'))
+        .click(Selector('.nav-originals'))
         .click(Selector('button').withText('Vacation'));
     const FirstItemInVacation = await Selector('div.v-card__title').nth(0).innerText;
     const KanadaUid = await Selector('div.v-card__title').nth(0).getAttribute('data-uid');
@@ -40,7 +40,7 @@ test('#1 Add originals files to album', async t => {
         .expect(clipboardCount.textContent).eql("1");
     await page.addSelectedToAlbum('KanadaVacation');
     await t
-        .click(Selector('.p-navigation-albums'))
+        .click(Selector('.nav-albums'))
         .typeText(Selector('.p-albums-search input'), 'KanadaVacation')
         .pressKey('enter');
     const AlbumUid = await Selector('div.p-album').nth(0).getAttribute('data-uid');
@@ -49,7 +49,7 @@ test('#1 Add originals files to album', async t => {
     const PhotoCountAfterAdd = await Selector('div.p-photo').count;
     await t
         .expect(PhotoCountAfterAdd).eql(2)
-        .click(Selector('.p-navigation-albums'));
+        .click(Selector('.nav-albums'));
     await page.selectFromUID(AlbumUid);
     await page.deleteSelected();
 });
@@ -58,8 +58,8 @@ test('#1 Add originals files to album', async t => {
 test('#2 Download original files', async t => {
     await page.openNav();
     await t
-        .click(Selector('div.p-navigation-library + div'))
+        .click(Selector('div.nav-library + div'))
-        .click(Selector('.p-navigation-originals'));
+        .click(Selector('.nav-originals'));
     const FirstFile = await Selector('div.p-file').nth(0).getAttribute('data-uid');
     await page.selectFromUID(FirstFile);
     const clipboardCount = await Selector('span.count-clipboard');

frontend/tests/acceptance/page-model.js

@@ -48,10 +48,10 @@ export default class Page {
     }
 
     async openNav() {
-        if (await Selector('button.p-navigation-show').visible) {
+        if (await Selector('button.nav-show').visible) {
-            await t.click(Selector('button.p-navigation-show'));
+            await t.click(Selector('button.nav-show'));
-        } else if (await Selector('div.p-navigation-expand').exists) {
+        } else if (await Selector('div.nav-expand').exists) {
-            await t.click(Selector('div.p-navigation-expand i'));
+            await t.click(Selector('div.nav-expand i'));
         }
     }
 
@@ -93,7 +93,7 @@ export default class Page {
         await t
             .click(Selector('button.action-menu'))
             .click(Selector('button.action-archive'))
-            .click(Selector('button.p-photo-dialog-confirm'));
+            .click(Selector('button.action-confirm'));
     }
 
     async restoreSelected() {
@@ -116,7 +116,7 @@ export default class Page {
         await t
             .click(Selector('button.action-menu'))
             .click(Selector('button.action-delete'))
-            .click(Selector('button.p-photo-dialog-confirm'));
+            .click(Selector('button.action-confirm'));
     }
 
     async removeSelected() {
@@ -134,7 +134,7 @@ export default class Page {
         if (await Selector('div[role="listitem"]').withText(name).visible) {
             await t.click(Selector('div[role="listitem"]').withText(name));
         }
-        await t.click(Selector('button.p-photo-dialog-confirm'));
+        await t.click(Selector('button.action-confirm'));
     }
 
     async login(password) {
@@ -145,6 +145,6 @@ export default class Page {
 
     async logout() {
         await t
-            .click(Selector('div.p-navigation-logout'));
+            .click(Selector('div.nav-logout'));
     }
 }

frontend/tests/acceptance/photos.js

@@ -25,7 +25,7 @@ const page = new Page();
 
 test('#1 Scroll to top', async t => {
     await t
-        .click(Selector('.p-navigation-photos'))
+        .click(Selector('.nav-photos'))
         .click(Selector('.p-expand-search'));
     await page.setFilter('view', 'Cards');
     await t
@@ -52,7 +52,7 @@ test('#2 Download single photo/video and download zip using clipboard and fullsc
         .click(Selector('.action-close'));
     await page.selectFromUID(FirstPhoto);
     await t
-        .click(Selector('.p-navigation-video'));
+        .click(Selector('.nav-video'));
     const FirstVideo = await Selector('div.p-photo').nth(0).getAttribute('data-uid');
     await page.selectFromUID(FirstVideo);
     const clipboardCount = await Selector('span.count-clipboard');
@@ -67,23 +67,23 @@ test('#2 Download single photo/video and download zip using clipboard and fullsc
 test('#3 Approve photo using approve and by adding location', async t => {
     await page.openNav();
     await t
-        .click(Selector('div.p-navigation-photos + div'))
+        .click(Selector('div.nav-photos + div'))
-        .click(Selector('.p-navigation-review'));
+        .click(Selector('.nav-review'));
     logger.clear();
     await page.search('type:image');
-    const request1 = await logger.requests[0].response.body;
+    //const request1 = await logger.requests[0].response.body;
     const FirstPhoto = await Selector('div.p-photo').nth(0).getAttribute('data-uid');
     const SecondPhoto = await Selector('div.p-photo').nth(1).getAttribute('data-uid');
 
     await t
-        .click(Selector('.p-navigation-photos'));
+        .click(Selector('.nav-photos'));
-    const request2 = await logger.requests[0].response.body;
+    //const request2 = await logger.requests[0].response.body;
     await t
         .expect(Selector('div').withAttribute('data-uid', FirstPhoto).exists, {timeout: 5000}).notOk()
         .expect(Selector('div').withAttribute('data-uid', SecondPhoto).exists, {timeout: 5000}).notOk();
     logger.clear();
-    await t.click(Selector('.p-navigation-review'));
+    await t.click(Selector('.nav-review'));
-    const request3 = await logger.requests[0].response.body;
+    //const request3 = await logger.requests[0].response.body;
 
     await page.selectFromUID(FirstPhoto);
     await page.editSelected();
@@ -92,17 +92,17 @@ test('#3 Approve photo using approve and by adding location', async t => {
         .click(Selector('button.p-photo-dialog-close'));
     await t
         .click(Selector('button.action-reload'));
-    const request4 = await logger.requests[0].response.body;
+    //const request4 = await logger.requests[0].response.body;
     logger.clear();
     await t
         .expect(Selector('div').withAttribute('data-uid', FirstPhoto).visible, {timeout: 5000}).ok();
     await page.editSelected();
-    const request5 = await logger.requests[0].response.body;
+    //const request5 = await logger.requests[0].response.body;
     logger.clear();
     await t
         .click(Selector('button.action-approve'))
         .click(Selector('button.action-ok'));
-    const request6 = await logger.requests[0].response.body;
+    //const request6 = await logger.requests[0].response.body;
     logger.clear();
 
     await page.unselectFromUID(FirstPhoto);
@@ -113,20 +113,20 @@ test('#3 Approve photo using approve and by adding location', async t => {
         .typeText(Selector('input[aria-label="Latitude"]'), '9.999')
         .typeText(Selector('input[aria-label="Longitude"]'), '9.999')
         .click(Selector('button.action-ok'));
-    const request7 = await logger.requests[0].response.body;
+    //const request7 = await logger.requests[0].response.body;
 
     await t
         .click(Selector('button.action-reload'));
-    const request8 = await logger.requests[0].response.body;
+    //const request8 = await logger.requests[0].response.body;
     logger.clear();
     await t
         .expect(Selector('div').withAttribute('data-uid', FirstPhoto).exists, {timeout: 5000}).notOk()
         .expect(Selector('div').withAttribute('data-uid', SecondPhoto).exists, {timeout: 5000}).notOk()
-        .click(Selector('.p-navigation-photos'));
+        .click(Selector('.nav-photos'));
-    const request9 = await logger.requests[0].response.body;
+    //const request9 = await logger.requests[0].response.body;
     logger.clear();
     await page.search('type:image');
-    const request10 = await logger.requests[0].response.body;
+    //const request10 = await logger.requests[0].response.body;
     await t
         .expect(Selector('div').withAttribute('data-uid', FirstPhoto).visible).ok()
         .expect(Selector('div').withAttribute('data-uid', SecondPhoto).visible).ok();
@@ -135,30 +135,30 @@ test('#3 Approve photo using approve and by adding location', async t => {
 test('#4 Like/dislike photo/video', async t => {
 
     logger.clear();
-    const FirstPhoto = await Selector('.t-off').nth(0).getAttribute('data-uid');
+    const FirstPhoto = await Selector('i.t-off').nth(0).getAttribute('data-uid');
 
-    await t.click(Selector('.p-navigation-video'));
+    await t.click(Selector('.nav-video'));
-    const request1 = await logger.requests[0].response.body;
+    //const request1 = await logger.requests[0].response.body;
     const FirstVideo = await Selector('.t-off').nth(0).getAttribute('data-uid');
 
-    await t.click(Selector('.p-navigation-favorites'));
+    await t.click(Selector('.nav-favorites'));
     await t
         .expect(Selector('div').withAttribute('data-uid', FirstPhoto).exists, {timeout: 5000}).notOk()
         .expect(Selector('div').withAttribute('data-uid', FirstVideo).exists, {timeout: 5000}).notOk()
-        .click(Selector('.p-navigation-photos'));
+        .click(Selector('.nav-photos'));
 
     logger.clear();
     await page.likePhoto(FirstPhoto);
-    const request2 = await logger.requests[0].response.body;
+    //const request2 = await logger.requests[0].response.body;
     logger.clear();
     await t
         .click(Selector('.action-reload'))
         .expect(Selector('i.t-on').withAttribute('data-uid', FirstPhoto).exists, {timeout: 5000}).ok();
     logger.clear();
 
-    await t.click(Selector('.p-navigation-video'));
+    await t.click(Selector('.nav-video'));
     await page.likePhoto(FirstVideo);
-    const request3 = await logger.requests[0].response.body;
+    //const request3 = await logger.requests[0].response.body;
     logger.clear();
     await t
         .click(Selector('.action-reload'))
@@ -166,20 +166,20 @@ test('#4 Like/dislike photo/video', async t => {
     logger.clear();
 
     await t
-        .click(Selector('.p-navigation-favorites'));
+        .click(Selector('.nav-favorites'));
-    const request4 = await logger.requests[0].response.body;
+    //const request4 = await logger.requests[0].response.body;
     logger.clear();
     await t
         .expect(Selector('div').withAttribute('data-uid', FirstPhoto).exists, {timeout: 5000}).ok()
         .expect(Selector('div').withAttribute('data-uid', FirstVideo).exists, {timeout: 5000}).ok()
         .expect(Selector('div.v-image__image').visible).ok();
     await page.dislikePhoto(FirstVideo);
-    const request5 = await logger.requests[0].response.body;
+    //const request5 = await logger.requests[0].response.body;
     logger.clear();
     await page.dislikePhoto(FirstPhoto);
     logger.clear();
     await t.click(Selector('.action-reload'));
-    const request6 = await logger.requests[0].response.body;
+    //const request6 = await logger.requests[0].response.body;
     await t
         .expect(Selector('div').withAttribute('data-uid', FirstPhoto).exists, {timeout: 5000}).notOk()
         .expect(Selector('div').withAttribute('data-uid', FirstVideo).exists, {timeout: 5000}).notOk();
@@ -188,30 +188,30 @@ test('#4 Like/dislike photo/video', async t => {
 //TODO Check private photos do not appear in labels, places, albums, moments...
 test('#5 Private/unprivate photo/video using clipboard and list', async t => {
     await t
-        .click(Selector('.p-navigation-photos'))
+        .click(Selector('.nav-photos'))
         .click(Selector('.p-expand-search'));
     logger.clear();
     await page.setFilter('view', 'Mosaic');
-    const request1 = await logger.requests[0].response.body;
+    //const request1 = await logger.requests[0].response.body;
     const FirstPhoto = await Selector('div.p-photo').nth(0).getAttribute('data-uid');
     const SecondPhoto = await Selector('div.p-photo').nth(1).getAttribute('data-uid');
     const ThirdPhoto = await Selector('div.p-photo').nth(2).getAttribute('data-uid');
 
     await t
-        .click(Selector('.p-navigation-video'));
+        .click(Selector('.nav-video'));
-    const request2 = await logger.requests[0].response.body;
+    //const request2 = await logger.requests[0].response.body;
     const FirstVideo = await Selector('div.p-photo').nth(0).getAttribute('data-uid');
     const SecondVideo = await Selector('div.p-photo').nth(1).getAttribute('data-uid');
 
-    await t.click(Selector('.p-navigation-private'));
+    await t.click(Selector('.nav-private'));
-    const request3 = await logger.requests[0].response.body;
+    //const request3 = await logger.requests[0].response.body;
     await t
         .expect(Selector('div').withAttribute('data-uid', FirstPhoto).exists, {timeout: 5000}).notOk()
         .expect(Selector('div').withAttribute('data-uid', SecondPhoto).exists, {timeout: 5000}).notOk()
         .expect(Selector('div').withAttribute('data-uid', ThirdPhoto).exists, {timeout: 5000}).notOk()
         .expect(Selector('div').withAttribute('data-uid', FirstVideo).exists, {timeout: 5000}).notOk()
         .expect(Selector('div').withAttribute('data-uid', SecondVideo).exists, {timeout: 5000}).notOk()
-        .click(Selector('.p-navigation-photos'));
+        .click(Selector('.nav-photos'));
     await page.selectFromUID(FirstPhoto);
     await page.selectFromUID(SecondPhoto);
     const clipboardCount = await Selector('span.count-clipboard');
@@ -222,25 +222,25 @@ test('#5 Private/unprivate photo/video using clipboard and list', async t => {
         .expect(Selector('button.action-menu').exists, {timeout: 5000}).notOk();
     logger.clear();
     await page.setFilter('view', 'List');
-    const request4 = await logger.requests[0].response.body;
+    //const request4 = await logger.requests[0].response.body;
     await t
         .click(Selector('button.p-photo-private').withAttribute('data-uid', ThirdPhoto));
     logger.clear();
     await t
         .click(Selector('.action-reload'));
-    const request5 = await logger.requests[0].response.body;
+    //const request5 = await logger.requests[0].response.body;
     logger.clear();
     await t
         .expect(Selector('td').withAttribute('data-uid', FirstPhoto).exists, {timeout: 5000}).notOk()
         .expect(Selector('td').withAttribute('data-uid', SecondPhoto).exists, {timeout: 5000}).notOk()
         .expect(Selector('td').withAttribute('data-uid', ThirdPhoto).exists, {timeout: 5000}).notOk()
-        .click(Selector('.p-navigation-video'));
+        .click(Selector('.nav-video'));
 
     logger.clear();
     await t
         .click(Selector('button.p-photo-private').withAttribute('data-uid', SecondVideo));
     await page.setFilter('view', 'Mosaic');
-    const request6 = await logger.requests[0].response.body;
+    //const request6 = await logger.requests[0].response.body;
     logger.clear();
 
     await page.selectFromUID(FirstVideo);
@@ -253,14 +253,14 @@ test('#5 Private/unprivate photo/video using clipboard and list', async t => {
     logger.clear();
     await t
         .click(Selector('.action-reload'));
-    const request7 = await logger.requests[0].response.body;
+    //const request7 = await logger.requests[0].response.body;
     logger.clear();
     await t
         .expect(Selector('div').withAttribute('data-uid', FirstVideo).exists, {timeout: 5000}).notOk()
         .expect(Selector('div').withAttribute('data-uid', SecondVideo).exists, {timeout: 5000}).notOk()
-        .click(Selector('.p-navigation-private'));
+        .click(Selector('.nav-private'));
 
-    const request8 = await logger.requests[0].response.body;
+    //const request8 = await logger.requests[0].response.body;
     logger.clear();
     await t
         .expect(Selector('div').withAttribute('data-uid', FirstPhoto).exists, {timeout: 5000}).ok()
@@ -280,7 +280,7 @@ test('#5 Private/unprivate photo/video using clipboard and list', async t => {
     await page.setFilter('view', 'Mosaic');
     logger.clear();
     await t.click(Selector('.action-reload'));
-    const request9 = await logger.requests[0].response.body;
+    //const request9 = await logger.requests[0].response.body;
     logger.clear();
     await t
         .expect(Selector('div').withAttribute('data-uid', FirstPhoto).exists, {timeout: 5000}).notOk()
@@ -288,17 +288,17 @@ test('#5 Private/unprivate photo/video using clipboard and list', async t => {
         .expect(Selector('div').withAttribute('data-uid', ThirdPhoto).exists, {timeout: 5000}).notOk()
         .expect(Selector('div').withAttribute('data-uid', FirstVideo).exists, {timeout: 5000}).notOk()
         .expect(Selector('div').withAttribute('data-uid', SecondVideo).exists, {timeout: 5000}).notOk()
-        .click(Selector('.p-navigation-photos'));
+        .click(Selector('.nav-photos'));
 
-    const request10 = await logger.requests[0].response.body;
+    //const request10 = await logger.requests[0].response.body;
     logger.clear();
     await t
         .expect(Selector('div').withAttribute('data-uid', FirstPhoto).exists, {timeout: 5000}).ok()
         .expect(Selector('div').withAttribute('data-uid', SecondPhoto).exists, {timeout: 5000}).ok()
         .expect(Selector('div').withAttribute('data-uid', ThirdPhoto).exists, {timeout: 5000}).ok()
-        .click(Selector('.p-navigation-video'));
+        .click(Selector('.nav-video'));
 
-    const request11 = await logger.requests[0].response.body;
+    //const request11 = await logger.requests[0].response.body;
     logger.clear();
     await t
         .expect(Selector('div').withAttribute('data-uid', FirstVideo).exists, {timeout: 5000}).ok()
@@ -308,36 +308,36 @@ test('#5 Private/unprivate photo/video using clipboard and list', async t => {
 test('#6 Archive/restore video, photos, private photos and review photos using clipboard', async t => {
     await page.openNav();
     await t
-        .click(Selector('.p-navigation-photos'))
+        .click(Selector('.nav-photos'))
         .click(Selector('.p-expand-search'));
     logger.clear();
     await page.setFilter('view', 'Mosaic');
-    const request1 = await logger.requests[0].response.body;
+    //const request1 = await logger.requests[0].response.body;
     const FirstPhoto = await Selector('div.p-photo').nth(0).getAttribute('data-uid');
     const SecondPhoto = await Selector('div.p-photo').nth(1).getAttribute('data-uid');
 
     await t
-        .click(Selector('.p-navigation-video'));
+        .click(Selector('.nav-video'));
-    const request2 = await logger.requests[0].response.body;
+    //const request2 = await logger.requests[0].response.body;
     const FirstVideo = await Selector('div.p-photo').nth(0).getAttribute('data-uid');
     logger.clear();
 
     await t
-        .click(Selector('.p-navigation-private'));
+        .click(Selector('.nav-private'));
-    const request3 = await logger.requests[0].response.body;
+    //const request3 = await logger.requests[0].response.body;
     const FirstPrivatePhoto = await Selector('div.p-photo').nth(0).getAttribute('data-uid');
     logger.clear();
 
     await t
-        .click(Selector('div.p-navigation-photos + div'))
+        .click(Selector('div.nav-photos + div'))
-        .click(Selector('.p-navigation-review'));
+        .click(Selector('.nav-review'));
-    const request4 = await logger.requests[0].response.body;
+    //const request4 = await logger.requests[0].response.body;
     const FirstReviewPhoto = await Selector('div.p-photo').nth(0).getAttribute('data-uid');
     logger.clear();
 
     await t
-        .click(Selector('.p-navigation-archive'));
+        .click(Selector('.nav-archive'));
-    const request5 = await logger.requests[0].response.body;
+    //const request5 = await logger.requests[0].response.body;
     logger.clear();
     await t
         .expect(Selector('div').withAttribute('data-uid', FirstPhoto).exists, {timeout: 5000}).notOk()
@@ -347,8 +347,8 @@ test('#6 Archive/restore video, photos, private photos and review photos using c
         .expect(Selector('div').withAttribute('data-uid', FirstReviewPhoto).exists, {timeout: 5000}).notOk();
 
     await t
-        .click(Selector('.p-navigation-video'));
+        .click(Selector('.nav-video'));
-    const request6 = await logger.requests[0].response.body;
+    //const request6 = await logger.requests[0].response.body;
     logger.clear();
     await page.selectFromUID(FirstVideo);
     const clipboardCountVideo = await Selector('span.count-clipboard');
@@ -359,13 +359,13 @@ test('#6 Archive/restore video, photos, private photos and review photos using c
     await t
         .expect(Selector('button.action-menu').exists, {timeout: 5000}).notOk()
         .click(Selector('.action-reload'));
-    const request7 = await logger.requests[0].response.body;
+    //const request7 = await logger.requests[0].response.body;
     logger.clear();
     await t
         .expect(Selector('div').withAttribute('data-uid', FirstVideo).exists, {timeout: 5000}).notOk()
-        .click(Selector('.p-navigation-photos'));
+        .click(Selector('.nav-photos'));
 
-    const request8 = await logger.requests[0].response.body;
+    //const request8 = await logger.requests[0].response.body;
     logger.clear();
     await page.selectFromUID(FirstPhoto);
     await page.selectFromUID(SecondPhoto);
@@ -377,23 +377,23 @@ test('#6 Archive/restore video, photos, private photos and review photos using c
     await t
         .expect(Selector('button.action-menu').exists, {timeout: 5000}).notOk()
         .click(Selector('.action-reload'));
-    const request9 = await logger.requests[0].response.body;
+    //const request9 = await logger.requests[0].response.body;
     logger.clear();
     await t
         .expect(Selector('div').withAttribute('data-uid', FirstPhoto).exists, {timeout: 5000}).notOk()
         .expect(Selector('div').withAttribute('data-uid', SecondPhoto).exists, {timeout: 5000}).notOk()
-        .click(Selector('.p-navigation-private'));
+        .click(Selector('.nav-private'));
 
-    const request10 = await logger.requests[0].response.body;
+    //const request10 = await logger.requests[0].response.body;
     logger.clear();
     await page.selectFromUID(FirstPrivatePhoto);
     const clipboardCountPrivate = await Selector('span.count-clipboard');
     await t
         .expect(clipboardCountPrivate.textContent).eql("1");
     await t
-        .click(Selector('.p-navigation-review'));
+        .click(Selector('.nav-review'));
 
-    const request11 = await logger.requests[0].response.body;
+    //const request11 = await logger.requests[0].response.body;
     logger.clear();
     await page.selectFromUID(FirstReviewPhoto);
     const clipboardCountReview = await Selector('span.count-clipboard');
@@ -404,12 +404,12 @@ test('#6 Archive/restore video, photos, private photos and review photos using c
     await t
         .expect(Selector('button.action-menu').exists, {timeout: 5000}).notOk()
         .click(Selector('.action-reload'));
-    const request12 = await logger.requests[0].response.body;
+    //const request12 = await logger.requests[0].response.body;
     logger.clear();
     await t
         .expect(Selector('div').withAttribute('data-uid', FirstReviewPhoto).exists, {timeout: 5000}).notOk()
-        .click(Selector('.p-navigation-archive'));
+        .click(Selector('.nav-archive'));
-    const request13 = await logger.requests[0].response.body;
+    //const request13 = await logger.requests[0].response.body;
     logger.clear();
 
     await t
@@ -431,7 +431,7 @@ test('#6 Archive/restore video, photos, private photos and review photos using c
     await t
         .expect(Selector('button.action-menu').exists, {timeout: 5000}).notOk()
         .click(Selector('.action-reload'));
-    const request14 = await logger.requests[0].response.body;
+    //const request14 = await logger.requests[0].response.body;
     await t
         .expect(Selector('div').withAttribute('data-uid', FirstPhoto).exists, {timeout: 5000}).notOk()
         .expect(Selector('div').withAttribute('data-uid', SecondPhoto).exists, {timeout: 5000}).notOk()
@@ -441,30 +441,30 @@ test('#6 Archive/restore video, photos, private photos and review photos using c
     logger.clear();
 
     await t
-        .click(Selector('.p-navigation-video'));
+        .click(Selector('.nav-video'));
-    const request15 = await logger.requests[0].response.body;
+    //const request15 = await logger.requests[0].response.body;
     logger.clear();
     await t
         .expect(Selector('div').withAttribute('data-uid', FirstVideo).exists, {timeout: 5000}).ok();
 
     await t
-        .click(Selector('.p-navigation-photos'));
+        .click(Selector('.nav-photos'));
-    const request16 = await logger.requests[0].response.body;
+    //const request16 = await logger.requests[0].response.body;
     logger.clear();
     await t
         .expect(Selector('div').withAttribute('data-uid', FirstPhoto).exists, {timeout: 5000}).ok()
         .expect(Selector('div').withAttribute('data-uid', SecondPhoto).exists, {timeout: 5000}).ok();
 
     await t
-        .click(Selector('.p-navigation-private'));
+        .click(Selector('.nav-private'));
-    const request17 = await logger.requests[0].response.body;
+    //const request17 = await logger.requests[0].response.body;
     logger.clear();
     await t
         .expect(Selector('div').withAttribute('data-uid', FirstPrivatePhoto).exists, {timeout: 5000}).ok();
 
     await t
-        .click(Selector('.p-navigation-review'));
+        .click(Selector('.nav-review'));
-    const request18 = await logger.requests[0].response.body;
+    //const request18 = await logger.requests[0].response.body;
     logger.clear();
     await t
         .expect(Selector('div').withAttribute('data-uid', FirstReviewPhoto).exists, {timeout: 5000}).ok();
@@ -478,7 +478,7 @@ test('#6 Archive/restore video, photos, private photos and review photos using c
 test('#7 Edit photo/video', async t => {
     await page.openNav();
     await t
-        .click(Selector('.p-navigation-photos'))
+        .click(Selector('.nav-photos'))
         .click(Selector('.p-expand-search'));
     await page.setFilter('view', 'Cards');
     const FirstPhoto = await Selector('div.p-photo').nth(0).getAttribute('data-uid');
@@ -489,7 +489,7 @@ test('#7 Edit photo/video', async t => {
         logger.clear();
     await t
         .click(Selector('button.action-next'));
-    const request1 = await logger.requests[0].response.body;
+    //const request1 = await logger.requests[0].response.body;
     await t
         .expect(Selector('button.action-previous').getAttribute('disabled')).notEql('disabled')
         .click(Selector('button.action-previous'))
@@ -554,14 +554,14 @@ test('#7 Edit photo/video', async t => {
         .typeText(Selector('.input-keywords textarea'), ', cat, love')
         .typeText(Selector('.input-notes textarea'), 'Some notes', { replace: true })
         .click(Selector('button.action-approve'));
-    const request2 = await logger.requests[0].response.body;
+    //const request2 = await logger.requests[0].response.body;
     await t
         .expect(Selector('.input-latitude input').visible, {timeout: 5000}).ok()
         .click(Selector('button.action-ok'));
     logger.clear();
     await t
         .click(Selector('button.action-reload'));
-    const request3 = await logger.requests[0].response.body;
+    //const request3 = await logger.requests[0].response.body;
     await t
         .expect(Selector('button.action-title-edit').withAttribute('data-uid', FirstPhoto).innerText).eql('New Photo Title')
 
@@ -721,14 +721,14 @@ test('#7 Edit photo/video', async t => {
     logger.clear();
     await t
         .click(Selector('.action-reload'));
-    const request4 = await logger.requests[0].response.body;
+    //const request4 = await logger.requests[0].response.body;
     await t.expect(Selector('button.action-title-edit').withAttribute('data-uid', FirstPhoto).innerText).eql(FirstPhotoTitle);
 });
 
 test('#8 Change primary file', async t => {
     await page.openNav();
     await t
-        .click(Selector('.p-navigation-photos'))
+        .click(Selector('.nav-photos'))
         .click(Selector('.p-expand-search'));
     await page.search('ski');
     const SequentialPhoto = await Selector('div.p-photo').nth(0).getAttribute('data-uid');

frontend/tests/acceptance/places.js

@@ -9,7 +9,7 @@ fixture`Test places page`
 
 test('#1 Test places', async t => {
     await t
-        .click(Selector('.p-navigation-places'))
+        .click(Selector('.nav-places'))
         .expect(Selector('#map').exists, {timeout: 15000}).ok()
         .expect(Selector('div.p-map-control').visible).ok();
     await t

frontend/tests/acceptance/settings/general.js

@@ -14,7 +14,7 @@ test('#1 Settings', async t => {
     await page.openNav();
     await t
         .expect(Selector('.action-upload').exists, {timeout: 5000}).ok()
-        .expect(Selector('.p-navigation-photos').innerText).contains('Photos');
+        .expect(Selector('.nav-photos').innerText).contains('Photos');
     await page.selectNthPhoto(0);
     await t
         .click(Selector('button.action-menu'))
@@ -36,27 +36,27 @@ test('#1 Settings', async t => {
         .expect(Selector('button.p-photo-label-add').visible).ok()
         .click(Selector('#tab-details'))
         .click(Selector('button.action-close'))
-        .click(Selector('.p-navigation-library'))
+        .click(Selector('.nav-library'))
         .expect(Selector('#tab-import a').visible).ok()
         .expect(Selector('#tab-logs a').visible).ok()
-        .click(Selector('div.p-navigation-photos + div'))
+        .click(Selector('div.nav-photos + div'))
-        .expect(Selector('.p-navigation-archive').visible).ok()
+        .expect(Selector('.nav-archive').visible).ok()
-        .expect(Selector('.p-navigation-review').visible).ok()
+        .expect(Selector('.nav-review').visible).ok()
-        .click(Selector('div.p-navigation-library + div'))
+        .click(Selector('div.nav-library + div'))
-        .expect(Selector('.p-navigation-originals').visible).ok()
+        .expect(Selector('.nav-originals').visible).ok()
-        .click(Selector('div.p-navigation-albums + div'))
+        .click(Selector('div.nav-albums + div'))
-        .expect(Selector('.p-navigation-folders').visible).ok()
+        .expect(Selector('.nav-folders').visible).ok()
-        .expect(Selector('.p-navigation-moments').visible).ok()
+        .expect(Selector('.nav-moments').visible).ok()
-        .expect(Selector('.p-navigation-labels').visible).ok()
+        .expect(Selector('.nav-labels').visible).ok()
-        .expect(Selector('.p-navigation-places').visible).ok()
+        .expect(Selector('.nav-places').visible).ok()
-        .expect(Selector('.p-navigation-private').visible).ok()
+        .expect(Selector('.nav-private').visible).ok()
 
 
-        .click(Selector('.p-navigation-settings'))
+        .click(Selector('.nav-settings'))
         .click(Selector('.input-language input'))
         .hover(Selector('div').withText('German').parent('div[role="listitem"]'))
         .click(Selector('div').withText('German').parent('div[role="listitem"]'))
-        .click(Selector('.p-navigation-settings'))
+        .click(Selector('.nav-settings'))
         .click(Selector('.input-upload input'))
         .click(Selector('.input-download input'))
         .click(Selector('.input-import input'))
@@ -70,13 +70,13 @@ test('#1 Settings', async t => {
         .click(Selector('.input-places input'))
         .click(Selector('.input-private input'))
         .click(Selector('.input-review input'))
-        .click(Selector('.p-navigation-photos'));
+        .click(Selector('.nav-photos'));
 
     await t.eval(() => location.reload());
     await page.openNav();
     await t
         .expect(Selector('button.action-upload').exists).notOk()
-        .expect(Selector('.p-navigation-photos').innerText).contains('Fotos');
+        .expect(Selector('.nav-photos').innerText).contains('Fotos');
     await page.selectNthPhoto(0);
     await t
         .click(Selector('button.action-menu'))
@@ -103,25 +103,25 @@ test('#1 Settings', async t => {
         .expect(Selector('button.p-photo-label-add').exists).notOk()
         .click(Selector('#tab-details'))
         .click(Selector('button.action-close'))
-        .click(Selector('.p-navigation-library'))
+        .click(Selector('.nav-library'))
         .expect(Selector('#tab-import a').exists).notOk()
         .expect(Selector('#tab-logs a').exists).notOk()
-        .click(Selector('div.p-navigation-photos + div'))
+        .click(Selector('div.nav-photos + div'))
-        .expect(Selector('.p-navigation-archive').visible).notOk()
+        .expect(Selector('.nav-archive').visible).notOk()
-        .expect(Selector('.p-navigation-review').exists).notOk()
+        .expect(Selector('.nav-review').exists).notOk()
-        .click(Selector('div.p-navigation-library + div'))
+        .click(Selector('div.nav-library + div'))
-        .expect(Selector('.p-navigation-originals').visible).notOk()
+        .expect(Selector('.nav-originals').visible).notOk()
-        .click(Selector('div.p-navigation-albums + div'))
+        .click(Selector('div.nav-albums + div'))
-        .expect(Selector('.p-navigation-moments').visible).notOk()
+        .expect(Selector('.nav-moments').visible).notOk()
-        .expect(Selector('.p-navigation-labels').visible).notOk()
+        .expect(Selector('.nav-labels').visible).notOk()
-        .expect(Selector('.p-navigation-places').visible).notOk()
+        .expect(Selector('.nav-places').visible).notOk()
-        .expect(Selector('.p-navigation-private').visible).notOk()
+        .expect(Selector('.nav-private').visible).notOk()
 
-        .click(Selector('.p-navigation-settings'))
+        .click(Selector('.nav-settings'))
         .click(Selector('.input-language input'))
         .hover(Selector('div').withText('English').parent('div[role="listitem"]'))
         .click(Selector('div').withText('English').parent('div[role="listitem"]'))
-        .click(Selector('.p-navigation-settings'))
+        .click(Selector('.nav-settings'))
         .click(Selector('.input-upload input'))
         .click(Selector('.input-download input'))
         .click(Selector('.input-import input'))