manuel/converter
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Enable CI on drone #6

Merged
manuel merged 21 commits from feature/dronetest into develop 2018-09-04 00:13:28 +02:00
Conversation 0 Commits 21 Files changed 5 +65 -1
3 changed files with 65 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files
Showing only changes of commit 304164e498 - Show all commits

60
package-lock.json generated
View file

@ -1114,6 +1114,12 @@
"dev": true,
"optional": true
},
"async-limiter": {
"version": "1.0.0",
"resolved": "https://bin.sbb.ch/artifactory/api/npm/npm/async-limiter/-/async-limiter-1.0.0.tgz",
"integrity": "sha1-ePrtjD0HSrgfIrTphdeehzj3IPg=",
"dev": true
},
"asynckit": {
"version": "0.4.0",
"resolved": "https://bin.sbb.ch/artifactory/api/npm/npm/asynckit/-/asynckit-0.4.0.tgz",
@ -7978,6 +7984,12 @@
"integrity": "sha1-o31zL0JxtKsa0HDTVQjoKQeI/6o=",
"dev": true
},
"progress": {
"version": "2.0.0",
"resolved": "https://bin.sbb.ch/artifactory/api/npm/npm/progress/-/progress-2.0.0.tgz",
"integrity": "sha1-ihvjZr+Pwj2yvSPxDG/pILQ4nR8=",
"dev": true
},
"progress-stream": {
"version": "1.2.0",
"resolved": "https://bin.sbb.ch/artifactory/api/npm/npm/progress-stream/-/progress-stream-1.2.0.tgz",
@ -8099,6 +8111,12 @@
"ipaddr.js": "1.8.0"
}
},
"proxy-from-env": {
"version": "1.0.0",
"resolved": "https://bin.sbb.ch/artifactory/api/npm/npm/proxy-from-env/-/proxy-from-env-1.0.0.tgz",
"integrity": "sha1-M8UDmPcOp+uW0h97gXYwpVeRx+4=",
"dev": true
},
"prr": {
"version": "1.0.1",
"resolved": "https://bin.sbb.ch/artifactory/api/npm/npm/prr/-/prr-1.0.1.tgz",
@ -8156,6 +8174,48 @@
"resolved": "https://bin.sbb.ch/artifactory/api/npm/npm/punycode/-/punycode-2.1.1.tgz",
"integrity": "sha1-tYsBCsQMIsVldhbI0sLALHv0eew="
},
"puppeteer": {
"version": "1.7.0",
"resolved": "https://bin.sbb.ch/artifactory/api/npm/npm/puppeteer/-/puppeteer-1.7.0.tgz",
"integrity": "sha1-7cuiMApQhHICwPGf0V56lhcf870=",
"dev": true,
"requires": {
"debug": "3.1.0",
"extract-zip": "1.6.7",
"https-proxy-agent": "2.2.1",
"mime": "2.3.1",
"progress": "2.0.0",
"proxy-from-env": "1.0.0",
"rimraf": "2.6.2",
"ws": "5.2.2"
},
"dependencies": {
"debug": {
"version": "3.1.0",
"resolved": "https://bin.sbb.ch/artifactory/api/npm/npm/debug/-/debug-3.1.0.tgz",
"integrity": "sha1-W7WgZyYotkFJVmuhaBnmFRjGcmE=",
"dev": true,
"requires": {
"ms": "2.0.0"
}
},
"mime": {
"version": "2.3.1",
"resolved": "https://bin.sbb.ch/artifactory/api/npm/npm/mime/-/mime-2.3.1.tgz",
"integrity": "sha1-sWIcVNY7l8R9PP5/chX31kUXw2k=",
"dev": true
},
"ws": {
"version": "5.2.2",
"resolved": "https://bin.sbb.ch/artifactory/api/npm/npm/ws/-/ws-5.2.2.tgz",
"integrity": "sha1-3/7xSGa46NyRM1glFNG++vlumA8=",
"dev": true,
"requires": {
"async-limiter": "1.0.0"
}
}
}
},
"q": {
"version": "1.4.1",
"resolved": "https://bin.sbb.ch/artifactory/api/npm/npm/q/-/q-1.4.1.tgz",

1
package.json
View file

@ -62,6 +62,7 @@
"karma-jasmine-html-reporter": "^0.2.2",
"karma-nightmare": "~0.4.15",
"protractor": "~5.4.0",
"puppeteer": "~1.7.0",
"ts-node": "~5.0.1",
"tslint": "~5.9.1",
"typescript": "2.9.2"

5
src/karma.conf.js
View file

@ -1,11 +1,14 @@
// Karma configuration file, see link for more information
// https://karma-runner.github.io/1.0/config/configuration-file.html
process.env.CHROME_BIN = require('puppeteer').executablePath();
module.exports = function (config) {
config.set({
basePath: '',
frameworks: ['jasmine', '@angular-devkit/build-angular'],
plugins: [
require('karma-chrome-launcher'),
require('karma-jasmine'),
require('karma-nightmare'),
require('karma-jasmine-html-reporter'),
@ -25,7 +28,7 @@ module.exports = function (config) {
colors: true,
logLevel: config.LOG_INFO,
autoWatch: true,
browsers: ['Nightmare'],
browsers: ['ChromeHeadless'],
singleRun: false
});
};