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.

Sign up for GitHub

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

Jump to bottom

Expose DatabaseAdapter to simplify application tests #1121

Merged
merged 10 commits into from
Apr 8, 2016
Merged

Expose DatabaseAdapter to simplify application tests #1121

Show file tree
Hide file tree
Changes from 7 commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
308ab55
Move helper.clearData to DatabaseAdapter. Expose DatabaseAdapter in i…
steven-supersolid Mar 21, 2016
2730b52
Merge remote-tracking branch 'upstream/master' into steven.database.t…
steven-supersolid Mar 21, 2016
c7d8f89
fix indentation
steven-supersolid Mar 21, 2016
58c874a
Merge remote-tracking branch 'upstream/master' into steven.database.t…
steven-supersolid Mar 21, 2016
d984f94
Merge remote-tracking branch 'upstream/master' into steven.database.t…
steven-supersolid Mar 23, 2016
94c4f01
Merge remote-tracking branch 'upstream/master' into steven.database.t…
steven-supersolid Apr 4, 2016
9ae423b
Export DatabaseAdapter in index.js
steven-supersolid Apr 4, 2016
fb95114
Rename clearData to destroyAllDataPermanently. Only export destroyAll…
steven-supersolid Apr 4, 2016
9f4ba7e
Expose wrapped TestUtils from index.js. TestUtils exposed select func…
steven-supersolid Apr 8, 2016
7651e4c
Merge remote-tracking branch 'upstream/master' into steven.database.t…
steven-supersolid Apr 8, 2016
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
10 changes: 1 addition & 9 deletions spec/helper.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,7 @@ beforeEach(function(done) {

afterEach(function(done) {
Parse.User.logOut().then(() => {
return clearData();
return DatabaseAdapter.clearData();
}).then(() => {
done();
}, (error) => {
Expand Down Expand Up @@ -232,14 +232,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
10 changes: 10 additions & 0 deletions src/DatabaseAdapter.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,15 @@ function clearDatabaseSettings() {
appDatabaseOptions = {};
}

//Used by tests
function clearData() {
Copy link
Contributor

Choose a reason for hiding this comment

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

we could wrap here in:

var clearData = function() {
 throw '';
}
if (process.env.TESTING) {
 clearData = function() {}
}

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

function getDatabaseConnection(appId: string, collectionPrefix: string) {
if (dbConnections[appId]) {
return dbConnections[appId];
Expand All @@ -71,5 +80,6 @@ module.exports = {
setAppDatabaseOptions: setAppDatabaseOptions,
setAppDatabaseURI: setAppDatabaseURI,
clearDatabaseSettings: clearDatabaseSettings,
clearData: clearData,
defaultDatabaseURI: databaseURI
};
3 changes: 2 additions & 1 deletion src/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ import ParseServer from './ParseServer';
import GCSAdapter from 'parse-server-gcs-adapter';
import S3Adapter from 'parse-server-s3-adapter';
import FileSystemAdapter from 'parse-server-fs-adapter';
import DatabaseAdapter from './DatabaseAdapter';

if (process.env.VERBOSE || process.env.VERBOSE_PARSE_SERVER) {
winston.level = 'silly';
Expand All @@ -21,4 +22,4 @@ let _ParseServer = function(options) {
_ParseServer.createLiveQueryServer = ParseServer.createLiveQueryServer;

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