Skip to content

Commit f2d39c7

Browse files
committed
chore: Merge branch 'master' into regenerate-sdk-release-7
2 parents ed04e1d + aa78432 commit f2d39c7

4 files changed

Lines changed: 10 additions & 33 deletions

File tree

commitlint.config.js

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,6 @@
11
module.exports = {
22
extends: ['@commitlint/config-conventional'],
33
rules: {
4-
'subject-case': [
5-
2,
6-
'always',
7-
['lower-case', 'sentence-case']
8-
]
9-
}
10-
};
4+
'subject-case': [2, 'always', ['lower-case', 'sentence-case']],
5+
},
6+
};

test/integration/test.discovery.js

Lines changed: 2 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -391,17 +391,8 @@ describe('discovery_integration', function() {
391391
});
392392

393393
describe('metrics tests', function() {
394-
const start_time = '2018-08-07T00:00:00Z';
395-
const end_time = '2018-08-08T00:00:00Z';
396-
397394
it('should get metrics event rate', function(done) {
398-
const params = {
399-
start_time,
400-
end_time,
401-
// result_type can only be either document or passage.
402-
// but i get no results with either
403-
};
404-
discovery.getMetricsEventRate(params, function(err, res) {
395+
discovery.getMetricsEventRate(function(err, res) {
405396
assert.ifError(err);
406397
assert(res.aggregations);
407398
assert(Array.isArray(res.aggregations));
@@ -414,11 +405,7 @@ describe('discovery_integration', function() {
414405
});
415406
});
416407
it('should get metrics query', function(done) {
417-
const params = {
418-
start_time,
419-
end_time,
420-
};
421-
discovery.getMetricsQuery(params, function(err, res) {
408+
discovery.getMetricsQuery(function(err, res) {
422409
assert.ifError(err);
423410
assert(res.aggregations);
424411
assert(Array.isArray(res.aggregations));

test/integration/test.speech_to_text.js

Lines changed: 5 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -140,8 +140,7 @@ describe('speech_to_text_integration', function() {
140140
const speech_to_text_env = new watson.SpeechToTextV1({});
141141
const recognizeStream = speech_to_text_env.recognizeUsingWebSocket();
142142
recognizeStream.setEncoding('utf8');
143-
fs
144-
.createReadStream(path.join(__dirname, '../resources/weather.flac'))
143+
fs.createReadStream(path.join(__dirname, '../resources/weather.flac'))
145144
.pipe(recognizeStream)
146145
.on('error', done)
147146
.pipe(
@@ -170,8 +169,7 @@ describe('speech_to_text_integration', function() {
170169
const speech_to_text_vcap = new watson.SpeechToTextV1({});
171170
const recognizeStream = speech_to_text_vcap.recognizeUsingWebSocket();
172171
recognizeStream.setEncoding('utf8');
173-
fs
174-
.createReadStream(path.join(__dirname, '../resources/weather.flac'))
172+
fs.createReadStream(path.join(__dirname, '../resources/weather.flac'))
175173
.pipe(recognizeStream)
176174
.on('error', done)
177175
.pipe(
@@ -191,8 +189,7 @@ describe('speech_to_text_integration', function() {
191189
it('transcribes audio over a websocket @slow', function(done) {
192190
const recognizeStream = speech_to_text_rc.recognizeUsingWebSocket();
193191
recognizeStream.setEncoding('utf8');
194-
fs
195-
.createReadStream(path.join(__dirname, '../resources/weather.flac'))
192+
fs.createReadStream(path.join(__dirname, '../resources/weather.flac'))
196193
.pipe(recognizeStream)
197194
.on('error', done)
198195
.pipe(
@@ -212,8 +209,7 @@ describe('speech_to_text_integration', function() {
212209
it('transcribes audio over a websocket @slow', function(done) {
213210
const recognizeStream = speech_to_text.recognizeUsingWebSocket();
214211
recognizeStream.setEncoding('utf8');
215-
fs
216-
.createReadStream(path.join(__dirname, '../resources/weather.flac'))
212+
fs.createReadStream(path.join(__dirname, '../resources/weather.flac'))
217213
.pipe(recognizeStream)
218214
.on('error', done)
219215
.pipe(
@@ -233,8 +229,7 @@ describe('speech_to_text_integration', function() {
233229
content_type: 'audio/l16; rate=44100',
234230
});
235231
recognizeStream.setEncoding('utf8');
236-
fs
237-
.createReadStream(path.join(__dirname, '../resources/blank.wav'))
232+
fs.createReadStream(path.join(__dirname, '../resources/blank.wav'))
238233
.pipe(recognizeStream)
239234
.on('error', done)
240235
.on('data', function(text) {

test/unit/test.visual_recognition.v3.js

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -176,7 +176,6 @@ describe('visual_recognition', function() {
176176
const instance = new watson.VisualRecognitionV3({
177177
version: '2016-05-20',
178178
});
179-
console.log(instance._options);
180179
assert.equal(instance._options.api_key, 'foo');
181180
assert.equal(instance._options.username, undefined);
182181
assert.equal(instance._options.password, undefined);

0 commit comments

Comments
 (0)