Rebase main

Author: Flgado

src/e2e.test.ts

@@ -21,7 +21,7 @@ async function goToTrinoSettings(page: Page) {
 
 async function setupDataSourceWithAccessToken(page: Page) {
     await page.getByPlaceholder('http://localhost:8080').fill('http://trino:8080');
-    await page.locator('div').filter({hasText: /^Impersonate logged in userAccess token$/}).locator('label').nth(1).click();
+    await page.locator('label[for="trino-settings-enable-impersonation"][aria-label="Toggle switch"], label[for="trino-settings-enable-impersonation"]:has(svg)').first().click();
     await page.locator('div').filter({hasText: /^Access token$/}).locator('input[type="password"]').fill('aaa');
     await page.getByRole('button', { name: /save.*test/i }).click();
 }
@@ -35,14 +35,6 @@ async function setupDataSourceWithClientCredentials(page: Page, clientId: string
     await page.getByRole('button', { name: /save.*test/i }).click();
 }
 
-async function setupDataSourceWithClientTags(page: Page, clientTags: string) {
-    await page.getByTestId('data-testid Datasource HTTP settings url').fill('http://trino:8080');
-    await page.locator('div').filter({hasText: /^Impersonate logged in user$/}).getByLabel('Toggle switch').click();
-    await page.locator('div').filter({hasText: /^Access token$/}).locator('input[type="password"]').fill('aaa');
-    await page.locator('div').filter({hasText: /^Client Tags$/}).locator('input').fill(clientTags);
-    await page.getByTestId('data-testid Data source settings page Save and Test button').click();
-}
-
 async function runQueryAndCheckResults(page: Page) {
     await page.getByText(EXPLORE_DATA).click();
     await page.locator('textarea[aria-label*="Editor content"]').click();
@@ -57,6 +49,14 @@ async function runQueryAndCheckResults(page: Page) {
     await expect(page.locator('[role="table"][aria-label="Explore Table"]').getByText(/1995-01-\d+/).first()).toBeVisible();
 }
 
+async function setupDataSourceWithClientTags(page: Page, clientTags: string) {
+    await page.getByPlaceholder('http://localhost:8080').fill('http://trino:8080');
+    await page.locator('label[for="trino-settings-enable-impersonation"][aria-label="Toggle switch"], label[for="trino-settings-enable-impersonation"]:has(svg)').first().click();
+    await page.locator('div').filter({hasText: /^Access token$/}).locator('input[type="password"]').fill('aaa');
+    await page.locator('div').filter({hasText: /^Client Tags$/}).locator('input').fill(clientTags);
+    await page.getByRole('button', { name: /save.*test/i }).click();
+}
+
 test('test with access token', async ({ page }) => {
     await login(page);
     await goToTrinoSettings(page);
@@ -75,15 +75,15 @@ test('test client credentials flow with wrong credentials', async ({ page }) =>
     await login(page);
     await goToTrinoSettings(page);
     await setupDataSourceWithClientCredentials(page, "some-wrong-client");
-    await expect(page.getByText(EXPLORE_DATA)).toHaveCount(0);
+    await expect(page.getByText('Query error: Bad Request')).toBeVisible(); // grafana shows 'Bad Request' for unauthenticated requests
 });
 
 test('test client credentials flow with configured access token', async ({ page }) => {
     await login(page);
     await goToTrinoSettings(page);
     await page.locator('div').filter({hasText: /^Access token$/}).locator('input[type="password"]').fill('aaa');
     await setupDataSourceWithClientCredentials(page, GRAFANA_CLIENT);
-    await expect(page.getByText(EXPLORE_DATA)).toHaveCount(0);
+   await expect(page.getByText('Query error: Internal Server Error')).toBeVisible();
 });
 
 test('test with client tags', async ({ page }) => {