From d1dbc1a035b7bc7332dd34ea81dbd3d82877d8f3 Mon Sep 17 00:00:00 2001 From: Nikita Lutsenko Date: Mon, 29 Feb 2016 19:45:12 -0800 Subject: [PATCH] Remove direct mongo access from schemas.spec.js. --- spec/schemas.spec.js | 43 ++++++++++++++++++++++++++----------------- 1 file changed, 26 insertions(+), 17 deletions(-) diff --git a/spec/schemas.spec.js b/spec/schemas.spec.js index 2e710bcc..145b2134 100644 --- a/spec/schemas.spec.js +++ b/spec/schemas.spec.js @@ -1,3 +1,5 @@ +'use strict'; + var Parse = require('parse/node').Parse; var request = require('request'); var dd = require('deep-diff'); @@ -711,28 +713,35 @@ describe('schemas', () => { }, (error, response, body) => { expect(response.statusCode).toEqual(200); expect(response.body).toEqual({}); - config.database.adapter.database.collection('test__Join:aRelation:MyOtherClass', { strict: true }, (err, coll) => { - //Expect Join table to be gone - expect(err).not.toEqual(null); - config.database.adapter.database.collection('test_MyOtherClass', { strict: true }, (err, coll) => { - // Expect data table to be gone - expect(err).not.toEqual(null); - request.get({ - url: 'http://localhost:8378/1/schemas/MyOtherClass', - headers: masterKeyHeaders, - json: true, - }, (error, response, body) => { - //Expect _SCHEMA entry to be gone. - expect(response.statusCode).toEqual(400); - expect(body.code).toEqual(Parse.Error.INVALID_CLASS_NAME); - expect(body.error).toEqual('class MyOtherClass does not exist'); - done(); - }); + config.database.collectionExists('_Join:aRelation:MyOtherClass').then(exists => { + if (exists) { + fail('Relation collection should be deleted.'); + done(); + } + return config.database.collectionExists('MyOtherClass'); + }).then(exists => { + if (exists) { + fail('Class collection should be deleted.'); + done(); + } + }).then(() => { + request.get({ + url: 'http://localhost:8378/1/schemas/MyOtherClass', + headers: masterKeyHeaders, + json: true, + }, (error, response, body) => { + //Expect _SCHEMA entry to be gone. + expect(response.statusCode).toEqual(400); + expect(body.code).toEqual(Parse.Error.INVALID_CLASS_NAME); + expect(body.error).toEqual('class MyOtherClass does not exist'); + done(); }); }); }); + }).then(() => { }, error => { fail(error); + done(); }); }); });