fixed script generation

Signed-off-by: aryangupta701 <[email protected]>
zaproxy · Jun 26, 2023 · 4d3af84 · 4d3af84
1 parent 3dfd29e
commit 4d3af84
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 3 deletions.
diff --git a/source/types/zestScript/ZestStatement.ts b/source/types/zestScript/ZestStatement.ts
@@ -117,10 +117,15 @@ class ZestStatementSwichToFrame extends ZestStatement {
 
   frameName: string;
 
-  constructor(frameIndex: number, frameName = '') {
+  constructor(
+    frameIndex: number,
+    frameName = '',
+    windowHandle = 'windowHandle1'
+  ) {
     super('ZestClientSwitchToFrame');
     this.frameIndex = frameIndex;
     this.frameName = frameName;
+    this.windowHandle = windowHandle;
   }
 
   toJSON(): string {

diff --git a/test/ContentScript/integrationTests.test.ts b/test/ContentScript/integrationTests.test.ts
@@ -140,7 +140,7 @@ function integrationTests(
       await page.close();
       // Then
       expect(JSON.stringify(Array.from(actualData))).toBe(
-        '["{\\"action\\":{\\"action\\":\\"reportZestScript\\"},\\"body\\":{\\"scriptJson\\":\\"{\\"frameIndex\\":0,\\"frameName\\":\\"frame1\\",\\"parent\\":false,\\"index\\":1,\\"enabled\\":true,\\"elementType\\":\\"ZestClientSwitchToFrame\\"}\\",\\"apikey\\":\\"not set\\"}}","{\\"action\\":{\\"action\\":\\"reportZestScript\\"},\\"body\\":{\\"scriptJson\\":\\"{\\"windowHandle\\":\\"windowHandle1\\",\\"type\\":\\"id\\",\\"element\\":\\"test-btn\\",\\"index\\":2,\\"enabled\\":true,\\"elementType\\":\\"ZestClientElementClick\\"}\\",\\"apikey\\":\\"not set\\"}}"]'
+        '["{\\"action\\":{\\"action\\":\\"reportZestScript\\"},\\"body\\":{\\"scriptJson\\":\\"{\\"windowHandle\\":\\"windowHandle1\\",\\"frameIndex\\":0,\\"frameName\\":\\"frame1\\",\\"parent\\":false,\\"index\\":1,\\"enabled\\":true,\\"elementType\\":\\"ZestClientSwitchToFrame\\"}\\",\\"apikey\\":\\"not set\\"}}","{\\"action\\":{\\"action\\":\\"reportZestScript\\"},\\"body\\":{\\"scriptJson\\":\\"{\\"windowHandle\\":\\"windowHandle1\\",\\"type\\":\\"id\\",\\"element\\":\\"test-btn\\",\\"index\\":2,\\"enabled\\":true,\\"elementType\\":\\"ZestClientElementClick\\"}\\",\\"apikey\\":\\"not set\\"}}"]'
       );
     });
 

diff --git a/test/ContentScript/unitTests.test.ts b/test/ContentScript/unitTests.test.ts
@@ -336,7 +336,7 @@ test('should generate valid frame switch statement', () => {
   );
 
   expect(zestStatementSwichToFrame.toJSON()).toBe(
-    '{"frameIndex":0,"frameName":"testvalue","parent":false,"index":-1,"enabled":true,"elementType":"ZestClientSwitchToFrame"}'
+    '{"windowHandle":"windowHandle1","frameIndex":0,"frameName":"testvalue","parent":false,"index":-1,"enabled":true,"elementType":"ZestClientSwitchToFrame"}'
   );
 });
 

diff --git a/test/ContentScript/webpages/testFrame.html b/test/ContentScript/webpages/testFrame.html
@@ -5,5 +5,11 @@
 </head>
 <body>
     <button id="test-btn">Test ME</button>
+    <script>
+        const button = document.getElementById('test-btn'); 
+        button.addEventListener('click', ()=>{
+            button.after("Clicked !!!"); 
+        })
+    </script>
 </body>
 </html>
-Original file line number
+Diff line change
@@ Expand Up @@
       );
       expect(zestStatementSwichToFrame.toJSON()).toBe(
-        '{"frameIndex":0,"frameName":"testvalue","parent":false,"index":-1,"enabled":true,"elementType":"ZestClientSwitchToFrame"}'
+        '{"windowHandle":"windowHandle1","frameIndex":0,"frameName":"testvalue","parent":false,"index":-1,"enabled":true,"elementType":"ZestClientSwitchToFrame"}'
       );
     });
@@ Expand Down @@