added tests

Signed-off-by: aryangupta701 <garyan447@gmail.com>
zaproxy · Jul 21, 2023 · e4efc71 · e4efc71
1 parent b97b4df
commit e4efc71
Show file tree

Hide file tree

Showing 4 changed files with 54 additions and 8 deletions.
diff --git a/source/Background/index.ts b/source/Background/index.ts
@@ -224,9 +224,14 @@ async function handleMessage(
     zestScript.reset();
   } else if (request.type === 'stopRecording') {
     if (zestScript.getZestStatementCount() > 0) {
-      const stmt = new ZestStatementWindowClose(0);
-      const data = zestScript.addStatement(stmt.toJSON());
-      sendZestScriptToZAP(data, zapkey, zapurl);
+      const {zapclosewindowhandle} = await Browser.storage.sync.get({
+        zapclosewindowhandle: false,
+      });
+      if (zapclosewindowhandle) {
+        const stmt = new ZestStatementWindowClose(0);
+        const data = zestScript.addStatement(stmt.toJSON());
+        sendZestScriptToZAP(data, zapkey, zapurl);
+      }
     }
   }
   return true;

diff --git a/source/ContentScript/index.ts b/source/ContentScript/index.ts
@@ -256,11 +256,6 @@ Browser.runtime.onMessage.addListener(
       recordUserInteractions();
     } else if (message.type === 'zapStopRecording') {
       stopRecordingUserInteractions();
-      Browser.storage.sync.get({zapclosewindowhandle: false}).then((items) => {
-        if (items.zapclosewindowhandle) {
-          Browser.runtime.sendMessage({type: 'stopRecording'});
-        }
-      });
     }
   }
 );

diff --git a/source/Popup/index.tsx b/source/Popup/index.tsx
@@ -71,6 +71,7 @@ function closePopup(): void {
 function stopRecording(): void {
   console.log('Recording stopped ...');
   sendMessageToContentScript('zapStopRecording');
+  Browser.runtime.sendMessage({type: 'stopRecording'});
   Browser.storage.sync.set({
     zaprecordingactive: false,
   });

diff --git a/test/ContentScript/integrationTests.test.ts b/test/ContentScript/integrationTests.test.ts
@@ -163,6 +163,51 @@ function integrationTests(
       // Then
       expect(actualOutcome).toBe('recordedScript.zst');
     });
+
+    test('Should send window handle close script when enabled', async () => {
+      server = getFakeZapServer(actualData, _JSONPORT);
+      const context = await driver.getContext(_JSONPORT, true);
+      await driver.setEnable(false);
+      const page = await context.newPage();
+      await page.goto(await driver.getPopupURL());
+      await page.check('#window-close-input');
+      await page.goto(
+        `http://localhost:${_HTTPPORT}/webpages/interactions.html`
+      );
+      await page.fill('#input-1', 'testinput');
+      await page.fill('#input-2', '2023-06-15');
+      await page.goto(await driver.getPopupURL());
+      await page.click('#record-btn');
+      await page.waitForLoadState('networkidle');
+      await page.waitForTimeout(1000);
+      await page.close();
+      // Then
+      const expectedData =
+        '["{\\"action\\":{\\"action\\":\\"reportZestScript\\"},\\"body\\":{\\"scriptJson\\":\\"{\\"value\\":\\"testinput\\",\\"windowHandle\\":\\"windowHandle1\\",\\"type\\":\\"id\\",\\"element\\":\\"input-1\\",\\"index\\":1,\\"enabled\\":true,\\"elementType\\":\\"ZestClientElementSendKeys\\"}\\",\\"apikey\\":\\"not set\\"}}","{\\"action\\":{\\"action\\":\\"reportZestScript\\"},\\"body\\":{\\"scriptJson\\":\\"{\\"value\\":\\"2023-06-15\\",\\"windowHandle\\":\\"windowHandle1\\",\\"type\\":\\"id\\",\\"element\\":\\"input-2\\",\\"index\\":2,\\"enabled\\":true,\\"elementType\\":\\"ZestClientElementSendKeys\\"}\\",\\"apikey\\":\\"not set\\"}}","{\\"action\\":{\\"action\\":\\"reportZestScript\\"},\\"body\\":{\\"scriptJson\\":\\"{\\"windowHandle\\":\\"windowHandle1\\",\\"index\\":3,\\"sleepInSeconds\\":0,\\"enabled\\":true,\\"elementType\\":\\"ZestClientWindowClose\\"}\\",\\"apikey\\":\\"not set\\"}}"]';
+      expect(JSON.stringify(Array.from(actualData))).toBe(expectedData);
+    });
+
+    test('Should configure downloaded script name', async () => {
+      // Given
+      server = getFakeZapServer(actualData, _JSONPORT);
+      const context = await driver.getContext(_JSONPORT, true);
+      await driver.setEnable(false);
+      const page = await context.newPage();
+      await page.goto(await driver.getPopupURL());
+      await page.fill('#script-name-input', 'test-name');
+      let actualOutcome = '';
+      page.on('download', async (download) => {
+        actualOutcome = download.suggestedFilename();
+        await download.delete();
+      });
+      // When
+      await page.click('#save-script');
+      await page.waitForLoadState('networkidle');
+      await page.waitForTimeout(1000);
+      await page.close();
+      // Then
+      expect(actualOutcome).toBe('test-name.zst');
+    });
   }
 }