From 7fa376db185157406dae720ca5d9b071271ec52a Mon Sep 17 00:00:00 2001 From: vakrilov Date: Fri, 13 Sep 2019 11:25:45 +0300 Subject: [PATCH 1/2] test: add code coverage with nyc --- .gitignore | 3 ++- .nycrc | 5 +++++ jasmine-config/jasmine.json | 2 +- package.json | 4 ++++ templates/webpack.config.spec.ts | 6 +++++- 5 files changed, 17 insertions(+), 3 deletions(-) create mode 100644 .nycrc diff --git a/.gitignore b/.gitignore index 8f8de90d..fd60e545 100644 --- a/.gitignore +++ b/.gitignore @@ -36,5 +36,6 @@ bundle-config-loader.js hooks .DS_Store - +.nyc_output +coverage !projectHelpers.spec.js diff --git a/.nycrc b/.nycrc new file mode 100644 index 00000000..3294892a --- /dev/null +++ b/.nycrc @@ -0,0 +1,5 @@ +{ + "extends": "@istanbuljs/nyc-config-typescript", + "exclude": ["/demo/**"], + "reporter": ["text", "lcov"] +} \ No newline at end of file diff --git a/jasmine-config/jasmine.json b/jasmine-config/jasmine.json index 8d3ecdc5..3d06fa01 100644 --- a/jasmine-config/jasmine.json +++ b/jasmine-config/jasmine.json @@ -3,7 +3,7 @@ "spec_files": [ "!node_modules/**/*.spec.js", "!demo/**/*.spec.js", - "./*.spec.js" + "./**/*.spec.js" ], "helpers": [ "jasmine-config/**/*.js" diff --git a/package.json b/package.json index 5b7ff3e6..1503e671 100644 --- a/package.json +++ b/package.json @@ -35,6 +35,7 @@ "prepare": "npm run tsc && npm run jasmine", "test": "npm run prepare", "jasmine": "jasmine --config=jasmine-config/jasmine.json", + "coverage": "nyc npm run test", "version": "rm package-lock.json && conventional-changelog -p angular -i CHANGELOG.md -s && git add CHANGELOG.md" }, "bin": { @@ -77,6 +78,7 @@ "devDependencies": { "@angular/compiler": "8.2.0", "@angular/compiler-cli": "8.2.0", + "@istanbuljs/nyc-config-typescript": "^0.1.3", "@ngtools/webpack": "8.2.0", "@types/jasmine": "^3.3.7", "@types/loader-utils": "^1.1.3", @@ -87,7 +89,9 @@ "conventional-changelog-cli": "^1.3.22", "jasmine": "^3.2.0", "jasmine-spec-reporter": "^4.2.1", + "nyc": "^14.1.1", "proxyquire": "2.1.0", + "source-map-support": "^0.5.13", "tns-core-modules": "next", "typescript": "~3.5.3" } diff --git a/templates/webpack.config.spec.ts b/templates/webpack.config.spec.ts index 024461bd..d97535aa 100644 --- a/templates/webpack.config.spec.ts +++ b/templates/webpack.config.spec.ts @@ -32,9 +32,13 @@ const nativeScriptDevWebpack = { getEntryModule: () => 'EntryModule', getResolver: () => null, getConvertedExternals: nsWebpackIndex.getConvertedExternals, - getSourceMapFilename: nsWebpackIndex.getSourceMapFilename + getSourceMapFilename: nsWebpackIndex.getSourceMapFilename, + processAppComponents: nsWebpackIndex.processAppComponents, + getUserDefinedEntries: nsWebpackIndex.getUserDefinedEntries, }; + + const emptyObject = {}; const FakeAotTransformerFlag = "aot"; const FakeHmrTransformerFlag = "hmr"; From 659e8dd4e94a0f54ec9d6d8e4c5563b8bddb9ec1 Mon Sep 17 00:00:00 2001 From: vakrilov Date: Mon, 16 Sep 2019 09:55:59 +0300 Subject: [PATCH 2/2] chore: add coverage files to .npmignore --- .npmignore | 2 ++ templates/webpack.config.spec.ts | 2 -- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.npmignore b/.npmignore index 1c2c46d5..58343b36 100644 --- a/.npmignore +++ b/.npmignore @@ -7,6 +7,8 @@ demo *.spec.* .vscode/ .github/ +.nyc_output +coverage/ jasmine-config/ CONTRIBUTING.md CODE_OF_CONDUCT.md diff --git a/templates/webpack.config.spec.ts b/templates/webpack.config.spec.ts index d97535aa..e8ae3335 100644 --- a/templates/webpack.config.spec.ts +++ b/templates/webpack.config.spec.ts @@ -37,8 +37,6 @@ const nativeScriptDevWebpack = { getUserDefinedEntries: nsWebpackIndex.getUserDefinedEntries, }; - - const emptyObject = {}; const FakeAotTransformerFlag = "aot"; const FakeHmrTransformerFlag = "hmr";