From 83181c179b5a212d2dea025d6a1105076bf39a3c Mon Sep 17 00:00:00 2001
From: Dylan Vorster
Date: Sat, 4 Aug 2018 14:07:25 +0200
Subject: [PATCH 1/6] might work now
---
.circleci/config.yml | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/.circleci/config.yml b/.circleci/config.yml
index 2392f1d..3a71a4a 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -27,7 +27,7 @@ workflows:
jobs:
build:
docker:
- - image: circleci/node:8.4.0
+ - image: projectstorm/chrome
working_directory: ~/repo
steps:
- checkout
@@ -44,7 +44,7 @@ jobs:
publish:
docker:
- - image: projectstorm/react-diagrams-ci
+ - image: projectstorm/chrome
working_directory: ~/repo
steps:
- checkout
From ea73ec366dc89c8ad28527fabea57e24ced8ab9c Mon Sep 17 00:00:00 2001
From: Dylan Vorster
Date: Sat, 4 Aug 2018 14:12:39 +0200
Subject: [PATCH 2/6] try this
---
.circleci/config.yml | 13 ++++++++++++-
jest.config.js | 2 ++
package.json | 2 ++
yarn.lock | 15 ++++++++++++++-
4 files changed, 30 insertions(+), 2 deletions(-)
diff --git a/.circleci/config.yml b/.circleci/config.yml
index 3a71a4a..46d6a99 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -40,7 +40,18 @@ jobs:
- node_modules
key: modules-{{ checksum "yarn.lock" }}
- run: yarn run build:ts:prod
- - run: yarn run test
+ - run:
+ name: Unit Test
+ command: yarn test:ci
+ environment:
+ JEST_JUNIT_OUTPUT: "reports/junit/js-test-results.xml"
+ - store_test_results:
+ path: reports/junit
+ - store_artifacts:
+ path: coverage
+ - run:
+ name: Code Coverage
+ command: bash <(curl -s https://codecov.io/bash)
publish:
docker:
diff --git a/jest.config.js b/jest.config.js
index 170df89..1364d19 100644
--- a/jest.config.js
+++ b/jest.config.js
@@ -1,6 +1,8 @@
// jest.config.js
module.exports = {
verbose: true,
+ collectCoverage: true,
+ testEnvironment: 'node',
moduleFileExtensions: [
"ts",
"tsx",
diff --git a/package.json b/package.json
index e77b6c3..5e16eee 100644
--- a/package.json
+++ b/package.json
@@ -6,6 +6,7 @@
"typings": "./dist/@types/main",
"scripts": {
"test": "jest",
+ "test:ci": "jest --ci --testResultsProcessor=\"jest-junit\"",
"build:ts": "webpack",
"build:ts:prod": "cross-env NODE_ENV=production webpack",
"pretty": "prettier --use-tabs --write \"src/**/*.{ts,tsx}\" --print-width 120",
@@ -23,6 +24,7 @@
"babel-core": "^6.26.3",
"cross-env": "^5.1.6",
"jest": "^23.4.1",
+ "jest-junit": "^5.1.0",
"prettier": "^1.13.3",
"react-test-renderer": "^16.4.1",
"source-map-loader": "^0.2.3",
diff --git a/yarn.lock b/yarn.lock
index 960f353..9923ea3 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2383,6 +2383,15 @@ jest-jasmine2@^23.4.1:
jest-util "^23.4.0"
pretty-format "^23.2.0"
+jest-junit@^5.1.0:
+ version "5.1.0"
+ resolved "https://registry.yarnpkg.com/jest-junit/-/jest-junit-5.1.0.tgz#e8e497d810a829bf02783125aab74b5df6caa8fe"
+ dependencies:
+ jest-validate "^23.0.1"
+ mkdirp "^0.5.1"
+ strip-ansi "^4.0.0"
+ xml "^1.0.1"
+
jest-leak-detector@^23.2.0:
version "23.2.0"
resolved "https://registry.yarnpkg.com/jest-leak-detector/-/jest-leak-detector-23.2.0.tgz#c289d961dc638f14357d4ef96e0431ecc1aa377d"
@@ -2507,7 +2516,7 @@ jest-util@^23.4.0:
slash "^1.0.0"
source-map "^0.6.0"
-jest-validate@^23.4.0:
+jest-validate@^23.0.1, jest-validate@^23.4.0:
version "23.4.0"
resolved "https://registry.yarnpkg.com/jest-validate/-/jest-validate-23.4.0.tgz#d96eede01ef03ac909c009e9c8e455197d48c201"
dependencies:
@@ -4623,6 +4632,10 @@ xml-name-validator@^3.0.0:
version "3.0.0"
resolved "https://registry.yarnpkg.com/xml-name-validator/-/xml-name-validator-3.0.0.tgz#6ae73e06de4d8c6e47f9fb181f78d648ad457c6a"
+xml@^1.0.1:
+ version "1.0.1"
+ resolved "https://registry.yarnpkg.com/xml/-/xml-1.0.1.tgz#78ba72020029c5bc87b8a81a3cfcd74b4a2fc1e5"
+
xregexp@4.0.0:
version "4.0.0"
resolved "https://registry.yarnpkg.com/xregexp/-/xregexp-4.0.0.tgz#e698189de49dd2a18cc5687b05e17c8e43943020"
From 4d4393a0169707284aba1fffae46f3cb1398944b Mon Sep 17 00:00:00 2001
From: Dylan Vorster
Date: Sat, 4 Aug 2018 14:33:44 +0200
Subject: [PATCH 3/6] COME ON
---
.circleci/config.yml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/.circleci/config.yml b/.circleci/config.yml
index 46d6a99..f0f61a1 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -51,7 +51,7 @@ jobs:
path: coverage
- run:
name: Code Coverage
- command: bash <(curl -s https://codecov.io/bash)
+ command: codecov
publish:
docker:
From 1a0a8b2d4eb5ae5b844e56a9419320dce0c223bf Mon Sep 17 00:00:00 2001
From: Dylan Vorster
Date: Sat, 4 Aug 2018 14:34:12 +0200
Subject: [PATCH 4/6] COME ON
---
.circleci/config.yml | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/.circleci/config.yml b/.circleci/config.yml
index f0f61a1..db4f85e 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -27,7 +27,7 @@ workflows:
jobs:
build:
docker:
- - image: projectstorm/chrome
+ - image: projectstorm/ci
working_directory: ~/repo
steps:
- checkout
@@ -55,7 +55,7 @@ jobs:
publish:
docker:
- - image: projectstorm/chrome
+ - image: projectstorm/ci
working_directory: ~/repo
steps:
- checkout
From 34ab1d4aefbca97e1165d647f97ef080a2996d9e Mon Sep 17 00:00:00 2001
From: Dylan Vorster
Date: Sat, 4 Aug 2018 14:36:59 +0200
Subject: [PATCH 5/6] badge
---
README.md | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/README.md b/README.md
index 84e8d9a..4d19340 100644
--- a/README.md
+++ b/README.md
@@ -4,7 +4,8 @@
[](https://npmjs.org/package/@projectstorm/react-core)
[](https://npmjs.org/package/@projectstorm/react-core)
[](https://circleci.com/gh/projectstorm/react-core/tree/master) [](https://greenkeeper.io/)
+[](https://codecov.io/gh/projectstorm/react-core)
Base project for all the storm projects. It contains a bunch of helper widgets, tools and typescript
-objects for make glorius consistency.
+objects for make glorious consistency.
From 737d2c5930b8f2205aa20a464be6ceb8a7654c53 Mon Sep 17 00:00:00 2001
From: Dylan Vorster
Date: Sat, 4 Aug 2018 14:37:55 +0200
Subject: [PATCH 6/6] 1.2.7
---
package.json | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/package.json b/package.json
index 5e16eee..6f24c64 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
{
"name": "@projectstorm/react-core",
- "version": "1.2.6",
+ "version": "1.2.7",
"license": "MIT",
"main": "./dist/main.js",
"typings": "./dist/@types/main",