From 4d54fac1c074ab920bf5405de1b601d51ce39731 Mon Sep 17 00:00:00 2001
From: Adam Yeats <adam.yeats@grafana.com>
Date: Thu, 19 Oct 2023 14:16:48 +0200
Subject: [PATCH] More WIP

---
 e2e/k6/k6.spec.js                 |  2 +-
 e2e/playwright/playwright.spec.ts | 20 ++++++++++----------
 2 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/e2e/k6/k6.spec.js b/e2e/k6/k6.spec.js
index 154ae6d2a..3db377db7 100644
--- a/e2e/k6/k6.spec.js
+++ b/e2e/k6/k6.spec.js
@@ -93,7 +93,7 @@ export async function addDatasource(page) {
     // checks the page for the data source is working message
     check(page, {
       'add datasource successful':
-        (await page.locator('div[data-testid="data-testid Alert success"]').textContent()) === 'Success',
+        (await page.locator('[aria-label="Data source settings page Alert"]').textContent()) === 'Success',
     });
   } catch (e) {
     fail(`add datasource failed: ${e}`);
diff --git a/e2e/playwright/playwright.spec.ts b/e2e/playwright/playwright.spec.ts
index 1d8775252..09e36b91b 100644
--- a/e2e/playwright/playwright.spec.ts
+++ b/e2e/playwright/playwright.spec.ts
@@ -67,9 +67,7 @@ async function addDatasource(page: Page) {
   await saveBtn.click();
 
   // checks the page for the data source is working message
-  await expect(page.locator(`[aria-label="Data source settings page Alert"]`)).toContainText(
-    'Success'
-  );
+  await expect(page.locator(`[aria-label="Data source settings page Alert"]`)).toContainText('Success');
 }
 
 async function addDashboard(page: Page) {
@@ -105,30 +103,30 @@ async function configurePanel(page: Page) {
   await addPanelButton.click();
 
   // select data source for panel
-  const dsPanel = page.locator('input[placeholder="Select data source"]')
+  const dsPanel = page.locator('input[placeholder="Search data source"]');
   await dsPanel.fill(`${DATASOURCE_NAME}`);
   await page.keyboard.down('Tab');
   await page.keyboard.down('Enter');
 
   // select database
   const database = page.locator(`[aria-label="Database"]`);
-  await database.click();
+  await database.click({ force: true });
   await database.fill('PerfTest');
-  await page.keyboard.down('Enter');
 
   // select table
   const table = page.locator(`[aria-label="Table"]`);
-  await table.click();
+  await table.click({ force: true });
   await table.fill('PerfTest');
-  await page.keyboard.down('Enter');
 
   // run query
   const runQueryBtn = page.locator(`[data-testid="data-testid run-query"]`);
-  await runQueryBtn.click();
+  await runQueryBtn.click({ force: true });
 
   // are there results?
   const columns = page.locator(`[aria-label="Columns"]`);
-  await columns.click();
+  await columns.click({ force: true });
+
+  await page.waitForTimeout(6000);
 
   const html = await page.locator('[aria-label="Select options menu"]').innerHTML();
   await expect(html).toContain('_val1_');
@@ -136,6 +134,8 @@ async function configurePanel(page: Page) {
   // save panel
   const savePanelBtn = page.locator(`button[title="Apply changes and save dashboard"]`);
   await savePanelBtn.click();
+
+  // save dashboard 
   const saveDashButton = page.locator('button[aria-label="Save dashboard button"]');
   await saveDashButton.click();
 }