luisgulo/photoprism
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Frontend: Run tests with Puppeteer instead of Chromium

Browse source
This commit is contained in:
Michael Mayer 2021-10-21 18:36:04 +02:00
parent 3417539218
commit 7a97a3a531
4 changed files with 656 additions and 119 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
docker/development/Dockerfile
View file

@ -39,6 +39,8 @@ RUN apt-get update && apt-get -qq dist-upgrade && apt-get -qq install --no-insta
libzmq3-dev \
libx264-dev \
libx265-dev \
libnss3 \
libxtst6 \
pkg-config \
software-properties-common \
rsync \
@ -81,46 +83,38 @@ ENV LD_LIBRARY_PATH="/root/.local/lib:/usr/local/lib:/usr/lib:/lib" \
GO111MODULE="on" \
CGO_CFLAGS="-g -O2 -Wno-return-local-addr"
# Install & configure TensorFlow for C,
# see https://www.tensorflow.org/install/lang_c
#
# We also have custom builds available:
# https://dl.photoprism.org/tensorflow/linux/
#
RUN /root/.local/bin/install-tensorflow.sh $TARGETARCH
# Install NodeJS
RUN curl -sL https://deb.nodesource.com/setup_14.x | bash -
RUN add-apt-repository -y ppa:saiarcot895/chromium-beta && \
# Install TensorFlow for C & NodeJS
RUN /root/.local/bin/install-tensorflow.sh $TARGETARCH && \
curl -sL https://deb.nodesource.com/setup_14.x | bash - && \
apt-get update && \
apt-get -qq install chromium-browser chromium-codecs-ffmpeg-extra nodejs && \
apt-get -qq install nodejs && \
apt-get -y autoremove && \
apt-get -y autoclean && \
apt-get clean && \
rm -rf /var/lib/apt/lists/*
# Install NodeJS & NPM
# Install NPM, Puppeteer, TestCafe & ChromeDriver
RUN umask 0000 && npm install --unsafe-perm=true --allow-root -g npm && npm config set cache ~/.cache/npm && \
[ "$TARGETARCH" = "arm" ] || npm install --unsafe-perm=true --allow-root -g testcafe chromedriver;
[ "$TARGETARCH" = "arm" ] || npm install --unsafe-perm=true --allow-root -g puppeteer testcafe testcafe-browser-provider-puppeteer chromedriver;
# Install Go
RUN /root/.local/bin/install-go.sh ${TARGETARCH} && \
mkdir -p "/go/src" "/go/bin" && \
chmod -R 777 "/go"
# Download TensorFlow model and test files
# Download TensorFlow models & example files for testing
RUN rm -rf /tmp/* && mkdir -p /tmp/photoprism && \
wget "https://dl.photoprism.org/tensorflow/nsfw.zip?${BUILD_TAG}" -O /tmp/photoprism/nsfw.zip && \
wget "https://dl.photoprism.org/tensorflow/nasnet.zip?${BUILD_TAG}" -O /tmp/photoprism/nasnet.zip && \
wget "https://dl.photoprism.org/tensorflow/facenet.zip?${BUILD_TAG}" -O /tmp/photoprism/facenet.zip && \
wget "https://dl.photoprism.org/qa/testdata.zip?${BUILD_TAG}" -O /tmp/photoprism/testdata.zip
# Copy additional files to image
# Copy additional scripts to image
COPY --chown=root:root /docker/scripts/heif-convert.sh /usr/local/bin/heif-convert
COPY --chown=root:root /docker/scripts/Makefile /root/Makefile
COPY --chown=root:root /docker/development/entrypoint.sh /entrypoint.sh
# Install Go tools
RUN /usr/local/go/bin/go install github.com/tianon/gosu@latest && \
/usr/local/go/bin/go install golang.org/x/tools/cmd/goimports@latest && \
/usr/local/go/bin/go install github.com/kyoh86/richgo@latest && \

4
frontend/karma.conf.js
View file

@ -29,9 +29,7 @@ https://docs.photoprism.org/developer-guide/
*/
const path = require("path");
const findChrome = require("chrome-finder");
const chromeBin = findChrome();
process.env.CHROME_BIN = chromeBin;
process.env.CHROME_BIN = require("puppeteer").executablePath();
module.exports = (config) => {
config.set({

738
frontend/package-lock.json generated
View file

File diff suppressed because it is too large Load diff

5
frontend/package.json
View file

@ -13,9 +13,9 @@
"fmt": "eslint --cache --fix src/ *.js .eslintrc.js",
"test": "karma start",
"upgrade": "npm --depth 10 update && npm audit fix",
"acceptance": "testcafe \"chromium:headless --disable-dev-shm-usage\" --skip-js-errors --quarantine-mode --selector-timeout 5000 -S -s tests/screenshots tests/acceptance",
"acceptance": "testcafe puppeteer --skip-js-errors --quarantine-mode --selector-timeout 5000 -S -s tests/screenshots tests/acceptance",
"acceptance-firefox": "testcafe firefox:headless --skip-js-errors --quarantine-mode --selector-timeout 5000 -S -s tests/screenshots tests/acceptance",
"acceptance-private": "testcafe \"chromium:headless --disable-dev-shm-usage\" --skip-js-errors --quarantine-mode --selector-timeout 5000 -S -s tests/screenshots tests/acceptance-private",
"acceptance-private": "testcafe puppeteer --skip-js-errors --quarantine-mode --selector-timeout 5000 -S -s tests/screenshots tests/acceptance-private",
"acceptance-private-firefox": "testcafe firefox:headless --skip-js-errors --quarantine-mode --selector-timeout 5000 -S -s tests/screenshots tests/acceptance-private",
"acceptance-local": "testcafe chrome --selector-timeout 5000 -S -s tests/screenshots tests/acceptance",
"gettext-extract": "gettext-extract --output src/locales/translations.pot $(find src -type f \\( -iname \\*.vue -o -iname \\*.js \\) -not -path src/common/vm.js)",
@ -87,6 +87,7 @@
"postcss-url": "^10.1.3",
"prettier": "^2.3.2",
"pubsub-js": "^1.9.3",
"puppeteer": "^10.4.0",
"regenerator-runtime": "^0.13.7",
"resolve-url-loader": "^3.1.4",
"sass": "^1.36.0",