Merge remote-tracking branch 'origin/master'

.gitlab-ci.yml

@@ -133,15 +133,17 @@ test_fe:
     - docker:dind
   before_script:
     - docker login -u $DOCKER_USER -p $DOCKER_PW
+    - mkdir ./img
   artifacts:
-    untracked: true
+    paths:
+      - /img
   tags:
     - docker
 
 docker-build-fe:
   script:
     - docker-compose build waecm_g4_fe
-    - docker save -o waecm_g4_fe ${DOCKER_USER}/${ASSIGNMENT}-fe
+    - docker save -o img/waecm_g4_fe ${DOCKER_USER}/${ASSIGNMENT}-fe
   cache:
     key: $CI_COMMIT_REF_SLUG-$CI_PROJECT_DIR
     paths:
@@ -156,7 +158,7 @@ docker-build-fe:
 docker-build-be:
   script:
     - docker-compose build waecm_g4_be
-    - docker save -o waecm_g4_be ${DOCKER_USER}/${ASSIGNMENT}-be
+    - docker save -o img/waecm_g4_be ${DOCKER_USER}/${ASSIGNMENT}-be
   extends:
     - .docker-build
     - .docker-setup
@@ -172,7 +174,7 @@ docker-build-be:
 
 docker-push-fe:
   script:
-    - docker image load --input waecm_g4_fe
+    - docker image load --input img/waecm_g4_fe
     - docker image push ${DOCKER_USER}/${ASSIGNMENT}-fe
   extends:
     - .docker-push
@@ -182,7 +184,7 @@ docker-push-fe:
 
 docker-push-be:
   script:
-    - docker image load --input waecm_g4_be
+    - docker image load --input img/waecm_g4_be
     - docker image push ${DOCKER_USER}/${ASSIGNMENT}-be
   extends:
     - .docker-push

frontend/karma.conf.js

@@ -40,9 +40,9 @@ module.exports = function(config) {
     logLevel: config.LOG_INFO,
     autoWatch: true,
     // browsers: ['Chrome', 'ChromeHeadless'],
-    browsers: ['ChromeHeadless'],
+    browsers: ['MyChromeHeadless'],
     customLaunchers: {
-      ChromeHeadless: {
+      MyChromeHeadless: {
         base: 'Chrome',
         flags: [
           '--headless',