Skip to content

Commit fc05fee

Browse files
committed
Merge branches 'feature/angular9' and 'master' of https://github.com/kreuzerk/ng-sortgrid into feature/angular9
� Conflicts: � .travis.yml
2 parents c1d9ecf + 8f98c39 commit fc05fee

File tree

4 files changed

+7
-8
lines changed

4 files changed

+7
-8
lines changed

.travis.yml

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,10 @@
1-
dist: trusty
2-
sudo: required
31
language: node_js
42
node_js:
5-
- "12"
3+
- "10"
4+
5+
dist: trusty
6+
sudo: required
67

7-
os:
8-
- linux
98
addons:
109
chrome: stable
1110

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
"format:write": "prettier --write 'projects/**/*.ts'",
1010
"test": "ng test",
1111
"test:coverage": "ng test --code-coverage --watch=false",
12-
"test:lib": "",
12+
"test:lib": "ng test --project ng-sortgrid",
1313
"test:lib:coverage": "ng test ng-sortgrid --code-coverage --watch=false",
1414
"report-coverage:lib": "cat ./coverage/ng-sortgrid/lcov.info | codecov",
1515
"build": "npm run build:lib && npm run build:demo",

projects/ng-sortgrid-demo/karma.conf.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ module.exports = function (config) {
2525
colors: true,
2626
logLevel: config.LOG_INFO,
2727
autoWatch: true,
28-
browsers: ['Chrome'],
28+
browsers: ['ChromeHeadless'],
2929
singleRun: false,
3030
restartOnFileChange: true
3131
});

projects/ng-sortgrid/karma.conf.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ module.exports = function (config) {
2525
colors: true,
2626
logLevel: config.LOG_INFO,
2727
autoWatch: true,
28-
browsers: ['Chrome'],
28+
browsers: ['ChromeHeadless'],
2929
singleRun: false,
3030
restartOnFileChange: true
3131
});

0 commit comments

Comments
 (0)