Skip to content
Snippets Groups Projects
Commit de20164d authored by David Beniamine's avatar David Beniamine
Browse files

Merge branch '6-fix-tests-and-ci' into 'annotation-on-video' 

Fix CI configuration

Closes #6

See merge request iiif/mirador-video-annotation!6
parents 3c8d1070 cff6b420
Branches
Tags
1 merge request!6Fix CI configuration
Pipeline #1229 failed
Stage: test
Show whitespace changes
Inline Side-by-side
Showing
with 2 additions and 15 deletions
.gitlab-ci.yml
+ 1
− 0
View file @ de20164d
......@@ -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:
......
......
__tests__/integration/mirador/auth.html
+ 0
− 1
View file @ de20164d
......@@ -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>
......
......
__tests__/integration/mirador/blank.html
+ 0
− 1
View file @ de20164d
......@@ -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>
......
......
__tests__/integration/mirador/collections.html
+ 0
− 1
View file @ de20164d
......@@ -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>
......
......
__tests__/integration/mirador/contentsearch.html
+ 0
− 1
View file @ de20164d
......@@ -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>
......
......
__tests__/integration/mirador/embedding.html
+ 0
− 1
View file @ de20164d
......@@ -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>
......
......
__tests__/integration/mirador/index.html
+ 0
− 1
View file @ de20164d
......@@ -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>
......
......
__tests__/integration/mirador/layers.html
+ 0
− 1
View file @ de20164d
......@@ -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>
......
......
__tests__/integration/mirador/level0.html
+ 0
− 1
View file @ de20164d
......@@ -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>
......
......
__tests__/integration/mirador/minimalist.html
+ 0
− 1
View file @ de20164d
......@@ -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>
......
......
__tests__/integration/mirador/rtl.html
+ 0
− 1
View file @ de20164d
......@@ -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>
......
......
__tests__/integration/mirador/svg_annos.html
+ 0
− 1
View file @ de20164d
......@@ -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>
......
......
__tests__/integration/mirador/toc.html
+ 0
− 1
View file @ de20164d
......@@ -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>
......
......
__tests__/integration/mirador/v3.html
+ 0
− 1
View file @ de20164d
......@@ -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>
......
......
__tests__/integration/mirador/video.html
+ 0
− 1
View file @ de20164d
......@@ -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>
......
......
package.json
+ 1
− 1
View file @ de20164d
......@@ -15,7 +15,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",
......
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please to comment