some more cleaning

Author: anderson4j

packages/vscode-extension/tests/specs/webviews/params.spec.ts

@@ -13,13 +13,13 @@ import {
 
 //** Checks that the query result for each statement containts the expected summaries in query details.
 // If we pass an expected summary that is undefined we expect an empty result from query execution */
-export async function expectSummaries(
-  expectedSummaries: (string | undefined)[],
+export async function expectSummariesContain(
+  expectedSubstrings: (string | undefined)[],
 ) {
   const queryDetails = await $$('#queryDetails .collapsible');
-  await expect(queryDetails.length).toBe(expectedSummaries.length);
+  await expect(queryDetails.length).toBe(expectedSubstrings.length);
 
-  for (let i = 0; i < expectedSummaries.length; i++) {
+  for (let i = 0; i < expectedSubstrings.length; i++) {
     const queryDetail = (await $$('#queryDetails .collapsible'))[i];
     //This matches the expand/collapse button, but we only want to click when collapsed
     const expandButton = await queryDetail.$('button[aria-label*="statement"]');
@@ -31,8 +31,8 @@ export async function expectSummaries(
     const queryResult = await queryDetail.$('.collapsible-content');
     await queryResult.waitForDisplayed();
     const summary = await queryResult.getText();
-    if (expectedSummaries[i] !== undefined) {
-      await expect(summary).toContain(expectedSummaries[i]);
+    if (expectedSubstrings[i] !== undefined) {
+      await expect(summary).toContain(expectedSubstrings[i]);
     } else {
       await expect(summary).toBe('');
     }
@@ -133,6 +133,7 @@ suite('Params panel testing', () => {
     await forceAddParam('some param', '"pikachu"');
     await forceAddParam('some-param', '"bulbasaur"');
 
+    //TODO: see if we can remove this, maybe correcting some await in result display, or switching view manually
     await executeFile(workbench, 'params.cypher');
     await executeFile(workbench, 'params.cypher');
 
@@ -153,7 +154,7 @@ suite('Params panel testing', () => {
     await escapeModal(4);
 
     await checkResultsContent(workbench, true, async () => {
-      await expectSummaries([
+      await expectSummariesContain([
         'Expected parameter(s): a, b, some param, some-param',
       ]);
     });
@@ -192,7 +193,6 @@ suite('Params panel testing', () => {
     await forceAddParam('some param', '"pikachu"');
     await forceAddParam('some-param', '"bulbasaur"');
 
-    await executeFile(workbench, 'params.cypher');
     await executeFile(workbench, 'params.cypher');
     await checkResultsContent(workbench, false, async () => {
       await expectTableContent([
@@ -224,7 +224,6 @@ suite('Params panel testing', () => {
     await forceAddParam('some param', '"pikachu"');
     await forceAddParam('some-param', '"bulbasaur"');
 
-    await executeFile(workbench, 'params.cypher');
     await executeFile(workbench, 'params.cypher');
 
     await checkResultsContent(workbench, false, async () => {
@@ -248,7 +247,7 @@ suite('Params panel testing', () => {
     await escapeModal(2);
 
     await checkResultsContent(workbench, true, async () => {
-      await expectSummaries(['Expected parameter(s): a, b']);
+      await expectSummariesContain(['Expected parameter(s): a, b']);
     });
   });
 

packages/vscode-extension/tests/specs/webviews/queryExecution.spec.ts

@@ -12,13 +12,13 @@ import {
 
 //** Checks that the query result for each statement containts the expected summaries in query details.
 // If we pass an expected summary that is undefined we expect an empty result from query execution */
-export async function expectSummaries(
-  expectedSummaries: (string | undefined)[],
+export async function expectSummariesContain(
+  expectedSubstrings: (string | undefined)[],
 ) {
   const queryDetails = await $$('#queryDetails .collapsible');
-  await expect(queryDetails.length).toBe(expectedSummaries.length);
+  await expect(queryDetails.length).toBe(expectedSubstrings.length);
 
-  for (let i = 0; i < expectedSummaries.length; i++) {
+  for (let i = 0; i < expectedSubstrings.length; i++) {
     const queryDetail = (await $$('#queryDetails .collapsible'))[i];
     //This matches the expand/collapse button, but we only want to click when collapsed
     const expandButton = await queryDetail.$('button[aria-label*="statement"]');
@@ -30,8 +30,8 @@ export async function expectSummaries(
     const queryResult = await queryDetail.$('.collapsible-content');
     await queryResult.waitForDisplayed();
     const summary = await queryResult.getText();
-    if (expectedSummaries[i] !== undefined) {
-      await expect(summary).toContain(expectedSummaries[i]);
+    if (expectedSubstrings[i] !== undefined) {
+      await expect(summary).toContain(expectedSubstrings[i]);
     } else {
       await expect(summary).toBe('');
     }
@@ -50,7 +50,7 @@ suite('Query results testing', () => {
   test('should manage queries that need implicit transactions', async function () {
     await executeFile(workbench, 'call-in-transactions.cypher');
     await checkResultsContent(workbench, true, async () => {
-      await expectSummaries([
+      await expectSummariesContain([
         '6 nodes created, 12 properties set, 6 labels added.',
       ]);
     });
@@ -59,14 +59,14 @@ suite('Query results testing', () => {
   test('should correctly execute valid Cypher', async function () {
     await executeFile(workbench, 'valid.cypher');
     await checkResultsContent(workbench, true, async () => {
-      await expectSummaries(['1 nodes created, 1 labels added.']);
+      await expectSummariesContain(['1 nodes created, 1 labels added.']);
     });
   });
 
   test('should correctly execute valid Cypher when highlighting several statements', async function () {
     await executeFile(workbench, 'multiline.cypher');
     await checkResultsContent(workbench, true, async () => {
-      await expectSummaries([
+      await expectSummariesContain([
         '1 nodes created, 1 labels added.',
         '2 nodes created, 2 labels added.',
         '',
@@ -77,7 +77,7 @@ suite('Query results testing', () => {
   test('should error on invalid cypher', async function () {
     await executeFile(workbench, 'invalid.cypher');
     await checkResultsContent(workbench, true, async () => {
-      await expectSummaries(['Variable `n` not defined']);
+      await expectSummariesContain(['Variable `n` not defined']);
     });
   });
 
@@ -91,11 +91,11 @@ suite('Query results testing', () => {
 
     await executeFile(workbench, 'create-for-match.cypher');
     await checkResultsContent(workbench, true, async () => {
-      await expectSummaries(['1 nodes created, 1 labels added.']);
+      await expectSummariesContain(['1 nodes created, 1 labels added.']);
     });
     await executeFile(workbench, 'match-for-create.cypher');
     await checkResultsContent(workbench, true, async () => {
-      await expectSummaries(['Started streaming 1 record']);
+      await expectSummariesContain(['Started streaming 1 record']);
     });
 
     // Disconnect from the current instance
@@ -105,7 +105,7 @@ suite('Query results testing', () => {
 
     await executeFile(workbench, 'match-for-create.cypher');
     await checkResultsContent(workbench, true, async () => {
-      await expectSummaries([undefined]);
+      await expectSummariesContain([undefined]);
     });
     await clickOnContextMenuItem(connectionSection, 'Disconnect', 0);