Fixing logout feature; updating tLogin test

zenineasa · May 1, 2024 · db6bc13 · db6bc13
1 parent 45ff144
commit db6bc13
Show file tree

Hide file tree

Showing 3 changed files with 56 additions and 30 deletions.
diff --git a/modules/DBMessenger/DBWrapper.js b/modules/DBMessenger/DBWrapper.js
@@ -1,4 +1,4 @@
-/* Copyright (c) 2022-2023 Zenin Easa Panthakkalakath */
+/* Copyright (c) 2022-2024 Zenin Easa Panthakkalakath */
 
 const IDBExportImport = require('indexeddb-export-import');
 
@@ -144,13 +144,26 @@ class DBWrapper {
     }
 
     /**
-     * Delete everything.
+     * Delete table
+     * @param {string} tableName
      */
-    async deleteDatabaseContent() {
-        indexedDB.deleteDatabase(this.dbName);
-        // TODO: Ensure that the database is deleted before running the
-        // following
-        this.initialize();
+    async deleteTable(tableName) {
+        await new Promise((resolve, reject) => {
+            const transaction = this.db.transaction(tableName, 'readwrite');
+            const objectStore = transaction.objectStore(tableName);
+
+            const clearRequest = objectStore.clear();
+
+            clearRequest.onsuccess = () => {
+                console.log(`All entries removed from ${tableName} table`);
+                resolve();
+            };
+
+            clearRequest.onerror = (event) => {
+                console.error(`Error clearing entries from ${tableName} table:`, event.target.error);
+                reject(event.target.error);
+            };
+        });
     }
 
     /**

diff --git a/modules/DBMessenger/index.js b/modules/DBMessenger/index.js
@@ -77,7 +77,9 @@ class DBMessenger {
      * Delete everything.
      */
     async deleteDatabaseContent() {
-        dbWrapper.deleteDatabaseContent();
+        for (const key in this.tableNames) {
+            await dbWrapper.deleteTable(this.tableNames[key]);
+        }
         window.reload();
     }
 

diff --git a/test/Login/tLogin.js b/test/Login/tLogin.js
@@ -1,4 +1,4 @@
-/* Copyright (c) 2022-2023 Zenin Easa Panthakkalakath */
+/* Copyright (c) 2022-2024 Zenin Easa Panthakkalakath */
 
 const utils = require('./../../../test/utils');
 const Login = require('./../../../modules/Login');
@@ -18,12 +18,12 @@ QUnit.test('Render login and check the forms', function(assert) {
     const logins = document.querySelectorAll('#login');
     assert.strictEqual(logins.length, 1,
         'There should be exactly one DIV with the id "login".');
-    const inputs = document.querySelectorAll('input[type=text],textarea');
-    assert.strictEqual(inputs.length, 3,
-        'There should be exactly three input fields.');
+    const inputs = document.querySelectorAll('input');
+    assert.strictEqual(inputs.length, 2,
+        'There should be exactly two input fields.');
     const buttons = document.querySelectorAll('button');
-    assert.strictEqual(buttons.length, 3,
-        'There should be exactly three buttons.');
+    assert.strictEqual(buttons.length, 2,
+        'There should be exactly two buttons.');
 });
 
 QUnit.test('Check if the logo is rendered', function(assert) {
@@ -48,40 +48,51 @@ QUnit.test('Fill in the form and check', async function(assert) {
     // function defines this.
     window.reload = function() {};
 
+    // Ensure user is logged out
+    await dbMessenger.deleteDatabaseContent();
+
     const login = new Login();
     login.render();
 
     const testUserInfoValues = {
-        'privateKey': '11111111111111111111111111111111',
-        'displayName': 'Display Name',
-        'about': 'About the person!',
+        'displayName': 'ZatMan',
+        'password': 'ThisIsProbablyAGoodPassword',
     };
 
-    const inputs = document.querySelectorAll('input[type=text],textarea');
+    const inputs = document.querySelectorAll(
+        'input[type=text],input[type=password]');
     for (let i = 0; i < inputs.length; i++) {
-        if (inputs[i].name === 'privateKey') {
-            inputs[i].value = testUserInfoValues.privateKey;
+        if (inputs[i].name === 'password') {
+            inputs[i].value = testUserInfoValues.password;
         } else if (inputs[i].name === 'displayName') {
             inputs[i].value = testUserInfoValues.displayName;
-        } else if (inputs[i].name === 'about') {
-            inputs[i].value = testUserInfoValues.about;
         } else {
             assert.notOk(true, 'Form input name not defined');
         }
     }
     document.getElementById('loginButton').click();
 
     // Verify the data available in dbMessenger with the value provided in the
-    // form
-    const userInfoPrivate = await dbMessenger.getLoggedInUserInfoPrivate();
+    // form; might need to wait for a short while for the information to load
+    let userInfoPrivate;
+    for (let i = 0; i < 10 && !userInfoPrivate; i++) {
+        userInfoPrivate = await dbMessenger.getLoggedInUserInfoPrivate();
+        if (!userInfoPrivate) {
+            await new Promise(resolve => setTimeout(resolve, 200));
+        }
+    }
 
-    assert.strictEqual(testUserInfoValues.privateKey,
-        userInfoPrivate.privateKey,
-        'Private keys need to match.');
     assert.strictEqual(testUserInfoValues.displayName,
         userInfoPrivate.displayName,
         'Display names need to match.');
-    assert.strictEqual(testUserInfoValues.about,
-        userInfoPrivate.about,
-        'About text need to match.');
+
+    const hexRegex = /^[0-9a-fA-F]+$/;
+    assert.ok(
+        hexRegex.test(userInfoPrivate.privateKey),
+        'Private key is expected to be hexadecimal.'
+    );
+    assert.ok(
+        userInfoPrivate.privateKey.length == 32,
+        'Private key is expected to be 32 characters long.'
+    );
 });