Updated results excel sheet name

tests/ActivityReport/ActivityReportPage.js

@@ -934,7 +934,7 @@ const takeScreenshot = async (driver, stepIndex, stepDescription) => {
   return screenshotPath;
 };
 
-const resultsFile = path.join('results', 'activityReportPageResults.xlsx');
+const resultsFile = path.join('results', 'activityReportPage.xlsx');
 
 const clearOldResults = () => {
   //Remove old screenshots

tests/Align/alignAutoAlignPage.js

@@ -2238,7 +2238,7 @@ const takeScreenshot = async (driver, stepIndex, stepDescription) => {
   return screenshotPath;
 };
 
-const resultsFile = path.join('results', 'alignAutoAlignPageResults.xlsx');
+const resultsFile = path.join('results', 'alignAutoAlignPage.xlsx');
 
 const clearOldResults = () => {
   //Remove old screenshots

tests/Align/alignContentPage.js

@@ -1389,7 +1389,7 @@ const takeScreenshot = async (driver, stepIndex, stepDescription) => {
   return screenshotPath;
 };
 
-const resultsFile = path.join('results', 'alignContentPageResults.xlsx');
+const resultsFile = path.join('results', 'alignContentPage.xlsx');
 
 const clearOldResults = () => {
   //Remove old screenshots

tests/Align/alignStandardsPage.js

@@ -1882,7 +1882,7 @@ const takeScreenshot = async (driver, stepIndex, stepDescription) => {
   return screenshotPath;
 };
 
-const resultsFile = path.join('results', 'alignStandardsPageResults.xlsx');
+const resultsFile = path.join('results', 'alignStandardsPage.xlsx');
 
 const clearOldResults = () => {
   //Remove old screenshots

tests/Approve/approveApprovalHistoryPage.js

@@ -1436,7 +1436,7 @@ const takeScreenshot = async (driver, stepIndex, stepDescription) => {
   return screenshotPath;
 };
 
-const resultsFile = path.join('results', 'approveApprovalHistoryPageResults.xlsx');
+const resultsFile = path.join('results', 'approveApprovalHistoryPage.xlsx');
 
 const clearOldResults = () => {
   //Remove old screenshots

tests/Approve/approveContentSubmissionsPage.js

@@ -1436,7 +1436,7 @@ const takeScreenshot = async (driver, stepIndex, stepDescription) => {
   return screenshotPath;
 };
 
-const resultsFile = path.join('results', 'approveContentSubmissionsPageResults.xlsx');
+const resultsFile = path.join('results', 'approveContentSubmissionsPage.xlsx');
 
 const clearOldResults = () => {
   //Remove old screenshots

tests/Approve/approvePendingAlignmentsPage.js

@@ -1054,7 +1054,7 @@ const takeScreenshot = async (driver, stepIndex, stepDescription) => {
   return screenshotPath;
 };
 
-const resultsFile = path.join('results', 'approvePendingAlignmentsPageResults.xlsx');
+const resultsFile = path.join('results', 'approvePendingAlignmentsPage.xlsx');
 
 const clearOldResults = () => {
   //Remove old screenshots

tests/Approve/approveRejectionHistoryPage.js

@@ -1436,7 +1436,7 @@ const takeScreenshot = async (driver, stepIndex, stepDescription) => {
   return screenshotPath;
 };
 
-const resultsFile = path.join('results', 'approveRejectionHistoryPageResults.xlsx');
+const resultsFile = path.join('results', 'approveRejectionHistoryPage.xlsx');
 
 const clearOldResults = () => {
   //Remove old screenshots

tests/Frameworks/frameworkManagementPage.js

@@ -2614,7 +2614,7 @@ const takeScreenshot = async (driver, stepIndex, stepDescription) => {
   return screenshotPath;
 };
 
-const resultsFile = path.join('results', 'frameworkManagementPageResults.xlsx');
+const resultsFile = path.join('results', 'frameworkManagementPage.xlsx');
 
 const clearOldResults = () => {
   //Remove old screenshots

tests/Report/reportBuildYourReportPage.js

@@ -1637,7 +1637,7 @@ const takeScreenshot = async (driver, stepIndex, stepDescription) => {
   return screenshotPath;
 };
 
-const resultsFile = path.join('results', 'reportBuildYourReportPageResults.xlsx');
+const resultsFile = path.join('results', 'reportBuildYourReportPage.xlsx');
 
 const clearOldResults = () => {
   //Remove old screenshots

tests/Report/reportSpecialtyReportsPage.js

@@ -1203,7 +1203,7 @@ const takeScreenshot = async (driver, stepIndex, stepDescription) => {
   return screenshotPath;
 };
 
-const resultsFile = path.join('results', 'reportSpecialtyReportsPageResults.xlsx');
+const resultsFile = path.join('results', 'reportSpecialtyReportsPage.xlsx');
 
 const clearOldResults = () => {
   //Remove old screenshots

tests/Report/reportViewQueuedReportsPage.js

@@ -1605,7 +1605,7 @@ const takeScreenshot = async (driver, stepIndex, stepDescription) => {
   return screenshotPath;
 };
 
-const resultsFile = path.join('results', 'reportViewQueuedReportsPageResults.xlsx');
+const resultsFile = path.join('results', 'reportViewQueuedReportsPage.xlsx');
 
 const clearOldResults = () => {
   //Remove old screenshots

tests/Upload/uploadBatchUpload.js

@@ -1416,7 +1416,7 @@ const takeScreenshot = async (driver, stepIndex, stepDescription) => {
   return screenshotPath;
 };
 
-const resultsFile = path.join('results', 'uploadBatchUploadPageResults.xlsx');
+const resultsFile = path.join('results', 'uploadBatchUploadPage.xlsx');
 
 const clearOldResults = () => {
   //Remove old screenshots

tests/Upload/uploadImportAlignmentsPage.js

@@ -1429,7 +1429,7 @@ const takeScreenshot = async (driver, stepIndex, stepDescription) => {
   return screenshotPath;
 };
 
-const resultsFile = path.join('results', 'uploadImportAlignmentsPageResults.xlsx');
+const resultsFile = path.join('results', 'uploadImportAlignmentsPage.xlsx');
 
 const clearOldResults = () => {
   //Remove old screenshots

tests/Upload/uploadSubmitAResourcePage.js

@@ -872,7 +872,7 @@ const takeScreenshot = async (driver, stepIndex, stepDescription) => {
   return screenshotPath;
 };
 
-const resultsFile = path.join('results', 'uploadSubmitAResourcePageResults.xlsx');
+const resultsFile = path.join('results', 'uploadSubmitAResourcePage.xlsx');
 
 const clearOldResults = () => {
   //Remove old screenshots

tests/exactLandingPage.js

@@ -4817,7 +4817,7 @@ const takeScreenshot = async (driver, stepIndex, stepDescription) => {
   return screenshotPath;
 };
 
-const resultsFile = path.join('results', 'exactLandingPageResults.xlsx');
+const resultsFile = path.join('results', 'exactLandingPage.xlsx');
 
 const clearOldResults = () => {
   //Remove old screenshots

tests/myStandardsSearchAlignedContent.js

@@ -3,8 +3,6 @@ import { Options as ChromeOptions } from 'selenium-webdriver/chrome.js';
 import fs from 'fs';
 import XLSX from 'xlsx';
 import path from 'path';
-import { brotliCompress } from 'zlib';
-import e from 'express';
 
 //Export JUST the steps so other scripts can import them
 export const myStandardsSearch_AlignedContent = (driver) => [
@@ -7752,10 +7750,10 @@ export const myStandardsSearch_AlignedContent = (driver) => [
       const errors = [];
 
       //text
-      if (elementText === 'Aligned Content 4') {
-        console.log('Passed: Standard Code 2, Aligned Content 4 button text matched as expected');
+      if (elementText === 'Aligned Content 5') {
+        console.log('Passed: Standard Code 2, Aligned Content 5 button text matched as expected');
       } else {
-        errors.push(`Expected: "Aligned Content 4"; Actual: "${elementText}"`);
+        errors.push(`Expected: "Aligned Content 5"; Actual: "${elementText}"`);
       }
 
       //font
@@ -8095,14 +8093,14 @@ const myStandardsSearch = (req, res) => {
         return readyState === 'complete';
       }, 30000, 'ExACT Dashboard did not fully load within 30 seconds');
 
-      /*Wait for the dashboard container to exist in DOM
+      //Wait for the dashboard container to exist in DOM
       await driver.wait(
         until.elementLocated(By.css('.gap-idle-wrap > img')),
         30000,
         'Dashboard image did not appear within 30 seconds'
       );
 
-      Wait for it to be visible
+      //Wait for it to be visible
       await driver.wait(async () => {
         try {
           const img = await driver.findElement(By.css('.gap-idle-wrap > img'));
@@ -8110,7 +8108,7 @@ const myStandardsSearch = (req, res) => {
         } catch (e) {
           return false;
         }
-      }, 30000, 'Dashboard image did not become visible within 30 seconds');*/
+      }, 30000, 'Dashboard image did not become visible within 30 seconds');
 
       //Wait for any loading spinners to disappear
       await driver.wait(async () => {
@@ -8314,18 +8312,21 @@ const takeScreenshot = async (driver, stepIndex, stepDescription) => {
   return screenshotPath;
 };
 
+const resultsFile = path.join('results', 'myStandardsSearchAlignedContentResults.xlsx');
+
 const clearOldResults = () => {
   //Remove old screenshots
-  const screenshotDir = path.join('screenshots', 'myStandardsSearchAlignedContentResults');
+  const screenshotDir = path.join('screenshots', 'myStandardsSearchAlignedContent');
   if (fs.existsSync(screenshotDir)) {
     fs.rmSync(screenshotDir, { recursive: true, force: true });
   }
   fs.mkdirSync(screenshotDir, { recursive: true });
 
   //Remove old Excel file
-  if (fs.existsSync('myStandardsSearchAlignedContentResults.xlsx')) {
-    fs.unlinkSync('myStandardsSearchAlignedContentResults.xlsx');
+  if (fs.existsSync(resultsFile)) {
+    fs.unlinkSync(resultsFile);
   }
+    fs.mkdirSync('results', { recursive: true });
 };
 
 try {
@@ -8352,13 +8353,15 @@ try {
 
     try {
       await step.action();
+
+      //Log a successful step with no screenshot
       worksheet = logStep(
         worksheet,
         step.description,
         'Passed',
         stepIndex,
         timestamp,
-        null
+        null //No screenshot for passed steps
       );
 
     } catch (error) {
@@ -8402,11 +8405,11 @@ try {
 
   //Write the updated worksheet back to the workbook and save it
   workbook.Sheets['Sheet1'] = worksheet;
-  XLSX.writeFile(workbook, 'myStandardsSearchAlignedContentResults.xlsx');
+  XLSX.writeFile(workbook, resultsFile);
 } finally {
   await driver.quit();
 }
   })();
-};
+}
 
 export default myStandardsSearch;