From 06a5ae62879869c0866e9ff705a9cb6b94564df8 Mon Sep 17 00:00:00 2001
From: Jonny Ngo Luong <jonnynl@stud.ntnu.no>
Date: Wed, 24 Mar 2021 10:49:46 +0100
Subject: [PATCH] asdasd
---
.gitlab-ci.yml | 2 +-
client/karma.conf.js | 8 +++++++-
2 files changed, 8 insertions(+), 2 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 19a732a..75a480b 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -39,4 +39,4 @@ client_test:
- apk add chromium
- export CHROME_BIN=/usr/bin/chromium-browser
script:
- - cd client && npm test --watch=false --browsers=ChromeHeadless
\ No newline at end of file
+ - cd client && npm test --watch=false --browsers=GitlabChromeHeadless
\ No newline at end of file
diff --git a/client/karma.conf.js b/client/karma.conf.js
index c6a90c1..f60beb7 100644
--- a/client/karma.conf.js
+++ b/client/karma.conf.js
@@ -39,6 +39,12 @@ module.exports = function (config) {
autoWatch: true,
browsers: ['Chrome'],
singleRun: false,
- restartOnFileChange: true
+ restartOnFileChange: true,
+ customLaunchers: {
+ GitlabHeadlessChrome: {
+ base: 'ChromeHeadless',
+ flags: ['--no-sandbox'],
+ },
+ },
});
};
--
GitLab