From 9f8bad1ffa0ef596eacd5531aad1099f220241bf Mon Sep 17 00:00:00 2001
From: Michael Mayer <michael@liquidbytes.net>
Date: Thu, 5 Dec 2019 03:58:54 +0100
Subject: [PATCH] Frontend: Code & test clean-up

Signed-off-by: Michael Mayer <michael@liquidbytes.net>
---
 Makefile                                              | 11 ++++++-----
 frontend/karma.conf.js                                |  3 ++-
 frontend/package.json                                 |  4 ++--
 frontend/src/component/p-navigation.vue               |  2 +-
 .../src/pages/{albums/view.vue => album/photos.vue}   |  4 ++--
 frontend/src/pages/albums.vue                         |  2 +-
 frontend/src/routes.js                                |  6 +++---
 7 files changed, 17 insertions(+), 15 deletions(-)
 rename frontend/src/pages/{albums/view.vue => album/photos.vue} (98%)

diff --git a/Makefile b/Makefile
index f063d5e45..680201cce 100644
--- a/Makefile
+++ b/Makefile
@@ -18,7 +18,8 @@ dep: dep-tensorflow dep-js dep-go
 build: build-js build-go
 install: install-bin install-assets
 test: test-js test-go
-acceptance: start test-chromium test-firefox stop
+acceptance-all: start acceptance acceptance-firefox stop
+test-all: test acceptance-all
 fmt: fmt-js fmt-go
 upgrade: upgrade-js upgrade-go
 start:
@@ -63,12 +64,12 @@ watch-js:
 test-js:
 	$(info Running JS unit tests...)
 	(cd frontend &&	env NODE_ENV=development BABEL_ENV=test npm run test)
-test-chromium:
+acceptance:
 	$(info Running JS acceptance tests in Chrome...)
-	(cd frontend &&	npm run test-chromium)
-test-firefox:
+	(cd frontend &&	npm run acceptance)
+acceptance-firefox:
 	$(info Running JS acceptance tests in Firefox...)
-	(cd frontend &&	npm run test-firefox)
+	(cd frontend &&	npm run acceptance-firefox)
 test-go:
 	$(info Running all Go unit tests...)
 	$(GOTEST) -count=1 -tags=slow -timeout 20m ./internal/...
diff --git a/frontend/karma.conf.js b/frontend/karma.conf.js
index 9d5d02b45..397158de6 100644
--- a/frontend/karma.conf.js
+++ b/frontend/karma.conf.js
@@ -5,7 +5,7 @@ process.env.CHROME_BIN = findChrome();
 
 module.exports = (config) => {
     config.set({
-        logLevel: config.LOG_INFO,
+        logLevel: config.LOG_ERROR,
 
         webpackMiddleware: {
             stats: "errors-only",
@@ -24,6 +24,7 @@ module.exports = (config) => {
 
         files: [
             {pattern: "tests/unit/**/*_test.js", watched: false},
+            'node_modules/@babel/polyfill/dist/polyfill.js',
         ],
 
         // Preprocess through webpack
diff --git a/frontend/package.json b/frontend/package.json
index 1f7a90ade..f42ccfca0 100644
--- a/frontend/package.json
+++ b/frontend/package.json
@@ -10,8 +10,8 @@
     "lint": "eslint --cache src/ *.js",
     "fmt": "eslint --cache --fix src/ *.js",
     "test": "karma start",
-    "test-chromium": "testcafe \"chromium:headless --disable-dev-shm-usage\" --selector-timeout 5000 -S -s tests/screenshots tests/acceptance",
-    "test-firefox": "testcafe firefox:headless --selector-timeout 5000 -S -s tests/screenshots tests/acceptance",
+    "acceptance": "testcafe \"chromium:headless --disable-dev-shm-usage\" --selector-timeout 5000 -S -s tests/screenshots tests/acceptance",
+    "acceptance-firefox": "testcafe firefox:headless --selector-timeout 5000 -S -s tests/screenshots tests/acceptance",
     "gettext-extract": "gettext-extract --attribute v-translate --output src/resources/translations.pot $(find src/ -type f -name '*.vue')",
     "gettext-compile": "gettext-compile --output src/resources/translations.json src/resources/*.po"
   },
diff --git a/frontend/src/component/p-navigation.vue b/frontend/src/component/p-navigation.vue
index 9384fe2ba..811e21fe5 100644
--- a/frontend/src/component/p-navigation.vue
+++ b/frontend/src/component/p-navigation.vue
@@ -90,7 +90,7 @@
                     </v-list-tile>
 
                     <v-list-tile v-for="(album, index) in config.albums"
-                                 :key="index" :to="{ name: 'albums_view', params: { uuid: album.AlbumUUID, slug: album.AlbumSlug } }">
+                                 :key="index" :to="{ name: 'album', params: { uuid: album.AlbumUUID, slug: album.AlbumSlug } }">
                         <v-list-tile-content>
                             <v-list-tile-title v-if="album.AlbumName">{{ album.AlbumName }}</v-list-tile-title>
                             <v-list-tile-title v-else>Untitled</v-list-tile-title>
diff --git a/frontend/src/pages/albums/view.vue b/frontend/src/pages/album/photos.vue
similarity index 98%
rename from frontend/src/pages/albums/view.vue
rename to frontend/src/pages/album/photos.vue
index ad473f537..6225f49d2 100644
--- a/frontend/src/pages/albums/view.vue
+++ b/frontend/src/pages/album/photos.vue
@@ -1,5 +1,5 @@
 <template>
-    <div class="p-page p-page-albums-view" v-infinite-scroll="loadMore" :infinite-scroll-disabled="scrollDisabled"
+    <div class="p-page p-page-album-photos" v-infinite-scroll="loadMore" :infinite-scroll-disabled="scrollDisabled"
          :infinite-scroll-distance="10" :infinite-scroll-listen-for-event="'scrollRefresh'">
 
         <p-album-photo-search :settings="settings" :filter="filter" :filter-change="updateQuery"
@@ -25,7 +25,7 @@
     import Photo from "model/photo";
 
     export default {
-        name: 'p-page-albums-view',
+        name: 'p-page-album-photos',
         props: {
             staticFilter: Object
         },
diff --git a/frontend/src/pages/albums.vue b/frontend/src/pages/albums.vue
index 600bf39d9..96b791036 100644
--- a/frontend/src/pages/albums.vue
+++ b/frontend/src/pages/albums.vue
@@ -157,7 +157,7 @@
             },
             openAlbum(index) {
                 const album = this.results[index];
-                this.$router.push({name: "albums_view", params: { uuid: album.AlbumUUID, slug: album.AlbumSlug }});
+                this.$router.push({name: "album", params: { uuid: album.AlbumUUID, slug: album.AlbumSlug }});
             },
             loadMore() {
                 if (this.scrollDisabled) return;
diff --git a/frontend/src/routes.js b/frontend/src/routes.js
index 3e32f5a4b..d0f544671 100644
--- a/frontend/src/routes.js
+++ b/frontend/src/routes.js
@@ -1,6 +1,6 @@
 import Photos from "pages/photos.vue";
 import Albums from "pages/albums.vue";
-import AlbumsView from "pages/albums/view.vue";
+import AlbumPhotos from "pages/album/photos.vue";
 import Places from "pages/places.vue";
 import Labels from "pages/labels.vue";
 import Events from "pages/events.vue";
@@ -36,9 +36,9 @@ export default [
         meta: {area: "Albums"},
     },
     {
-        name: "albums_view",
+        name: "album",
         path: "/albums/:uuid/:slug",
-        component: AlbumsView,
+        component: AlbumPhotos,
         meta: {area: "View Album"},
     },
     {