Refactoring Storage Tests

lib/countly-common.js

@@ -54,7 +54,6 @@ var cc = {
     storageTypeEnums: {
         FILE: "file",
         MEMORY: "memory",
-        CUSTOM: "custom",
     },
 
     /**

lib/countly-storage.js

@@ -131,7 +131,7 @@ var initStorage = function(userPath, storageType, isBulk = false, persistQueue =
     if (storageType === StorageTypes.MEMORY) {
         storageMethod = memoryStorage;
     }
-    else if (storageType === StorageTypes.CUSTOM) {
+    else if (customStorageMethod) {
         if (hasValidMethods(customStorageMethod)) {
             storageMethod = customStorageMethod;
             if (userPath) {
@@ -322,7 +322,12 @@ var getStorageType = function() {
     if (storageMethod === memoryStorage) {
         return StorageTypes.MEMORY;
     }
-    return StorageTypes.FILE;
+
+    if (storageMethod === fileStorage) {
+        return StorageTypes.FILE;
+    }
+
+    return null;
 };
 
 module.exports = {

lib/countly.js

@@ -335,6 +335,7 @@ Countly.Bulk = Bulk;
 
         // device_id
         Countly.device_id = undefined;
+        Countly.device_id_type = undefined;
         Countly.remote_config = undefined;
         Countly.require_consent = false;
         Countly.debug = undefined;

test/helpers/helper_functions.js

@@ -56,23 +56,30 @@ function clearStorage(keepID = false, isBulk = false, customDir = '') {
     // Resets Countly
     Countly.halt(true);
     // Determine the directory based on isBulk or customDir
-    const eventDirectory = customDir || (isBulk ? bulkEventDir : eventDir);
-    const reqDirectory = customDir || (isBulk ? bulkQueueDir : reqDir);
-    // Helper function to remove directory and files
+    const eventDirectory = isBulk ? bulkEventDir : eventDir;
+    const reqDirectory = isBulk ? bulkQueueDir : reqDir;
     function removeDir(directory) {
-        if (fs.existsSync(directory)) {
-            fs.rmSync(directory, { recursive: true, force: true });
+        // Remove the .json extension from the directory name, since it will be added in path.resolve
+        var filePath = path.resolve(__dirname, `${directory}`);
+        if (fs.existsSync(filePath)) {
+            fs.rmSync(filePath, { recursive: true, force: true });
         }
     }
     // Remove event directory if it exists
     removeDir(eventDirectory);
     // Remove request directory if it exists
     removeDir(reqDirectory);
+    if (customDir) {
+        removeDir(customDir);
+    }
     // Optionally keep the ID directory
     if (!keepID) {
         removeDir(idDir);
         removeDir(idTypeDir);
     }
+    return new Promise((resolve, reject) => {
+        resolve("string");
+    });
 }
 /**
  * bunch of tests specifically gathered for testing events