Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Expose DatabaseAdapter to simplify application tests #1121

Merged
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 2 additions & 9 deletions spec/helper.js
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ var express = require('express');
var facebook = require('../src/authDataManager/facebook');
var ParseServer = require('../src/index').ParseServer;
var path = require('path');
var TestUtils = require('../src/index').TestUtils;

var databaseURI = process.env.DATABASE_URI;
var cloudMain = process.env.CLOUD_CODE_MAIN || './spec/cloud/main.js';
Expand Down Expand Up @@ -88,7 +89,7 @@ beforeEach(function(done) {

afterEach(function(done) {
Parse.User.logOut().then(() => {
return clearData();
return TestUtils.destroyAllDataPermanently();
}).then(() => {
done();
}, (error) => {
Expand Down Expand Up @@ -232,14 +233,6 @@ function mockFacebook() {
return facebook;
}

function clearData() {
var promises = [];
for (var conn in DatabaseAdapter.dbConnections) {
promises.push(DatabaseAdapter.dbConnections[conn].deleteEverything());
}
return Promise.all(promises);
}

// This is polluting, but, it makes it way easier to directly port old tests.
global.Parse = Parse;
global.TestObject = TestObject;
Expand Down
13 changes: 13 additions & 0 deletions src/DatabaseAdapter.js
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,18 @@ function clearDatabaseSettings() {
appDatabaseOptions = {};
}

//Used by tests
function destroyAllDataPermanently() {
if (process.env.TESTING) {
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I wrapped this a little differently, can change if there is any advantage to the previously suggested way of doing this?

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

that's ok too

var promises = [];
for (var conn in dbConnections) {
promises.push(dbConnections[conn].deleteEverything());
}
return Promise.all(promises);
}
throw 'Only supported in test environment';
}

function getDatabaseConnection(appId: string, collectionPrefix: string) {
if (dbConnections[appId]) {
return dbConnections[appId];
Expand All @@ -71,5 +83,6 @@ module.exports = {
setAppDatabaseOptions: setAppDatabaseOptions,
setAppDatabaseURI: setAppDatabaseURI,
clearDatabaseSettings: clearDatabaseSettings,
destroyAllDataPermanently: destroyAllDataPermanently,
defaultDatabaseURI: databaseURI
};
15 changes: 15 additions & 0 deletions src/TestUtils.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
import { destroyAllDataPermanently } from './DatabaseAdapter';

let unsupported = function() {
throw 'Only supported in test environment';
};

let _destroyAllDataPermanently;
if (process.env.TESTING) {
_destroyAllDataPermanently = destroyAllDataPermanently;
} else {
_destroyAllDataPermanently = unsupported;
}

export default {
destroyAllDataPermanently: _destroyAllDataPermanently};
3 changes: 2 additions & 1 deletion src/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ import winston from 'winston';
import ParseServer from './ParseServer';
import S3Adapter from 'parse-server-s3-adapter'
import FileSystemAdapter from 'parse-server-fs-adapter'
import TestUtils from './TestUtils';
import { useExternal } from './deprecated'

// Factory function
Expand All @@ -15,4 +16,4 @@ _ParseServer.createLiveQueryServer = ParseServer.createLiveQueryServer;
let GCSAdapter = useExternal('GCSAdapter', 'parse-server-gcs-adapter');

export default ParseServer;
export { S3Adapter, GCSAdapter, FileSystemAdapter, _ParseServer as ParseServer };
export { S3Adapter, GCSAdapter, FileSystemAdapter, TestUtils, _ParseServer as ParseServer };