From a684711600b0301181b7c14ccac3ba0b054fe874 Mon Sep 17 00:00:00 2001
From: Timm Fitschen <t.fitschen@indiscale.com>
Date: Fri, 8 Jan 2021 12:06:36 +0100
Subject: [PATCH] FIX pipeline
---
test/core/js/modules/ext_xls_download.js.js | 4 ++--
test/docker/Dockerfile | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/test/core/js/modules/ext_xls_download.js.js b/test/core/js/modules/ext_xls_download.js.js
index 2a5c3ff1..54265804 100644
--- a/test/core/js/modules/ext_xls_download.js.js
+++ b/test/core/js/modules/ext_xls_download.js.js
@@ -121,11 +121,11 @@ QUnit.test("_get_tsv_string", function(assert) {
var tsv_string = f(entities, ["Bag", "Number"], true);
var prefix = "data:text/csv;charset=utf-8,"
assert.equal(tsv_string,
- "ID\tBag\tNumber\n242\t6366, 6406, 6407, 6408, 6409, 6410, 6411, 6412, 6413\t02 8 4aaa a\n2112\t\t1101\n2112\t\t1102", "tsv generated");
+ "ID\tVersion\tBag\tNumber\n242\tabc123\t6366, 6406, 6407, 6408, 6409, 6410, 6411, 6412, 6413\t02 8 4aaa a\n2112\tabc124\t\t1101\n2112\tabc125\t\t1102", "tsv generated");
tsv_string = caosdb_table_export._encode_tsv_string(tsv_string);
assert.equal(tsv_string.slice(0,prefix.length), prefix);
assert.equal(decodeURIComponent(tsv_string.slice(prefix.length, tsv_string.length)),
- "ID\tBag\tNumber\n242\t6366, 6406, 6407, 6408, 6409, 6410, 6411, 6412, 6413\t02 8 4aaa a\n2112\t\t1101\n2112\t\t1102", "tsv generated");
+ "ID\tVersion\tBag\tNumber\n242\tabc123\t6366, 6406, 6407, 6408, 6409, 6410, 6411, 6412, 6413\t02 8 4aaa a\n2112\tabc124\t\t1101\n2112\tabc125\t\t1102", "tsv generated");
});
QUnit.test("_get_property_value", function (assert) {
diff --git a/test/docker/Dockerfile b/test/docker/Dockerfile
index 1dab1668..02688709 100644
--- a/test/docker/Dockerfile
+++ b/test/docker/Dockerfile
@@ -7,7 +7,7 @@ RUN apt-get update \
&& echo "deb https://deb.nodesource.com/node_14.x buster main" >> /etc/apt/sources.list \
&& apt-get update \
&& apt-get install -y \
- firefox-esr gettext-base pylint3 python3-pip \
+ firefox-esr gettext-base python3-pip \
python3-httpbin git curl x11-apps xvfb unzip \
nodejs # Don't install `npm` (Debian), it conflicts with the `nodejs` (Node) package \
&& apt-get install -f
--
GitLab