From 74b033df305f61d8f6b4705cac366e944329d848 Mon Sep 17 00:00:00 2001
From: 00Fjongl <65314359+00Fjongl@users.noreply.github.com>
Date: Wed, 10 Jul 2024 22:31:55 -0500
Subject: [PATCH] Minor reformatting and commenting for test script.

---
 test.js | 47 +++++++++++++++++++++++++++--------------------
 1 file changed, 27 insertions(+), 20 deletions(-)

diff --git a/test.js b/test.js
index 56611431..ede914cc 100644
--- a/test.js
+++ b/test.js
@@ -1,7 +1,7 @@
 const axios = require("axios");
 const puppeteer = require("puppeteer");
 
-async function testEndpoint(url) {
+const testEndpoint = async url => {
   try {
     const response = await axios.get(url);
     return response.status === 200;
@@ -9,9 +9,9 @@ async function testEndpoint(url) {
     console.error(`Error while testing ${url}:`, error.message);
     return false;
   }
-}
+};
 
-async function testGeneratedUrl(url, headers) {
+const testGeneratedUrl = async (url, headers) => {
   try {
     console.log(`Testing generated URL: ${url}`);
 
@@ -22,9 +22,9 @@ async function testGeneratedUrl(url, headers) {
     console.error(`Error while testing generated URL ${url}:`, error.message);
     return false;
   }
-}
+};
 
-async function testServerResponse() {
+const testServerResponse = async () => {
   const endpoints = [
     "http://localhost:8080/",
     "http://localhost:8080/?pathtonowhere",
@@ -45,9 +45,9 @@ async function testServerResponse() {
     );
     process.exit(1);
   }
-}
+};
 
-async function testCommonJSOnPage() {
+const testCommonJSOnPage = async () => {
   const browser = await puppeteer.launch({
     args: [
       "--enable-features=NetworkService",
@@ -60,16 +60,16 @@ async function testCommonJSOnPage() {
   const page = await browser.newPage();
 
   try {
-    async function getHeaders() {
+    const getHeaders = async () => {
       const headers = {};
 
       headers["User-Agent"] = await page.evaluate(() => navigator.userAgent);
       headers["Referer"] = await page.evaluate(() => window.location.href);
 
       return headers;
-    }
+    };
 
-    async function testRammerhead() {
+    const testRammerhead = async () => {
       await page.goto("http://localhost:8080/?rh");
 
       const testResults = await page.evaluate(async () => {
@@ -115,7 +115,7 @@ async function testCommonJSOnPage() {
       );
 
       return rammerheadTestPassed;
-    }
+    };
 
     /*
 
@@ -155,7 +155,7 @@ xx                                                  xx
 
 
 
-    async function testUltraviolet() {
+    const testUltraviolet = async () => {
       await page.goto("http://localhost:8080/?q");
 
       const testResults = await page.evaluate(async () => {
@@ -179,10 +179,15 @@ xx                                                  xx
         });
 
         if (window.goProx && window.goProx.ultraviolet) {
+//          For the hacky URL test, use the URL page's EXACT title.
+          const website = {
+            path: "example.com",
+            title: "Example Domain"
+          };
+
           try {
-//          For the hacky URL test, keep this as example.com.
             const generatedUrl = window.goProx.ultraviolet(
-              "example.com",
+              website.path,
               false
             );
             console.log("Generated Ultraviolet URL:", generatedUrl);
@@ -193,13 +198,15 @@ xx                                                  xx
             const testGeneratedUrlHacky = async (url) => {
               let result = false;
               const exampleIFrame = document.createElement("iframe");
-              const waitForDocument = new Promise(resolve => exampleIFrame.addEventListener("load", () => {
-                result = exampleIFrame.contentWindow.document.title === "Example Domain";
+              const waitForDocument = new Promise(resolve => {
+                document.documentElement.appendChild(exampleIFrame);
+                exampleIFrame.addEventListener("load", () => {
+                result = exampleIFrame.contentWindow.document.title === website.title;
                 resolve();
-              }));
+              });
+            });
               exampleIFrame.src = url;
               exampleIFrame.style.display = "none";
-              document.documentElement.appendChild(exampleIFrame);
               await waitForDocument;
               return result;
             };
@@ -227,7 +234,7 @@ xx                                                  xx
         console.log(`Ultraviolet test result: failure`);
         return false;
       }
-    }
+    };
 
     // Run tests for Rammerhead and Ultraviolet
     const rammerheadPassed = await testRammerhead();
@@ -246,6 +253,6 @@ xx                                                  xx
   } finally {
     await browser.close();
   }
-}
+};
 
 testServerResponse();