From 76e749777d95e6096136fad96c92e87d14822329 Mon Sep 17 00:00:00 2001 From: Jakob Ackermann Date: Mon, 26 Jul 2021 12:14:56 +0100 Subject: [PATCH] [misc] make build scripts happy again - move pdf.js tests into test/unit/js - add env override to build script config file - update build scripts --- services/clsi/buildscript.txt | 2 +- services/clsi/package.json | 2 +- services/clsi/test/unit/{lib => js}/pdfjsTests.js | 2 +- .../snapshots => js/snapshots/pdfjs}/asymptote/XrefTable.json | 0 .../snapshots/pdfjs}/biber_bibliography/XrefTable.json | 0 .../snapshots => js/snapshots/pdfjs}/epstopdf/XrefTable.json | 0 .../{lib/snapshots => js/snapshots/pdfjs}/feynmf/XrefTable.json | 0 .../{lib/snapshots => js/snapshots/pdfjs}/feynmp/XrefTable.json | 0 .../snapshots => js/snapshots/pdfjs}/fontawesome/XrefTable.json | 0 .../snapshots/pdfjs}/fontawesome_xelatex/XrefTable.json | 0 .../snapshots => js/snapshots/pdfjs}/glossaries/XrefTable.json | 0 .../snapshots => js/snapshots/pdfjs}/gnuplot/XrefTable.json | 0 .../{lib/snapshots => js/snapshots/pdfjs}/hebrew/XrefTable.json | 0 .../{lib/snapshots => js/snapshots/pdfjs}/knitr/XrefTable.json | 0 .../snapshots => js/snapshots/pdfjs}/knitr_utf8/XrefTable.json | 0 .../snapshots/pdfjs}/latex_compiler/XrefTable.json | 0 .../snapshots/pdfjs}/lualatex_compiler/XrefTable.json | 0 .../snapshots/pdfjs}/makeindex-custom-style/XrefTable.json | 0 .../snapshots => js/snapshots/pdfjs}/makeindex/XrefTable.json | 0 .../{lib/snapshots => js/snapshots/pdfjs}/minted/XrefTable.json | 0 .../snapshots/pdfjs}/multibib_bibliography/XrefTable.json | 0 .../snapshots/pdfjs}/nomenclature/XrefTable.json | 0 .../snapshots/pdfjs}/references_in_include/XrefTable.json | 0 .../snapshots/pdfjs}/simple_bibliography/XrefTable.json | 0 .../snapshots/pdfjs}/subdirectories/XrefTable.json | 0 .../snapshots/pdfjs}/tikz_feynman/XrefTable.json | 0 .../snapshots/pdfjs}/xelatex_compiler/XrefTable.json | 0 27 files changed, 3 insertions(+), 3 deletions(-) rename services/clsi/test/unit/{lib => js}/pdfjsTests.js (97%) rename services/clsi/test/unit/{lib/snapshots => js/snapshots/pdfjs}/asymptote/XrefTable.json (100%) rename services/clsi/test/unit/{lib/snapshots => js/snapshots/pdfjs}/biber_bibliography/XrefTable.json (100%) rename services/clsi/test/unit/{lib/snapshots => js/snapshots/pdfjs}/epstopdf/XrefTable.json (100%) rename services/clsi/test/unit/{lib/snapshots => js/snapshots/pdfjs}/feynmf/XrefTable.json (100%) rename services/clsi/test/unit/{lib/snapshots => js/snapshots/pdfjs}/feynmp/XrefTable.json (100%) rename services/clsi/test/unit/{lib/snapshots => js/snapshots/pdfjs}/fontawesome/XrefTable.json (100%) rename services/clsi/test/unit/{lib/snapshots => js/snapshots/pdfjs}/fontawesome_xelatex/XrefTable.json (100%) rename services/clsi/test/unit/{lib/snapshots => js/snapshots/pdfjs}/glossaries/XrefTable.json (100%) rename services/clsi/test/unit/{lib/snapshots => js/snapshots/pdfjs}/gnuplot/XrefTable.json (100%) rename services/clsi/test/unit/{lib/snapshots => js/snapshots/pdfjs}/hebrew/XrefTable.json (100%) rename services/clsi/test/unit/{lib/snapshots => js/snapshots/pdfjs}/knitr/XrefTable.json (100%) rename services/clsi/test/unit/{lib/snapshots => js/snapshots/pdfjs}/knitr_utf8/XrefTable.json (100%) rename services/clsi/test/unit/{lib/snapshots => js/snapshots/pdfjs}/latex_compiler/XrefTable.json (100%) rename services/clsi/test/unit/{lib/snapshots => js/snapshots/pdfjs}/lualatex_compiler/XrefTable.json (100%) rename services/clsi/test/unit/{lib/snapshots => js/snapshots/pdfjs}/makeindex-custom-style/XrefTable.json (100%) rename services/clsi/test/unit/{lib/snapshots => js/snapshots/pdfjs}/makeindex/XrefTable.json (100%) rename services/clsi/test/unit/{lib/snapshots => js/snapshots/pdfjs}/minted/XrefTable.json (100%) rename services/clsi/test/unit/{lib/snapshots => js/snapshots/pdfjs}/multibib_bibliography/XrefTable.json (100%) rename services/clsi/test/unit/{lib/snapshots => js/snapshots/pdfjs}/nomenclature/XrefTable.json (100%) rename services/clsi/test/unit/{lib/snapshots => js/snapshots/pdfjs}/references_in_include/XrefTable.json (100%) rename services/clsi/test/unit/{lib/snapshots => js/snapshots/pdfjs}/simple_bibliography/XrefTable.json (100%) rename services/clsi/test/unit/{lib/snapshots => js/snapshots/pdfjs}/subdirectories/XrefTable.json (100%) rename services/clsi/test/unit/{lib/snapshots => js/snapshots/pdfjs}/tikz_feynman/XrefTable.json (100%) rename services/clsi/test/unit/{lib/snapshots => js/snapshots/pdfjs}/xelatex_compiler/XrefTable.json (100%) diff --git a/services/clsi/buildscript.txt b/services/clsi/buildscript.txt index 6e927a8835..9b755dfe46 100644 --- a/services/clsi/buildscript.txt +++ b/services/clsi/buildscript.txt @@ -2,7 +2,7 @@ clsi --data-dirs=cache,compiles,db,output --dependencies= --docker-repos=gcr.io/overleaf-ops ---env-add= +--env-add=ENABLE_PDF_CACHING="true" --env-pass-through=TEXLIVE_IMAGE --node-version=12.22.3 --public-repo=True diff --git a/services/clsi/package.json b/services/clsi/package.json index 4f22ebd729..0b2b011d49 100644 --- a/services/clsi/package.json +++ b/services/clsi/package.json @@ -10,7 +10,7 @@ "start": "node $NODE_APP_OPTIONS app.js", "test:acceptance:_run": "mocha --recursive --reporter spec --timeout 15000 --exit $@ test/acceptance/js", "test:acceptance": "npm run test:acceptance:_run -- --grep=$MOCHA_GREP", - "test:unit:_run": "mocha --recursive --reporter spec $@ test/unit/js test/unit/lib", + "test:unit:_run": "mocha --recursive --reporter spec $@ test/unit/js", "test:unit": "npm run test:unit:_run -- --grep=$MOCHA_GREP", "nodemon": "nodemon --config nodemon.json", "lint": "eslint --max-warnings 0 --format unix .", diff --git a/services/clsi/test/unit/lib/pdfjsTests.js b/services/clsi/test/unit/js/pdfjsTests.js similarity index 97% rename from services/clsi/test/unit/lib/pdfjsTests.js rename to services/clsi/test/unit/js/pdfjsTests.js index f90c6f4924..92f10279d2 100644 --- a/services/clsi/test/unit/lib/pdfjsTests.js +++ b/services/clsi/test/unit/js/pdfjsTests.js @@ -3,7 +3,7 @@ const Path = require('path') const { expect } = require('chai') const { parseXrefTable } = require('../../../app/lib/pdfjs/parseXrefTable') const PATH_EXAMPLES = 'test/acceptance/fixtures/examples/' -const PATH_SNAPSHOTS = 'test/unit/lib/snapshots/' +const PATH_SNAPSHOTS = 'test/unit/js/snapshots/pdfjs/' const EXAMPLES = fs.readdirSync(PATH_EXAMPLES) function snapshotPath(example) { diff --git a/services/clsi/test/unit/lib/snapshots/asymptote/XrefTable.json b/services/clsi/test/unit/js/snapshots/pdfjs/asymptote/XrefTable.json similarity index 100% rename from services/clsi/test/unit/lib/snapshots/asymptote/XrefTable.json rename to services/clsi/test/unit/js/snapshots/pdfjs/asymptote/XrefTable.json diff --git a/services/clsi/test/unit/lib/snapshots/biber_bibliography/XrefTable.json b/services/clsi/test/unit/js/snapshots/pdfjs/biber_bibliography/XrefTable.json similarity index 100% rename from services/clsi/test/unit/lib/snapshots/biber_bibliography/XrefTable.json rename to services/clsi/test/unit/js/snapshots/pdfjs/biber_bibliography/XrefTable.json diff --git a/services/clsi/test/unit/lib/snapshots/epstopdf/XrefTable.json b/services/clsi/test/unit/js/snapshots/pdfjs/epstopdf/XrefTable.json similarity index 100% rename from services/clsi/test/unit/lib/snapshots/epstopdf/XrefTable.json rename to services/clsi/test/unit/js/snapshots/pdfjs/epstopdf/XrefTable.json diff --git a/services/clsi/test/unit/lib/snapshots/feynmf/XrefTable.json b/services/clsi/test/unit/js/snapshots/pdfjs/feynmf/XrefTable.json similarity index 100% rename from services/clsi/test/unit/lib/snapshots/feynmf/XrefTable.json rename to services/clsi/test/unit/js/snapshots/pdfjs/feynmf/XrefTable.json diff --git a/services/clsi/test/unit/lib/snapshots/feynmp/XrefTable.json b/services/clsi/test/unit/js/snapshots/pdfjs/feynmp/XrefTable.json similarity index 100% rename from services/clsi/test/unit/lib/snapshots/feynmp/XrefTable.json rename to services/clsi/test/unit/js/snapshots/pdfjs/feynmp/XrefTable.json diff --git a/services/clsi/test/unit/lib/snapshots/fontawesome/XrefTable.json b/services/clsi/test/unit/js/snapshots/pdfjs/fontawesome/XrefTable.json similarity index 100% rename from services/clsi/test/unit/lib/snapshots/fontawesome/XrefTable.json rename to services/clsi/test/unit/js/snapshots/pdfjs/fontawesome/XrefTable.json diff --git a/services/clsi/test/unit/lib/snapshots/fontawesome_xelatex/XrefTable.json b/services/clsi/test/unit/js/snapshots/pdfjs/fontawesome_xelatex/XrefTable.json similarity index 100% rename from services/clsi/test/unit/lib/snapshots/fontawesome_xelatex/XrefTable.json rename to services/clsi/test/unit/js/snapshots/pdfjs/fontawesome_xelatex/XrefTable.json diff --git a/services/clsi/test/unit/lib/snapshots/glossaries/XrefTable.json b/services/clsi/test/unit/js/snapshots/pdfjs/glossaries/XrefTable.json similarity index 100% rename from services/clsi/test/unit/lib/snapshots/glossaries/XrefTable.json rename to services/clsi/test/unit/js/snapshots/pdfjs/glossaries/XrefTable.json diff --git a/services/clsi/test/unit/lib/snapshots/gnuplot/XrefTable.json b/services/clsi/test/unit/js/snapshots/pdfjs/gnuplot/XrefTable.json similarity index 100% rename from services/clsi/test/unit/lib/snapshots/gnuplot/XrefTable.json rename to services/clsi/test/unit/js/snapshots/pdfjs/gnuplot/XrefTable.json diff --git a/services/clsi/test/unit/lib/snapshots/hebrew/XrefTable.json b/services/clsi/test/unit/js/snapshots/pdfjs/hebrew/XrefTable.json similarity index 100% rename from services/clsi/test/unit/lib/snapshots/hebrew/XrefTable.json rename to services/clsi/test/unit/js/snapshots/pdfjs/hebrew/XrefTable.json diff --git a/services/clsi/test/unit/lib/snapshots/knitr/XrefTable.json b/services/clsi/test/unit/js/snapshots/pdfjs/knitr/XrefTable.json similarity index 100% rename from services/clsi/test/unit/lib/snapshots/knitr/XrefTable.json rename to services/clsi/test/unit/js/snapshots/pdfjs/knitr/XrefTable.json diff --git a/services/clsi/test/unit/lib/snapshots/knitr_utf8/XrefTable.json b/services/clsi/test/unit/js/snapshots/pdfjs/knitr_utf8/XrefTable.json similarity index 100% rename from services/clsi/test/unit/lib/snapshots/knitr_utf8/XrefTable.json rename to services/clsi/test/unit/js/snapshots/pdfjs/knitr_utf8/XrefTable.json diff --git a/services/clsi/test/unit/lib/snapshots/latex_compiler/XrefTable.json b/services/clsi/test/unit/js/snapshots/pdfjs/latex_compiler/XrefTable.json similarity index 100% rename from services/clsi/test/unit/lib/snapshots/latex_compiler/XrefTable.json rename to services/clsi/test/unit/js/snapshots/pdfjs/latex_compiler/XrefTable.json diff --git a/services/clsi/test/unit/lib/snapshots/lualatex_compiler/XrefTable.json b/services/clsi/test/unit/js/snapshots/pdfjs/lualatex_compiler/XrefTable.json similarity index 100% rename from services/clsi/test/unit/lib/snapshots/lualatex_compiler/XrefTable.json rename to services/clsi/test/unit/js/snapshots/pdfjs/lualatex_compiler/XrefTable.json diff --git a/services/clsi/test/unit/lib/snapshots/makeindex-custom-style/XrefTable.json b/services/clsi/test/unit/js/snapshots/pdfjs/makeindex-custom-style/XrefTable.json similarity index 100% rename from services/clsi/test/unit/lib/snapshots/makeindex-custom-style/XrefTable.json rename to services/clsi/test/unit/js/snapshots/pdfjs/makeindex-custom-style/XrefTable.json diff --git a/services/clsi/test/unit/lib/snapshots/makeindex/XrefTable.json b/services/clsi/test/unit/js/snapshots/pdfjs/makeindex/XrefTable.json similarity index 100% rename from services/clsi/test/unit/lib/snapshots/makeindex/XrefTable.json rename to services/clsi/test/unit/js/snapshots/pdfjs/makeindex/XrefTable.json diff --git a/services/clsi/test/unit/lib/snapshots/minted/XrefTable.json b/services/clsi/test/unit/js/snapshots/pdfjs/minted/XrefTable.json similarity index 100% rename from services/clsi/test/unit/lib/snapshots/minted/XrefTable.json rename to services/clsi/test/unit/js/snapshots/pdfjs/minted/XrefTable.json diff --git a/services/clsi/test/unit/lib/snapshots/multibib_bibliography/XrefTable.json b/services/clsi/test/unit/js/snapshots/pdfjs/multibib_bibliography/XrefTable.json similarity index 100% rename from services/clsi/test/unit/lib/snapshots/multibib_bibliography/XrefTable.json rename to services/clsi/test/unit/js/snapshots/pdfjs/multibib_bibliography/XrefTable.json diff --git a/services/clsi/test/unit/lib/snapshots/nomenclature/XrefTable.json b/services/clsi/test/unit/js/snapshots/pdfjs/nomenclature/XrefTable.json similarity index 100% rename from services/clsi/test/unit/lib/snapshots/nomenclature/XrefTable.json rename to services/clsi/test/unit/js/snapshots/pdfjs/nomenclature/XrefTable.json diff --git a/services/clsi/test/unit/lib/snapshots/references_in_include/XrefTable.json b/services/clsi/test/unit/js/snapshots/pdfjs/references_in_include/XrefTable.json similarity index 100% rename from services/clsi/test/unit/lib/snapshots/references_in_include/XrefTable.json rename to services/clsi/test/unit/js/snapshots/pdfjs/references_in_include/XrefTable.json diff --git a/services/clsi/test/unit/lib/snapshots/simple_bibliography/XrefTable.json b/services/clsi/test/unit/js/snapshots/pdfjs/simple_bibliography/XrefTable.json similarity index 100% rename from services/clsi/test/unit/lib/snapshots/simple_bibliography/XrefTable.json rename to services/clsi/test/unit/js/snapshots/pdfjs/simple_bibliography/XrefTable.json diff --git a/services/clsi/test/unit/lib/snapshots/subdirectories/XrefTable.json b/services/clsi/test/unit/js/snapshots/pdfjs/subdirectories/XrefTable.json similarity index 100% rename from services/clsi/test/unit/lib/snapshots/subdirectories/XrefTable.json rename to services/clsi/test/unit/js/snapshots/pdfjs/subdirectories/XrefTable.json diff --git a/services/clsi/test/unit/lib/snapshots/tikz_feynman/XrefTable.json b/services/clsi/test/unit/js/snapshots/pdfjs/tikz_feynman/XrefTable.json similarity index 100% rename from services/clsi/test/unit/lib/snapshots/tikz_feynman/XrefTable.json rename to services/clsi/test/unit/js/snapshots/pdfjs/tikz_feynman/XrefTable.json diff --git a/services/clsi/test/unit/lib/snapshots/xelatex_compiler/XrefTable.json b/services/clsi/test/unit/js/snapshots/pdfjs/xelatex_compiler/XrefTable.json similarity index 100% rename from services/clsi/test/unit/lib/snapshots/xelatex_compiler/XrefTable.json rename to services/clsi/test/unit/js/snapshots/pdfjs/xelatex_compiler/XrefTable.json