From 6a45d4f43fc67bcde41e2afdf8e5648c34d4e357 Mon Sep 17 00:00:00 2001
From: Florent Vilmart <florentvilmart@me.com>
Date: Mon, 18 Jul 2016 22:26:13 -0400
Subject: [PATCH 1/3] Fix flaky test (There were open connections to the server
 left after the test finished)

---
 spec/RestQuery.spec.js | 35 ++++++++++++++++++-----------------
 1 file changed, 18 insertions(+), 17 deletions(-)

diff --git a/spec/RestQuery.spec.js b/spec/RestQuery.spec.js
index e5cc911897..adb4baee09 100644
--- a/spec/RestQuery.spec.js
+++ b/spec/RestQuery.spec.js
@@ -7,6 +7,7 @@ var rest = require('../src/rest');
 
 var querystring = require('querystring');
 var request = require('request');
+var rp = require('request-promise');
 
 var config = new Config('test');
 let database = config.database;
@@ -157,7 +158,7 @@ describe('rest query', () => {
     });
   });
 
-  it('query with wrongly encoded parameter', (done) => {
+  fit('query with wrongly encoded parameter', (done) => {
     rest.create(config, nobody, 'TestParameterEncode', {foo: 'bar'}
     ).then(() => {
       return rest.create(config, nobody,
@@ -167,37 +168,37 @@ describe('rest query', () => {
         'X-Parse-Application-Id': 'test',
         'X-Parse-REST-API-Key': 'rest'
       };
-      request.get({
+      
+      let p0 = rp.get({
         headers: headers,
         url: 'http://localhost:8378/1/classes/TestParameterEncode?'
                          + querystring.stringify({
                              where: '{"foo":{"$ne": "baz"}}',
                              limit: 1
                          }).replace('=', '%3D'),
-      }, (error, response, body) => {
-        expect(error).toBe(null);
-        var b = JSON.parse(body);
+      }).then(fail, (response) => {
+        let error = response.error;
+        var b = JSON.parse(error);
         expect(b.code).toEqual(Parse.Error.INVALID_QUERY);
-        done();
       });
-    }).then(() => {
-      var headers = {
-        'X-Parse-Application-Id': 'test',
-        'X-Parse-REST-API-Key': 'rest'
-      };
-      request.get({
+
+      let p1 = rp.get({
         headers: headers,
         url: 'http://localhost:8378/1/classes/TestParameterEncode?'
                          + querystring.stringify({
                              limit: 1
                          }).replace('=', '%3D'),
-      }, (error, response, body) => {
-        expect(error).toBe(null);
-        var b = JSON.parse(body);
+      }).then(fail, (response) => {
+        let error = response.error;
+        var b = JSON.parse(error);
         expect(b.code).toEqual(Parse.Error.INVALID_QUERY);
-        done();
       });
-    });
+      return Promise.all([p0, p1]);
+    }).then(done).catch((err) => {
+      console.error(err);
+      fail('should not fail');
+      done();
+    })
   });
 
   it('query with limit = 0', (done) => {

From 26a5fff4527aa3e9068e1f8bae9f27e1f2734172 Mon Sep 17 00:00:00 2001
From: Florent Vilmart <florentvilmart@me.com>
Date: Mon, 18 Jul 2016 22:41:39 -0400
Subject: [PATCH 2/3] fix test that's happening on the end of the minute

---
 spec/RestCreate.spec.js | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/spec/RestCreate.spec.js b/spec/RestCreate.spec.js
index 9af188c639..21bf8992e5 100644
--- a/spec/RestCreate.spec.js
+++ b/spec/RestCreate.spec.js
@@ -310,7 +310,7 @@ describe('rest create', () => {
     });
   });
 
-  it_exclude_dbs(['postgres'])("test default session length", (done) => {
+  fit_exclude_dbs(['postgres'])("test default session length", (done) => {
     var user = {
       username: 'asdf',
       password: 'zxcv',
@@ -337,7 +337,8 @@ describe('rest create', () => {
         expect(actual.getFullYear()).toEqual(expected.getFullYear());
         expect(actual.getMonth()).toEqual(expected.getMonth());
         expect(actual.getDate()).toEqual(expected.getDate());
-        expect(actual.getMinutes()).toEqual(expected.getMinutes());
+        // less than a minute, if test happen at the wrong time :/
+        expect(actual.getMinutes() - expected.getMinutes() <= 1).toBe(true);
 
         done();
       });

From 8b1ed7399cf0b22197d25eb45e5f43470e7da454 Mon Sep 17 00:00:00 2001
From: Florent Vilmart <florentvilmart@me.com>
Date: Mon, 18 Jul 2016 23:36:46 -0400
Subject: [PATCH 3/3] remove focus testing

---
 spec/RestCreate.spec.js | 2 +-
 spec/RestQuery.spec.js  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/spec/RestCreate.spec.js b/spec/RestCreate.spec.js
index 21bf8992e5..155dd11bb0 100644
--- a/spec/RestCreate.spec.js
+++ b/spec/RestCreate.spec.js
@@ -310,7 +310,7 @@ describe('rest create', () => {
     });
   });
 
-  fit_exclude_dbs(['postgres'])("test default session length", (done) => {
+  it_exclude_dbs(['postgres'])("test default session length", (done) => {
     var user = {
       username: 'asdf',
       password: 'zxcv',
diff --git a/spec/RestQuery.spec.js b/spec/RestQuery.spec.js
index adb4baee09..78d18d9a05 100644
--- a/spec/RestQuery.spec.js
+++ b/spec/RestQuery.spec.js
@@ -158,7 +158,7 @@ describe('rest query', () => {
     });
   });
 
-  fit('query with wrongly encoded parameter', (done) => {
+  it('query with wrongly encoded parameter', (done) => {
     rest.create(config, nobody, 'TestParameterEncode', {foo: 'bar'}
     ).then(() => {
       return rest.create(config, nobody,