From 230a689bd4882e788a0ff5320d2e3424b160494b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Victor=20L=C3=B6fgren?= <victor.l0fgr3n@gmail.com>
Date: Tue, 16 Feb 2021 17:22:32 +0100
Subject: [PATCH] #5: Restructure client test
---
.gitlab-ci.yml | 2 --
.gitlab/client.gitlab-ci.yml | 23 ++++++++++++-----------
2 files changed, 12 insertions(+), 13 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 223170e0..b724e32f 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,8 +1,6 @@
stages:
- setup
- test
- - client-install
- - client-test
include:
- local: .gitlab/server.gitlab-ci.yml
diff --git a/.gitlab/client.gitlab-ci.yml b/.gitlab/client.gitlab-ci.yml
index 2881ef9d..d4226e3d 100644
--- a/.gitlab/client.gitlab-ci.yml
+++ b/.gitlab/client.gitlab-ci.yml
@@ -1,31 +1,32 @@
-image: node:10
-
-install:
- stage: client-install
+client-setup:
+ image: node:10
+ stage: setup
script:
- cd client
- npm install
artifacts:
name: "artifacts"
untracked: true
- expire_in: 60 mins
+ expire_in: 15 mins
paths:
- client/.npm/
- client/node_modules/
-linting:
- stage: client-test
+client-linting:
+ image: node:10
+ stage: test
script:
- cd client
- npm run lint
dependencies:
- - install
+ - client-setup
-test:unit:
- stage: client-test
+client-test:
+ image: node:10
+ stage: test
script:
- cd client
- npm run test:coverage
dependencies:
- - install
+ - client-setup
coverage: /All files\s*\|\s*([\d\.]+)/
--
GitLab