From 6d6b062b81871472780b9941d773be9ad4baa0bd Mon Sep 17 00:00:00 2001 From: Martin Spencer Date: Mon, 1 Oct 2018 13:09:06 +0200 Subject: [PATCH 1/5] feat: travis config. The test task does not collect coverage by default, instead there is a test:cov --- .travis.yml | 16 ++++++++++++++++ jest.config.base.js | 2 +- package.json | 1 + 3 files changed, 18 insertions(+), 1 deletion(-) create mode 100644 .travis.yml diff --git a/.travis.yml b/.travis.yml new file mode 100644 index 0000000..90841f9 --- /dev/null +++ b/.travis.yml @@ -0,0 +1,16 @@ +sudo: false +dist: trusty +language: node_js +node_js: + - "node" +cache: + directories: + - node_modules +install: + - npm prune + - npm install + - npm update +script: + - npm run lint + - npm run test:coverage + - npm run build diff --git a/jest.config.base.js b/jest.config.base.js index 46984c0..dad1dd8 100644 --- a/jest.config.base.js +++ b/jest.config.base.js @@ -2,7 +2,7 @@ module.exports = { snapshotSerializers: ["enzyme-to-json/serializer"], setupFiles: ["./setupTests.js"], moduleFileExtensions: ["ts", "tsx", "js", "jsx", "json", "node"], - collectCoverage: true, + collectCoverage: false, coveragePathIgnorePatterns: [ "^setupTests.js$", "(tests/.*.mock).(jsx?|tsx?)$" diff --git a/package.json b/package.json index d93c1b4..92723d4 100644 --- a/package.json +++ b/package.json @@ -3,6 +3,7 @@ "private": true, "scripts": { "test": "cross-env NODE_ENV=test jest", + "test:coverage": "cross-env NODE_ENV=test jest --coverage --coverageReporters=text-lcov | coveralls", "format": "lerna run format", "build": "lerna run build", "build:dev": "lerna run build:dev", From f692ff68dfd04ea89e150997bb4825f86d27a198 Mon Sep 17 00:00:00 2001 From: Martin Spencer Date: Mon, 1 Oct 2018 13:10:22 +0200 Subject: [PATCH 2/5] chore: Added package meta data to the root package.json --- package-lock.json | 40 ++++++++++++++++++++++++++++++++++++++++ package.json | 6 ++++++ 2 files changed, 46 insertions(+) diff --git a/package-lock.json b/package-lock.json index 327caf4..763b90f 100644 --- a/package-lock.json +++ b/package-lock.json @@ -3870,6 +3870,28 @@ } } }, + "coveralls": { + "version": "3.0.2", + "resolved": "https://registry.npmjs.org/coveralls/-/coveralls-3.0.2.tgz", + "integrity": "sha512-Tv0LKe/MkBOilH2v7WBiTBdudg2ChfGbdXafc/s330djpF3zKOmuehTeRwjXWc7pzfj9FrDUTA7tEx6Div8NFw==", + "dev": true, + "requires": { + "growl": "~> 1.10.0", + "js-yaml": "^3.11.0", + "lcov-parse": "^0.0.10", + "log-driver": "^1.2.7", + "minimist": "^1.2.0", + "request": "^2.85.0" + }, + "dependencies": { + "minimist": { + "version": "1.2.0", + "resolved": "http://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz", + "integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ=", + "dev": true + } + } + }, "create-ecdh": { "version": "4.0.3", "resolved": "https://registry.npmjs.org/create-ecdh/-/create-ecdh-4.0.3.tgz", @@ -6717,6 +6739,12 @@ "integrity": "sha1-Dovf5NHduIVNZOBOp8AOKgJuVlg=", "dev": true }, + "growl": { + "version": "1.10.5", + "resolved": "https://registry.npmjs.org/growl/-/growl-1.10.5.tgz", + "integrity": "sha512-qBr4OuELkhPenW6goKVXiv47US3clb3/IbuWF9KNKEijAy9oeHxU9IgzjvJhHkUzhaj7rOUD7+YGWqUjLp5oSA==", + "dev": true + }, "growly": { "version": "1.3.0", "resolved": "https://registry.npmjs.org/growly/-/growly-1.3.0.tgz", @@ -8862,6 +8890,12 @@ "invert-kv": "^1.0.0" } }, + "lcov-parse": { + "version": "0.0.10", + "resolved": "https://registry.npmjs.org/lcov-parse/-/lcov-parse-0.0.10.tgz", + "integrity": "sha1-GwuP+ayceIklBYK3C3ExXZ2m2aM=", + "dev": true + }, "left-pad": { "version": "1.3.0", "resolved": "https://registry.npmjs.org/left-pad/-/left-pad-1.3.0.tgz", @@ -9171,6 +9205,12 @@ "integrity": "sha1-MmjyanyI5PSxdY1nknGBTjH6WyY=", "dev": true }, + "log-driver": { + "version": "1.2.7", + "resolved": "https://registry.npmjs.org/log-driver/-/log-driver-1.2.7.tgz", + "integrity": "sha512-U7KCmLdqsGHBLeWqYlFA0V0Sl6P08EE1ZrmA9cxjUE0WVqT9qnyVDPz1kzpFEP0jdJuFnasWIfSd7fsaNXkpbg==", + "dev": true + }, "longest": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/longest/-/longest-1.0.1.tgz", diff --git a/package.json b/package.json index 92723d4..e46e229 100644 --- a/package.json +++ b/package.json @@ -11,6 +11,12 @@ "lint": "lerna run lint", "commit": "git-cz" }, + "author": "Martin Spencer ", + "license": "GPL-3.0", + "repository": { + "type": "git", + "url": "github:1xINTERNET/drupal-editable" + }, "devDependencies": { "@babel/core": "^7.1.2", "@babel/plugin-proposal-class-properties": "^7.1.0", From e7ba42aecda0ed2ac287906fe21897670a579eba Mon Sep 17 00:00:00 2001 From: Martin Spencer Date: Mon, 1 Oct 2018 13:10:41 +0200 Subject: [PATCH 3/5] fix: Added coverals devDependency --- package.json | 1 + 1 file changed, 1 insertion(+) diff --git a/package.json b/package.json index e46e229..8b54f9a 100644 --- a/package.json +++ b/package.json @@ -29,6 +29,7 @@ "babel-jest": "^23.6.0", "babel-loader": "^8.0.4", "classnames": "^2.2.6", + "coveralls": "^3.0.2", "cross-env": "^5.2.0", "cz-conventional-changelog": "^2.1.0", "emotion": "^9.2.10", From 8f8f72863e0787d187f0379bee7af53ea2d7bbcc Mon Sep 17 00:00:00 2001 From: Martin Spencer Date: Mon, 1 Oct 2018 13:21:38 +0200 Subject: [PATCH 4/5] proper sub package install script --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 90841f9..9526386 100644 --- a/.travis.yml +++ b/.travis.yml @@ -9,7 +9,7 @@ cache: install: - npm prune - npm install - - npm update + - lerna exec 'npm install' script: - npm run lint - npm run test:coverage From 042c06acc9433d90c5b102fbd58a7e834782628a Mon Sep 17 00:00:00 2001 From: Martin Spencer Date: Mon, 1 Oct 2018 13:22:06 +0200 Subject: [PATCH 5/5] simpler travis config --- .travis.yml | 4 ---- 1 file changed, 4 deletions(-) diff --git a/.travis.yml b/.travis.yml index 9526386..a1c013e 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,11 +1,7 @@ sudo: false -dist: trusty language: node_js node_js: - "node" -cache: - directories: - - node_modules install: - npm prune - npm install