fix

Author: mtrezza

CONTRIBUTING.md

@@ -263,9 +263,7 @@ If your pull request introduces a change that may affect the storage or retrieva
 * If your feature is intended to work with MongoDB and PostgreSQL, you can include or exclude tests more granularly with:
 
   - `it_only_mongodb_version('>=4.4')` // will test with any version of Postgres but only with version >=4.4 of MongoDB; accepts semver notation to specify a version range
-  - `it_exclude_mongodb_version('<4.4')` // will test with any version of Postgres and MongoDB, excluding version <4.4 of MongoDB; accepts semver notation to specify a version range
   - `it_only_postgres_version('>=13')` // will test with any version of Mongo but only with version >=13 of Postgres; accepts semver notation to specify a version range
-  - `it_exclude_postgres_version('<13')` // will test with any version of Postgres and MongoDB, excluding version <13 of Postgres; accepts semver notation to specify a version range
 
 #### Postgres with Docker
 

spec/.eslintrc.json

@@ -23,10 +23,6 @@
       "it_only_node_version": true,
       "fit_only_mongodb_version": true,
       "fit_only_node_version": true,
-      "it_exclude_mongodb_version": true,
-      "it_exclude_postgres_version": true,
-      "fit_exclude_mongodb_version": true,
-      "fit_exclude_node_version": true,
       "it_exclude_dbs": true,
       "fit_exclude_dbs": true,
       "describe_only_db": true,

spec/ParseQuery.hint.spec.js

@@ -18,7 +18,7 @@ const masterKeyOptions = {
   json: true,
 };
 
-fdescribe_only_db('mongo')('Parse.Query hint', () => {
+describe_only_db('mongo')('Parse.Query hint', () => {
   beforeEach(() => {
     config = Config.get('test');
   });
@@ -27,12 +27,6 @@ fdescribe_only_db('mongo')('Parse.Query hint', () => {
     await TestUtils.destroyAllDataPermanently(false);
   });
 
-  fit_only_mongodb_version('<5.1>=6')('debug', async () => {
-  });
-
-  fit_only_mongodb_version('>5.1<6')('debug', async () => {
-  });
-
   it_only_mongodb_version('<5.1 || >=6')('query find with hint string', async () => {
     const object = new TestObject();
     await object.save();

spec/helper.js

@@ -505,6 +505,9 @@ global.it_only_mongodb_version = version => {
 };
 
 global.it_only_postgres_version = version => {
+  if (!semver.validRange(version)) {
+    throw new Error('Invalid version range');
+  }
   const envVersion = process.env.POSTGRES_VERSION;
   if (!envVersion || semver.satisfies(envVersion, version)) {
     return it;
@@ -514,6 +517,9 @@ global.it_only_postgres_version = version => {
 };
 
 global.it_only_node_version = version => {
+  if (!semver.validRange(version)) {
+    throw new Error('Invalid version range');
+  }
   const envVersion = process.version;
   if (!envVersion || semver.satisfies(envVersion, version)) {
     return it;
@@ -534,54 +540,24 @@ global.fit_only_mongodb_version = version => {
   }
 };
 
-global.fit_only_node_version = version => {
-  const envVersion = process.version;
-  if (!envVersion || semver.satisfies(envVersion, version)) {
-    return fit;
-  } else {
-    return xit;
-  }
-};
-
-global.it_exclude_mongodb_version = version => {
-  const envVersion = process.env.MONGODB_VERSION;
-  if (!envVersion || !semver.satisfies(envVersion, version)) {
-    return it;
-  } else {
-    return xit;
+global.fit_only_postgres_version = version => {
+  if (!semver.validRange(version)) {
+    throw new Error('Invalid version range');
   }
-};
-
-global.it_exclude_postgres_version = version => {
   const envVersion = process.env.POSTGRES_VERSION;
-  if (!envVersion || !semver.satisfies(envVersion, version)) {
-    return it;
-  } else {
-    return xit;
-  }
-};
-
-global.it_exclude_node_version = version => {
-  const envVersion = process.env.NODE_VERSION;
-  if (!envVersion || !semver.satisfies(envVersion, version)) {
-    return it;
-  } else {
-    return xit;
-  }
-};
-
-global.fit_exclude_mongodb_version = version => {
-  const envVersion = process.env.MONGODB_VERSION;
-  if (!envVersion || !semver.satisfies(envVersion, version)) {
+  if (!envVersion || semver.satisfies(envVersion, version)) {
     return fit;
   } else {
     return xit;
   }
 };
 
-global.fit_exclude_node_version = version => {
-  const envVersion = process.env.NODE_VERSION;
-  if (!envVersion || !semver.satisfies(envVersion, version)) {
+global.fit_only_node_version = version => {
+  if (!semver.validRange(version)) {
+    throw new Error('Invalid version range');
+  }
+  const envVersion = process.version;
+  if (!envVersion || semver.satisfies(envVersion, version)) {
     return fit;
   } else {
     return xit;