Skip to content

Commit bf5568b

Browse files
committed
Merge remote-tracking branch 'origin/UnitTests' into UnitTests
2 parents a7f51b8 + ae2d32c commit bf5568b

File tree

3 files changed

+17
-2
lines changed

3 files changed

+17
-2
lines changed

.travis.yml

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
language: node_js
2+
node_js:
3+
- '8'
4+
dist: trusty # needs Ubuntu Trusty
5+
sudo: required
6+
addons:
7+
chrome: stable # have Travis install chrome stable.
8+
9+
script:
10+
- npm install
11+
- npm run build
12+
- npm run test

karma.conf.js

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,10 @@ module.exports = function(config) {
6060
reporters: ['progress', "coverage"],
6161

6262
coverageReporter: {
63-
type : 'html',
63+
reporters : [
64+
{ type: 'html', subdir: 'report-html' },
65+
{ type: 'lcov', subdir: 'report-lcov' },
66+
],
6467
dir : 'coverage/'
6568
},
6669
// web server port

src/execute.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -124,7 +124,7 @@ export default function execute<T>(request: httpclient.Request): Promise<httpcli
124124
// Copying the response type from the Request we received
125125
xhr.responseType = request.responseType
126126

127-
// Adapting the main XMLHttpRequest in function of the passed Request
127+
// Adapting the main XMLHttpRequest according to the passed Request
128128
if (request.responseType === 'json') {
129129
xhr.setRequestHeader('Accept', 'application/json')
130130
}

0 commit comments

Comments
 (0)