Download directory changes

WHOIGit · Oct 28, 2024 · ca89aaf · ca89aaf
1 parent 99216f1
commit ca89aaf
Show file tree

Hide file tree

Showing 14 changed files with 242 additions and 199 deletions.
diff --git a/tests/AddBuilds.js b/tests/AddBuilds.js
@@ -81,6 +81,7 @@ var password;
         await driver.findElement(By.id("id_login")).sendKeys(user);
         await driver.findElement(By.id("id_password")).sendKeys(password);
         await driver.findElement(By.css(".primaryAction")).click();
+        await new Promise(r => setTimeout(r, 2000));
 
         // ADD BUILDS TEST 
 

diff --git a/tests/AddEditInventory.js b/tests/AddEditInventory.js
@@ -80,6 +80,7 @@ var password;
         await driver.findElement(By.id("id_login")).sendKeys(user);
         await driver.findElement(By.id("id_password")).sendKeys(password);
         await driver.findElement(By.css(".primaryAction")).click();
+        await new Promise(r => setTimeout(r, 2000));
 
         // ADD INVENTORY TEST
 
@@ -284,12 +285,7 @@ var password;
         }
         await driver.findElement(By.id("field-query_c_r0")).sendKeys("Test");
         await driver.findElement(By.id("searchform-submit-button")).click();
-
-        while ((await driver.findElements(By.css(".even a"))).length == 0)
-        {
-            await new Promise(r => setTimeout(r, 2000));
-            console.log("Wait 2 seconds for Search1.");
-        }
+        await new Promise(r => setTimeout(r, 2000));       
         await driver.findElement(By.css(".even a")).click();
 
         while ((await driver.findElements(By.id("action"))).length == 0) {
@@ -338,15 +334,11 @@ var password;
         await driver.findElement(By.id("field-query_c_r0")).sendKeys("Test");
         await driver.findElement(By.css("#qcard_c > .card-body")).click();
         await driver.findElement(By.id("searchform-submit-button")).click();
+        await new Promise(r => setTimeout(r, 2000));
         await driver.findElement(By.id("searchbar-query")).click(); //search within these results
         await driver.findElement(By.id("searchbar-query")).sendKeys("Coastal Mooring");
         await driver.findElement(By.css(".btn-outline-primary:nth-child(1)")).click();
-
-        while ((await driver.findElements(By.css(".even a"))).length == 0)
-        {
-            await new Promise(r => setTimeout(r, 2000));
-            console.log("Wait 2 seconds for Search3.");
-        }
+        await new Promise(r => setTimeout(r, 2000));
         await driver.findElement(By.css(".even a")).click();
 
         // Add subassembly item to valid parent
@@ -402,12 +394,7 @@ var password;
         await driver.findElement(By.id("field-query_c_r1")).sendKeys("Wifi");
         await driver.findElement(By.id("searchform-submit-button")).click();
 
-        //	await new Promise(r => setTimeout(r, 8000));  
-        while ((await driver.findElements(By.css(".even a"))).length == 0)
-        {
-            await new Promise(r => setTimeout(r, 2000));
-            console.log("Wait 2 seconds for Search5.");
-        }
+        await new Promise(r => setTimeout(r, 2000));
         await driver.findElement(By.css(".even a")).click();
 
         while ((await driver.findElements(By.id("action"))).length == 0) {

diff --git a/tests/AddEditParts.js b/tests/AddEditParts.js
@@ -67,6 +67,7 @@ var password;
     if ((await driver.findElements(By.css("#djHideToolBarButton"))).length != 0) {
         await driver.findElement(By.css("#djHideToolBarButton")).click();
     }
+    await new Promise(r => setTimeout(r, 2000));
 
     try {
 
@@ -82,6 +83,7 @@ var password;
         await driver.findElement(By.id("id_login")).sendKeys(user);
         await driver.findElement(By.id("id_password")).sendKeys(password);
         await driver.findElement(By.css(".primaryAction")).click();
+        await new Promise(r => setTimeout(r, 2000));
 
         // ADD PARTS TEST
 
@@ -134,7 +136,8 @@ var password;
 
         await driver.findElement(By.id("id_field_default_value")).sendKeys("WHLS75-1500");
         await driver.findElement(By.id("id_global_for_part_types_2")).click();  //instrument
-        await driver.findElement(By.css(".btn-primary")).click();
+        await driver.findElement(By.css(".btn-primary")).click();
+        await new Promise(r => setTimeout(r, 2000));
 
         // Add Computerized Part Type
         await driver.findElement(By.id("navbarAdmintools")).click();
@@ -154,6 +157,7 @@ var password;
         await new Promise(r => setTimeout(r, 2000));
         await driver.findElement(By.linkText("Add Part Type")).click();
         await driver.findElement(By.css(".btn-primary")).click();
+        await driver.wait(until.elementLocated(By.id("error_1_id_name")));
         assert(await driver.findElement(By.id("error_1_id_name")).getText() == "This field is required.");
         await driver.findElement(By.css(".btn-light")).click();
 
@@ -426,6 +430,7 @@ var password;
         await driver.findElement(By.id("id_name")).clear();
         await driver.findElement(By.id("id_name")).sendKeys(" ");
         await driver.findElement(By.css(".btn-primary")).click();
+        await driver.wait(until.elementLocated(By.id("error_1_id_name")));
         assert(await driver.findElement(By.id("error_1_id_name")).getText() == "This field is required.");
 
         // Change part type parent
@@ -458,14 +463,15 @@ var password;
         dropdown = await driver.findElement(By.id("id_parent"));
         await dropdown.findElement(By.xpath("//option[. = '---------']")).click();
         await driver.findElement(By.css(".btn-primary")).click();
+        await new Promise(r => setTimeout(r, 2000)); 
 
         // Search for Part Templates and change Part Number
         await driver.findElement(By.id("searchbar-query")).sendKeys("Coastal Mooring");
-        await driver.findElement(By.css(".btn-outline-primary:nth-child(1)")).click();        // 22 | click | linkText=123-456-789 | 
+        await driver.findElement(By.css(".btn-outline-primary:nth-child(1)")).click();
+        await new Promise(r => setTimeout(r, 2000));
         await driver.findElement(By.linkText("123-456-789")).click();
 
-        //        await new Promise(r => setTimeout(r, 20000)); // 1.6
-        while ((await driver.findElements(By.id("action"))).length == 0) // 1.6
+        while ((await driver.findElements(By.id("action"))).length == 0) 
         {
             await new Promise(r => setTimeout(r, 2000));
             console.log("Wait 2 seconds for Search1.");

diff --git a/tests/AdminUser.js b/tests/AdminUser.js
@@ -160,14 +160,16 @@ var password;
         await driver.findElement(By.id("id_login")).sendKeys("tech")
         await driver.findElement(By.id("id_password")).sendKeys("tech")
         await driver.findElement(By.css(".primaryAction")).click()
+        await new Promise(r => setTimeout(r, 2000));
 	    // Verify "Account Inactive"
         var bodyText = await driver.findElement(By.css('body')).getText();
         assert(bodyText.includes("Account Inactive"));
 
         await driver.findElement(By.id("log-in-link")).click()
-        await driver.findElement(By.id("id_login")).sendKeys("inv")
-        await driver.findElement(By.id("id_password")).sendKeys("inv")
-        await driver.findElement(By.css(".primaryAction")).click()
+        await driver.findElement(By.id("id_login")).sendKeys("inv");
+        await driver.findElement(By.id("id_password")).sendKeys("inv");
+        await driver.findElement(By.css(".primaryAction")).click();
+        await new Promise(r => setTimeout(r, 2000));
 	    // Verify "Account Inactive"
         bodyText = await driver.findElement(By.css('body')).getText();
         assert(bodyText.includes("Account Inactive"));
@@ -176,6 +178,7 @@ var password;
         await driver.findElement(By.id("id_login")).sendKeys("admin")
         await driver.findElement(By.id("id_password")).sendKeys("admin")
         await driver.findElement(By.css(".primaryAction")).click()
+        await new Promise(r => setTimeout(r, 2000));
 
 	    // Activate users and try to login
         await driver.findElement(By.linkText("Users")).click()
@@ -207,7 +210,8 @@ var password;
 	    // Modify My Info
         await driver.findElement(By.linkText("My Info")).click()
         await driver.findElement(By.id("id_name")).sendKeys("best technician")
-        await driver.findElement(By.css(".btn-primary")).click() 
+        await driver.findElement(By.css(".btn-primary")).click()
+        await new Promise(r => setTimeout(r, 2000));
 	    // Verify my info changed
         bodyText = await driver.findElement(By.css('body')).getText();
         assert(bodyText.includes("best technician"));
@@ -216,6 +220,7 @@ var password;
         await driver.findElement(By.linkText("E-Mail")).click()
         await driver.findElement(By.id("id_email")).sendKeys("tech@example.com")
         await driver.findElement(By.name("action_add")).click()
+        await new Promise(r => setTimeout(r, 2000));
 	    // Verify screen text contains tech@example.com
         bodyText = await driver.findElement(By.css('body')).getText();
         assert(bodyText.includes("tech@example.com"));
@@ -227,6 +232,7 @@ var password;
         await driver.findElement(By.id("id_password1")).sendKeys("tech1234")
         await driver.findElement(By.id("id_password2")).sendKeys("tech1234")
         await driver.findElement(By.name("action")).click()
+        await new Promise(r => setTimeout(r, 2000));
         await driver.findElement(By.linkText("Sign Out")).click()
         await driver.findElement(By.css(".btn-danger")).click()
 

diff --git a/tests/CalibrationsCoefs.js b/tests/CalibrationsCoefs.js
@@ -83,6 +83,7 @@ var password;
         await driver.findElement(By.id("id_login")).sendKeys(user);
         await driver.findElement(By.id("id_password")).sendKeys(password);
         await driver.findElement(By.css(".primaryAction")).click();
+        await new Promise(r => setTimeout(r, 2000));
 
         // CALIBRATIONS AND COEFFICIENTS TEST
 
@@ -298,10 +299,7 @@ var password;
         await driver.findElement(By.id("searchbar-query")).sendKeys("buoy");
         await driver.findElement(By.id("searchbar-modelselect")).sendKeys("Part Templates");
         await driver.findElement(By.css(".btn-outline-primary:nth-child(1)")).click();
-        while ((await driver.findElements(By.partialLinkText("555"))).length == 0) {
-            await new Promise(r => setTimeout(r, 2000));
-            console.log("Wait 2 seconds for Search.");
-        }
+        await new Promise(r => setTimeout(r, 2000));
         await driver.findElement(By.partialLinkText("555")).click();
         while ((await driver.findElements(By.linkText("Create Calibrations"))).length == 0) {
             await new Promise(r => setTimeout(r, 2000));
@@ -352,20 +350,15 @@ var password;
             await dropdown.findElement(By.xpath("//option[. = 'Exact']")).click()
         }
         await driver.findElement(By.id("searchform-submit-button")).click()
-        while ((await driver.findElements(By.partialLinkText("1232"))).length == 0) {
-            await new Promise(r => setTimeout(r, 2000));
-            console.log("Wait 2 seconds for Search.");
-        }
+        await new Promise(r => setTimeout(r, 2000));
+
         await driver.findElement(By.partialLinkText("1232")).click();
         while ((await driver.findElements(By.id("calibration-template-tab"))).length == 0) {
             await new Promise(r => setTimeout(r, 2000));
             console.log("Wait 2 seconds for Tab3.");
         }
         await driver.findElement(By.id("calibration-template-tab")).click()
-        while ((await driver.findElements(By.css("#calibration-template .collapsed > .fa"))).length == 0) {
-            await new Promise(r => setTimeout(r, 2000));
-            console.log("Wait 2 seconds for Link.");
-        }
+        await new Promise(r => setTimeout(r, 2000));
         await driver.findElement(By.css("#calibration-template .collapsed > .fa")).click()
         await new Promise(r => setTimeout(r, 4000));
         // Verify values added in the History
@@ -410,11 +403,8 @@ var password;
             console.log("Wait 2 seconds for Calibrations link.");
         }
         await driver.findElement(By.linkText("Calibrations")).click();
-        while ((await driver.findElements(By.linkText("scalib1"))).length == 0) {
-            await new Promise(r => setTimeout(r, 2000));
-            console.log("Wait 2 seconds for Calibrations detail.");
-        }
-
+        await new Promise(r => setTimeout(r, 2000));
+
         // Verify min and max coef values
         var scalib1_min = await driver.findElement(By.xpath("//td[3]")).getText();
         var scalib1_max = await driver.findElement(By.xpath("//td[4]")).getText();

diff --git a/tests/Cleanup-Docker.bat b/tests/Cleanup-Docker.bat
@@ -17,6 +17,6 @@ node DeleteLocations.js chrome headless admin
 
 node DeleteUser.js chrome headless admin
 
-node DeleteAllCruises.js chrome headless admin
+#node DeleteAllCruises.js chrome headless admin
 
 exit 0
diff --git a/tests/ConstantsConfigs.js b/tests/ConstantsConfigs.js
@@ -468,6 +468,7 @@ var password;
 	       console.log("Wait 2 seconds for Approved.");
 	    }
         await driver.findElement(By.partialLinkText("1232"));
+        await new Promise(r => setTimeout(r, 2000));
 
         //Approved Flag
         {

diff --git a/tests/DeleteAssemblies.js b/tests/DeleteAssemblies.js
@@ -80,11 +80,12 @@ var password;
         await driver.findElement(By.id("id_login")).sendKeys(user);
         await driver.findElement(By.id("id_password")).sendKeys(password);
         await driver.findElement(By.css(".primaryAction")).click();
+        await new Promise(r => setTimeout(r, 2000));
 
         // DELETE ASSEMBLIES TEST
 
         // Searches for and deletes the Assemblies added during the Add and Update Assemblies Test
-        while ((await driver.findElements(By.id("searchbar-query"))).length == 0) // 1.6
+        while ((await driver.findElements(By.id("searchbar-query"))).length == 0)
         {
             await new Promise(r => setTimeout(r, 2000));
             console.log("Wait 2 seconds for Search.");
@@ -224,6 +225,7 @@ var password;
         await driver.findElement(By.id("navbarTemplates")).click();
         await driver.findElement(By.id("navbarAdmintools")).click();
         await driver.findElement(By.linkText("Edit Assembly Types")).click();
+        await new Promise(r => setTimeout(r, 2000));
 
         if ((await driver.findElements(By.xpath("//tr[*]/td[text()='Electric']"))).length != 0) {
             var i = 1;
@@ -234,7 +236,9 @@ var password;
                 i++;
             }
             await driver.findElement(By.css("tr:nth-child(" + i + ") .btn-danger")).click();
+            await new Promise(r => setTimeout(r, 2000));
             await driver.findElement(By.css(".btn-danger")).click();
+            await new Promise(r => setTimeout(r, 2000));
         }
         else
             console.log("Delete Assemblies failed: Electric type not found");

diff --git a/tests/DeleteCruise.js b/tests/DeleteCruise.js
@@ -83,6 +83,7 @@ var password;
         await driver.findElement(By.id("id_login")).sendKeys(user);
         await driver.findElement(By.id("id_password")).sendKeys(password);
         await driver.findElement(By.css(".primaryAction")).click();
+        await new Promise(r => setTimeout(r, 2000));
 
         // DELETE CRUISE/VESSEL TEST
 
@@ -100,19 +101,16 @@ var password;
         await driver.findElement(By.linkText("Edit Vessel List")).click()
         await new Promise(r => setTimeout(r, 2000));
 
-        // Delete all Vessels
-        //while ((await driver.findElements(By.css(".list-group-item:nth-child(" + 1 + ") .fa"))).length != 0) {
-         // Just delete 1 vessel - takes too long to delete all vessel        
-         if ((await driver.findElements(By.css(".list-group-item:nth-child(" + 1 + ") .fa"))).length != 0) {
-            await driver.findElement(By.css(".list-group-item:nth-child(" + 1 + ") .fa")).click();
-            await driver.findElement(By.linkText("Delete")).click();
-            while ((await driver.findElements(By.css(".btn-danger"))).length == 0) {
-                await new Promise(r => setTimeout(r, 2000));
-                console.log("Wait 2 seconds for Confirm.");
-            }
-            await driver.findElement(By.css(".btn-danger")).click();  // confirm
+        // Delete Maui Princess vessel
+        await driver.findElement(By.partialLinkText("Maui Princess")).click();
+        await new Promise(r => setTimeout(r, 2000));
+        await driver.findElement(By.linkText("Delete")).click();
+        while ((await driver.findElements(By.css(".btn-danger"))).length == 0) {
             await new Promise(r => setTimeout(r, 2000));
-         }
+            console.log("Wait 2 seconds for Confirm.");
+        }
+        await driver.findElement(By.css(".btn-danger")).click();  // confirm
+        await new Promise(r => setTimeout(r, 2000));
 
 	    console.log("Vessel Deleted.");
 
@@ -124,25 +122,16 @@ var password;
         await driver.findElement(By.linkText("Cruises")).click()
 	    await new Promise(r => setTimeout(r, 4000));
 
-         // Just delete 1 cruise - takes too long to delete all cruises        
-         //while ((await driver.findElements(By.xpath("//li/ul/li/a"))).length != 0) {
-            if ((await driver.findElements(By.xpath("//li/ul/li/a"))).length != 0) {
-                await driver.findElement(By.xpath("//li/ul/li/a")).click();
-
-                while ((await driver.findElements(By.linkText("Delete"))).length == 0) {
-                    await new Promise(r => setTimeout(r, 2000));
-                    console.log("Wait 2 seconds for Delete Cruise.");
-                }
-                await driver.findElement(By.linkText("Delete")).click();
-
-                while ((await driver.findElements(By.css(".btn-danger"))).length == 0) {
-                    await new Promise(r => setTimeout(r, 2000));
-                    console.log("Wait 2 seconds for Confirm.");
-                }
-                await driver.findElement(By.css(".btn-danger")).click();
-                await new Promise(r => setTimeout(r, 4000));
-            }
-        //}
+        // Delete MAUI cruise
+        await driver.findElement(By.partialLinkText("MAUI")).click();
+        await new Promise(r => setTimeout(r, 2000));
+        await driver.findElement(By.linkText("Delete")).click();
+        while ((await driver.findElements(By.css(".btn-danger"))).length == 0) {
+            await new Promise(r => setTimeout(r, 2000));
+            console.log("Wait 2 seconds for Confirm.");
+        }
+        await driver.findElement(By.css(".btn-danger")).click();
+        await new Promise(r => setTimeout(r, 4000));
 
 	    console.log("Cruise Deleted.");
 

diff --git a/tests/DeleteParts.js b/tests/DeleteParts.js
@@ -222,6 +222,7 @@ var password;
             }
             await driver.findElement(By.css("tr:nth-child(" + i + ") .btn-danger")).click();
             await driver.findElement(By.css(".btn-danger")).click();
+            await new Promise(r => setTimeout(r, 2000));
         }
         else
             console.log("Delete Parts failed: Computerized type not found");