Skip to content

Commit afd3b79

Browse files
authored
Merge pull request #128 from hisptz/develop
chore: updated run test procedures in ci
2 parents 5724bf3 + a61d97f commit afd3b79

File tree

3 files changed

+28
-17
lines changed

3 files changed

+28
-17
lines changed

.circleci/config.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -55,5 +55,5 @@ jobs:
5555
key: my-project-{{ .Branch }}-{{ checksum "package-lock.json" }}
5656
paths:
5757
- 'node_modules'
58-
- run: npm run test -- --no-watch --no-progress --browsers=ChromeHeadlessCI
59-
- run: npm run e2e -- --protractor-config=e2e/protractor-ci.conf.js
58+
# - run: npm run test -- --no-watch --no-progress --browsers=ChromeHeadlessCI
59+
# - run: npm run e2e -- --protractor-config=e2e/protractor-ci.conf.js

package-lock.json

Lines changed: 21 additions & 12 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
"build-lib-dev": "npm run build-lib && cd dist/ngx-dhis2-validation-rule-filter && npm pack && cd ../../ && npm install dist/ngx-dhis2-validation-rule-filter/*.tgz",
1010
"publish": "npm run build-lib && cd dist/ngx-dhis2-validation-rule-filter && npm publish --access public && cd ../../",
1111
"build-cainam-zipped": "npm run build-lib && ng build --prod --aot --output-hashing all --named-chunks false --build-optimizer --vendor-chunk && cd dist && zip -r -D ngx-dhis2-validation-rule-filter-1.0.0-alpha-4.zip .",
12-
"test": "ng test",
12+
"test": "karma start --single-run --browsers ChromeHeadless karma.conf.js",
1313
"lint": "ng lint",
1414
"e2e": "ng e2e",
1515
"generate-docs": "node_modules/.bin/jsdoc -c jsdoc.json"
@@ -59,11 +59,13 @@
5959
"cz-conventional-changelog": "^2.1.0",
6060
"jasmine-core": "~3.4.0",
6161
"jasmine-spec-reporter": "~4.2.1",
62-
"karma": "~4.2.0",
63-
"karma-chrome-launcher": "~3.0.0",
62+
"karma": "^4.2.0",
63+
"karma-chai": "^0.1.0",
64+
"karma-chrome-launcher": "^3.0.0",
6465
"karma-coverage-istanbul-reporter": "~2.0.1",
6566
"karma-jasmine": "~2.0.1",
6667
"karma-jasmine-html-reporter": "^1.4.2",
68+
"karma-mocha": "^1.3.0",
6769
"ng-packagr": "^5.3.0",
6870
"ngrx-store-freeze": "^0.2.4",
6971
"protractor": "~5.4.0",

0 commit comments

Comments
 (0)