From 6cb3fb3d63403aef6cab5fecc2ae04c34e601d23 Mon Sep 17 00:00:00 2001 From: Manuel Trezza Date: Sat, 25 Jul 2020 00:31:31 +0200 Subject: [PATCH] enabled MongoDB transaction test for MongoDB >= 4.0.4 --- spec/MongoStorageAdapter.spec.js | 3 ++- spec/ParseServerRESTController.spec.js | 5 +++-- spec/batch.spec.js | 5 +++-- 3 files changed, 8 insertions(+), 5 deletions(-) diff --git a/spec/MongoStorageAdapter.spec.js b/spec/MongoStorageAdapter.spec.js index 45c7068341..4509e3685d 100644 --- a/spec/MongoStorageAdapter.spec.js +++ b/spec/MongoStorageAdapter.spec.js @@ -8,6 +8,7 @@ const databaseURI = const request = require('../lib/request'); const Config = require('../lib/Config'); const TestUtils = require('../lib/TestUtils'); +const semver = require('semver'); const fakeClient = { s: { options: { dbName: null } }, @@ -351,7 +352,7 @@ describe_only_db('mongo')('MongoStorageAdapter', () => { }); if ( - process.env.MONGODB_VERSION === '4.0.4' && + semver.satisfies(process.env.MONGODB_VERSION, '>=4.0.4') && process.env.MONGODB_TOPOLOGY === 'replicaset' && process.env.MONGODB_STORAGE_ENGINE === 'wiredTiger' ) { diff --git a/spec/ParseServerRESTController.spec.js b/spec/ParseServerRESTController.spec.js index 3e02cde71c..0e9e04e796 100644 --- a/spec/ParseServerRESTController.spec.js +++ b/spec/ParseServerRESTController.spec.js @@ -3,6 +3,7 @@ const ParseServerRESTController = require('../lib/ParseServerRESTController') const ParseServer = require('../lib/ParseServer').default; const Parse = require('parse/node').Parse; const TestUtils = require('../lib/TestUtils'); +const semver = require('semver'); let RESTController; @@ -101,7 +102,7 @@ describe('ParseServerRESTController', () => { }); if ( - (process.env.MONGODB_VERSION === '4.0.4' && + (semver.satisfies(process.env.MONGODB_VERSION, '>=4.0.4') && process.env.MONGODB_TOPOLOGY === 'replicaset' && process.env.MONGODB_STORAGE_ENGINE === 'wiredTiger') || process.env.PARSE_SERVER_TEST_DB === 'postgres' @@ -109,7 +110,7 @@ describe('ParseServerRESTController', () => { describe('transactions', () => { beforeAll(async () => { if ( - process.env.MONGODB_VERSION === '4.0.4' && + semver.satisfies(process.env.MONGODB_VERSION, '>=4.0.4') && process.env.MONGODB_TOPOLOGY === 'replicaset' && process.env.MONGODB_STORAGE_ENGINE === 'wiredTiger' ) { diff --git a/spec/batch.spec.js b/spec/batch.spec.js index c225be320e..9bb0cf15e1 100644 --- a/spec/batch.spec.js +++ b/spec/batch.spec.js @@ -1,6 +1,7 @@ const batch = require('../lib/batch'); const request = require('../lib/request'); const TestUtils = require('../lib/TestUtils'); +const semver = require('semver'); const originalURL = '/parse/batch'; const serverURL = 'http://localhost:1234/parse'; @@ -153,7 +154,7 @@ describe('batch', () => { }); if ( - (process.env.MONGODB_VERSION === '4.0.4' && + (semver.satisfies(process.env.MONGODB_VERSION, '>=4.0.4') && process.env.MONGODB_TOPOLOGY === 'replicaset' && process.env.MONGODB_STORAGE_ENGINE === 'wiredTiger') || process.env.PARSE_SERVER_TEST_DB === 'postgres' @@ -161,7 +162,7 @@ describe('batch', () => { describe('transactions', () => { beforeAll(async () => { if ( - process.env.MONGODB_VERSION === '4.0.4' && + semver.satisfies(process.env.MONGODB_VERSION, '>=4.0.4') && process.env.MONGODB_TOPOLOGY === 'replicaset' && process.env.MONGODB_STORAGE_ENGINE === 'wiredTiger' ) {