From cff6b420cc8d84692c6a4833e97ba49125c0804b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Lo=C3=AFs=20Poujade?= <lois.poujade@tetras-libre.fr>
Date: Wed, 30 Nov 2022 09:50:07 +0100
Subject: [PATCH] Fix CI configuration
- build before integration tests
- also logs tests results in job output
- remove online google fonts to speed up tests
- run test serially to avoid timeouts (cf
https://github.com/smooth-code/jest-puppeteer#running-puppeteer-in-ci-environments)
---
.gitlab-ci.yml | 1 +
__tests__/integration/mirador/auth.html | 1 -
__tests__/integration/mirador/blank.html | 1 -
__tests__/integration/mirador/collections.html | 1 -
__tests__/integration/mirador/contentsearch.html | 1 -
__tests__/integration/mirador/embedding.html | 1 -
__tests__/integration/mirador/index.html | 1 -
__tests__/integration/mirador/layers.html | 1 -
__tests__/integration/mirador/level0.html | 1 -
__tests__/integration/mirador/minimalist.html | 1 -
__tests__/integration/mirador/rtl.html | 1 -
__tests__/integration/mirador/svg_annos.html | 1 -
__tests__/integration/mirador/toc.html | 1 -
__tests__/integration/mirador/v3.html | 1 -
__tests__/integration/mirador/video.html | 1 -
package.json | 2 +-
16 files changed, 2 insertions(+), 15 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 0bdec421d..3601ee6a5 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -3,6 +3,7 @@ upstream_tests:
image: ghcr.io/puppeteer/puppeteer:latest
before_script:
- npm ci
+ - npm run build
script:
- npm run test:ci
artifacts:
diff --git a/__tests__/integration/mirador/auth.html b/__tests__/integration/mirador/auth.html
index 9f38ee5ea..b45fe7918 100644
--- a/__tests__/integration/mirador/auth.html
+++ b/__tests__/integration/mirador/auth.html
@@ -5,7 +5,6 @@
<meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
<meta name="theme-color" content="#000000">
<title>Mirador</title>
- <link rel="stylesheet" href="https://fonts.googleapis.com/css?family=Roboto:300,400,500">
</head>
<body>
<div id="mirador" style="position: absolute; top: 0; bottom: 0; left: 0; right: 0;"></div>
diff --git a/__tests__/integration/mirador/blank.html b/__tests__/integration/mirador/blank.html
index 27657f0d7..6e71cb68f 100644
--- a/__tests__/integration/mirador/blank.html
+++ b/__tests__/integration/mirador/blank.html
@@ -5,7 +5,6 @@
<meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
<meta name="theme-color" content="#000000">
<title>Mirador</title>
- <link rel="stylesheet" href="https://fonts.googleapis.com/css?family=Roboto:300,400,500">
</head>
<body>
<div id="mirador" style="position: absolute; top: 0; bottom: 0; left: 0; right: 0;"></div>
diff --git a/__tests__/integration/mirador/collections.html b/__tests__/integration/mirador/collections.html
index c41b9135a..a27424b06 100644
--- a/__tests__/integration/mirador/collections.html
+++ b/__tests__/integration/mirador/collections.html
@@ -5,7 +5,6 @@
<meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
<meta name="theme-color" content="#000000">
<title>Mirador</title>
- <link rel="stylesheet" href="https://fonts.googleapis.com/css?family=Roboto:300,400,500">
</head>
<body>
<div id="mirador" style="position: absolute; top: 0; bottom: 0; left: 0; right: 0;"></div>
diff --git a/__tests__/integration/mirador/contentsearch.html b/__tests__/integration/mirador/contentsearch.html
index 377611f8b..8bc6b0586 100644
--- a/__tests__/integration/mirador/contentsearch.html
+++ b/__tests__/integration/mirador/contentsearch.html
@@ -5,7 +5,6 @@
<meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
<meta name="theme-color" content="#000000">
<title>Mirador</title>
- <link rel="stylesheet" href="https://fonts.googleapis.com/css?family=Roboto:300,400,500">
</head>
<body>
<div id="mirador" style="position: absolute; top: 0; bottom: 0; left: 0; right: 0;"></div>
diff --git a/__tests__/integration/mirador/embedding.html b/__tests__/integration/mirador/embedding.html
index 623475692..157f76124 100644
--- a/__tests__/integration/mirador/embedding.html
+++ b/__tests__/integration/mirador/embedding.html
@@ -25,7 +25,6 @@
}
</style>
<title>Mirador</title>
- <link rel="stylesheet" href="https://fonts.googleapis.com/css?family=Roboto:300,400,500">
</head>
<body>
<h1>This is the first instance</h1>
diff --git a/__tests__/integration/mirador/index.html b/__tests__/integration/mirador/index.html
index 9b531086d..67f6e8257 100644
--- a/__tests__/integration/mirador/index.html
+++ b/__tests__/integration/mirador/index.html
@@ -5,7 +5,6 @@
<meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
<meta name="theme-color" content="#000000">
<title>Mirador</title>
- <link rel="stylesheet" href="https://fonts.googleapis.com/css?family=Roboto:300,400,500">
</head>
<body>
<div id="mirador" style="position: absolute; top: 0; bottom: 0; left: 0; right: 0;"></div>
diff --git a/__tests__/integration/mirador/layers.html b/__tests__/integration/mirador/layers.html
index 47742a360..90cd3c409 100644
--- a/__tests__/integration/mirador/layers.html
+++ b/__tests__/integration/mirador/layers.html
@@ -5,7 +5,6 @@
<meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
<meta name="theme-color" content="#000000">
<title>Mirador</title>
- <link rel="stylesheet" href="https://fonts.googleapis.com/css?family=Roboto:300,400,500">
</head>
<body>
<div id="mirador" style="position: absolute; top: 0; bottom: 0; left: 0; right: 0;"></div>
diff --git a/__tests__/integration/mirador/level0.html b/__tests__/integration/mirador/level0.html
index 5a4786376..5b837e73e 100644
--- a/__tests__/integration/mirador/level0.html
+++ b/__tests__/integration/mirador/level0.html
@@ -5,7 +5,6 @@
<meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
<meta name="theme-color" content="#000000">
<title>Mirador - Level 0</title>
- <link rel="stylesheet" href="https://fonts.googleapis.com/css?family=Roboto:300,400,500">
</head>
<body>
<div id="mirador" style="position: absolute; top: 0; bottom: 0; left: 0; right: 0;"></div>
diff --git a/__tests__/integration/mirador/minimalist.html b/__tests__/integration/mirador/minimalist.html
index 1f043cd47..2c6c7861c 100644
--- a/__tests__/integration/mirador/minimalist.html
+++ b/__tests__/integration/mirador/minimalist.html
@@ -5,7 +5,6 @@
<meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
<meta name="theme-color" content="#000000">
<title>Mirador</title>
- <link rel="stylesheet" href="https://fonts.googleapis.com/css?family=Roboto:300,400,500">
</head>
<body>
<div id="mirador" style="position: absolute; top: 0; bottom: 0; left: 0; right: 0;"></div>
diff --git a/__tests__/integration/mirador/rtl.html b/__tests__/integration/mirador/rtl.html
index 03f03c44c..6c504b83c 100644
--- a/__tests__/integration/mirador/rtl.html
+++ b/__tests__/integration/mirador/rtl.html
@@ -27,7 +27,6 @@
position: relative;
}
</style>
- <link rel="stylesheet" href="https://fonts.googleapis.com/css?family=Roboto:300,400,500">
</head>
<body>
<h1>This is the first instance dir="rtl"</h1>
diff --git a/__tests__/integration/mirador/svg_annos.html b/__tests__/integration/mirador/svg_annos.html
index 30dabfe01..3f986a10b 100644
--- a/__tests__/integration/mirador/svg_annos.html
+++ b/__tests__/integration/mirador/svg_annos.html
@@ -5,7 +5,6 @@
<meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
<meta name="theme-color" content="#000000">
<title>Mirador</title>
- <link rel="stylesheet" href="https://fonts.googleapis.com/css?family=Roboto:300,400,500">
</head>
<body>
<div id="mirador" style="position: absolute; top: 0; bottom: 0; left: 0; right: 0;"></div>
diff --git a/__tests__/integration/mirador/toc.html b/__tests__/integration/mirador/toc.html
index ff40edde3..117886327 100644
--- a/__tests__/integration/mirador/toc.html
+++ b/__tests__/integration/mirador/toc.html
@@ -5,7 +5,6 @@
<meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
<meta name="theme-color" content="#000000">
<title>Mirador - Table of contents</title>
- <link rel="stylesheet" href="https://fonts.googleapis.com/css?family=Roboto:300,400,500">
</head>
<body>
<div id="mirador" style="position: absolute; top: 0; bottom: 0; left: 0; right: 0;"></div>
diff --git a/__tests__/integration/mirador/v3.html b/__tests__/integration/mirador/v3.html
index 0c466f44b..1e6b0e31b 100644
--- a/__tests__/integration/mirador/v3.html
+++ b/__tests__/integration/mirador/v3.html
@@ -5,7 +5,6 @@
<meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
<meta name="theme-color" content="#000000">
<title>Mirador - Prezi v3</title>
- <link rel="stylesheet" href="https://fonts.googleapis.com/css?family=Roboto:300,400,500">
</head>
<body>
<div id="mirador" style="position: absolute; top: 0; bottom: 0; left: 0; right: 0;"></div>
diff --git a/__tests__/integration/mirador/video.html b/__tests__/integration/mirador/video.html
index 8f8d77aab..a674b06fb 100644
--- a/__tests__/integration/mirador/video.html
+++ b/__tests__/integration/mirador/video.html
@@ -5,7 +5,6 @@
<meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
<meta name="theme-color" content="#000000">
<title>Mirador</title>
- <link rel="stylesheet" href="https://fonts.googleapis.com/css?family=Roboto:300,400,500">
</head>
<body>
<div id="mirador" style="position: absolute; top: 0; bottom: 0; left: 0; right: 0;"></div>
diff --git a/package.json b/package.json
index eb0b03e08..72eb35c54 100644
--- a/package.json
+++ b/package.json
@@ -14,7 +14,7 @@
"lint:containers": "node ./scripts/container-lint.js",
"lint:translations": "node ./scripts/i18n-lint.js",
"server": "node_modules/.bin/http-server --cors",
- "test:ci": "jest -c jest.json --ci --reporters=jest-junit --watchAll=false",
+ "test:ci": "jest -c jest.json --ci --reporters=default --reporters=jest-junit --watchAll=false --runInBand",
"test": "npm run build && npm run lint && npm run size && jest -c jest.json",
"test:debug": "node --inspect node_modules/.bin/jest -c jest.json --runInBand",
"test:watch": "jest -c jest.json --watch",
--
GitLab