Skip to content

Commit f310e66

Browse files
flovilmartdrew-gross
authored andcommitted
Fix flaky tests (#2324)
* Fix flaky test (There were open connections to the server left after the test finished) * fix test that's happening on the end of the minute * remove focus testing
1 parent 2ba7249 commit f310e66

File tree

2 files changed

+19
-17
lines changed

2 files changed

+19
-17
lines changed

Diff for: spec/RestCreate.spec.js

+2-1
Original file line numberDiff line numberDiff line change
@@ -337,7 +337,8 @@ describe('rest create', () => {
337337
expect(actual.getFullYear()).toEqual(expected.getFullYear());
338338
expect(actual.getMonth()).toEqual(expected.getMonth());
339339
expect(actual.getDate()).toEqual(expected.getDate());
340-
expect(actual.getMinutes()).toEqual(expected.getMinutes());
340+
// less than a minute, if test happen at the wrong time :/
341+
expect(actual.getMinutes() - expected.getMinutes() <= 1).toBe(true);
341342

342343
done();
343344
});

Diff for: spec/RestQuery.spec.js

+17-16
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ var rest = require('../src/rest');
77

88
var querystring = require('querystring');
99
var request = require('request');
10+
var rp = require('request-promise');
1011

1112
var config = new Config('test');
1213
let database = config.database;
@@ -167,37 +168,37 @@ describe('rest query', () => {
167168
'X-Parse-Application-Id': 'test',
168169
'X-Parse-REST-API-Key': 'rest'
169170
};
170-
request.get({
171+
172+
let p0 = rp.get({
171173
headers: headers,
172174
url: 'http://localhost:8378/1/classes/TestParameterEncode?'
173175
+ querystring.stringify({
174176
where: '{"foo":{"$ne": "baz"}}',
175177
limit: 1
176178
}).replace('=', '%3D'),
177-
}, (error, response, body) => {
178-
expect(error).toBe(null);
179-
var b = JSON.parse(body);
179+
}).then(fail, (response) => {
180+
let error = response.error;
181+
var b = JSON.parse(error);
180182
expect(b.code).toEqual(Parse.Error.INVALID_QUERY);
181-
done();
182183
});
183-
}).then(() => {
184-
var headers = {
185-
'X-Parse-Application-Id': 'test',
186-
'X-Parse-REST-API-Key': 'rest'
187-
};
188-
request.get({
184+
185+
let p1 = rp.get({
189186
headers: headers,
190187
url: 'http://localhost:8378/1/classes/TestParameterEncode?'
191188
+ querystring.stringify({
192189
limit: 1
193190
}).replace('=', '%3D'),
194-
}, (error, response, body) => {
195-
expect(error).toBe(null);
196-
var b = JSON.parse(body);
191+
}).then(fail, (response) => {
192+
let error = response.error;
193+
var b = JSON.parse(error);
197194
expect(b.code).toEqual(Parse.Error.INVALID_QUERY);
198-
done();
199195
});
200-
});
196+
return Promise.all([p0, p1]);
197+
}).then(done).catch((err) => {
198+
console.error(err);
199+
fail('should not fail');
200+
done();
201+
})
201202
});
202203

203204
it('query with limit = 0', (done) => {

0 commit comments

Comments
 (0)