Merge branch 'dev' of...

Merge branch 'dev' of https://gitlab.liu.se/tddd96-grupp11/teknikattan-scoring-system into issue/6-improve-testing-coverage-for-client

.gitlab/client.gitlab-ci.yml

 client:setup:
   image: node:10
   stage: setup
+  only:
+    refs:
+      - dev
+      - merge_requests
+    changes:
+      - client/**/*
   script:
     - cd client
     - npm install
@@ -21,6 +27,12 @@ client:linting:
   image: node:10
   stage: test
   needs: ["client:setup"]
+  only:
+    refs:
+      - dev
+      - merge_requests
+    changes:
+      - client/**/*
   script:
     - cd client
     - npm run lint
@@ -29,8 +41,13 @@ client:test:
   image: node:10
   stage: test
   needs: ["client:setup"]
+  only:
+    refs:
+      - dev
+      - merge_requests
+    changes:
+      - client/**/*
   script:
     - cd client
     - npm run test:coverage
-
   coverage: /All files\s*\|\s*([\d\.]+)/

.gitlab/server.gitlab-ci.yml

 server:setup:
   image: python
   stage: setup
+  only:
+    refs:
+      - dev
+      - merge_requests
+    changes:
+      - server/**/*
   artifacts:
     paths:
       - server/env
@@ -22,6 +28,12 @@ server:test:
   image: python
   stage: test
   needs: ["server:setup"]
+  only:
+    refs:
+      - dev
+      - merge_requests
+    changes:
+      - server/**/*
   script:
     - cd server
     - source env/bin/activate

README.md

-![coverage report](https://gitlab.liu.se/tddd96-grupp11/teknikattan-scoring-system/badges/dev/coverage.svg?job=test:unit&key_text=Client+Coverage&key_width=110)
-![coverage report](https://gitlab.liu.se/tddd96-grupp11/teknikattan-scoring-system/badges/dev/coverage.svg?job=test-server&key_text=Server+Coverage&key_width=115)
+![coverage report](https://gitlab.liu.se/tddd96-grupp11/teknikattan-scoring-system/badges/dev/coverage.svg?job=client:test&key_text=Client+Coverage&key_width=110)
+![coverage report](https://gitlab.liu.se/tddd96-grupp11/teknikattan-scoring-system/badges/dev/coverage.svg?job=server:test&key_text=Server+Coverage&key_width=115)
 
 
 # Scoring system for Teknikåttan