ensure that playwright tests pass

Signed-off-by: Abhinav Gyawali <22275402+abhizer@users.noreply.github.com>
feldera · Jan 24, 2025 · 3df64f7 · 3df64f7
1 parent 951cd0d
commit 3df64f7
Show file tree

Hide file tree

Showing 5 changed files with 19 additions and 62 deletions.
diff --git a/docker-compose.yaml b/docker-compose.yaml
@@ -30,8 +30,7 @@ services:
       GF_DATAPROXY_LOGGING: 1
       GF_PLUGINS_ALLOW_LOADING_UNSIGNED_PLUGINS: feldera-feldera-datasource
 
-    network_mode: "host"
-
+    network_mode: 'host'
 # networks:
 #   default:
 #     name: opentelemetry-demo

diff --git a/provisioning/datasources/datasources.yml b/provisioning/datasources/datasources.yml
@@ -9,6 +9,7 @@ datasources:
     version: 1
     editable: true
     jsonData:
-      path: '/resources'
+      baseUrl: 'http://localhost:8080'
+      pipeline: 'blah'
     secureJsonData:
-      apiKey: 'api-key'
+      apiKey: ''
diff --git a/src/components/QueryEditor.tsx b/src/components/QueryEditor.tsx
@@ -1,4 +1,4 @@
-import React  from 'react';
+import React from 'react';
 import { CodeEditor } from '@grafana/ui';
 import { QueryEditorProps } from '@grafana/data';
 import { DataSource } from '../datasource';
@@ -13,15 +13,15 @@ export function QueryEditor({ query, onChange, onRunQuery }: Props) {
   };
 
   return (
-      <CodeEditor
-        width=""
-        height="100px"
-        language="sql"
-        value={query.queryText ?? ''}
-        onSave={onQueryTextChange}
-        onBlur={onQueryTextChange}
-        showMiniMap={false}
-        showLineNumbers={true} 
-      />
+    <CodeEditor
+      width=""
+      height="100px"
+      language="sql"
+      value={query.queryText ?? ''}
+      onSave={onQueryTextChange}
+      onBlur={onQueryTextChange}
+      showMiniMap={false}
+      showLineNumbers={true}
+    />
   );
 }
diff --git a/tests/configEditor.spec.ts b/tests/configEditor.spec.ts
@@ -1,31 +1,9 @@
 import { test, expect } from '@grafana/plugin-e2e';
-import { MyDataSourceOptions, MySecureJsonData } from '../src/types';
 
 test('smoke: should render config editor', async ({ createDataSourceConfigPage, readProvisionedDataSource, page }) => {
   const ds = await readProvisionedDataSource({ fileName: 'datasources.yml' });
   await createDataSourceConfigPage({ type: ds.type });
-  await expect(page.getByLabel('Path')).toBeVisible();
-});
-test('"Save & test" should be successful when configuration is valid', async ({
-  createDataSourceConfigPage,
-  readProvisionedDataSource,
-  page,
-}) => {
-  const ds = await readProvisionedDataSource<MyDataSourceOptions, MySecureJsonData>({ fileName: 'datasources.yml' });
-  const configPage = await createDataSourceConfigPage({ type: ds.type });
-  await page.getByRole('textbox', { name: 'Path' }).fill(ds.jsonData.path ?? '');
-  await page.getByRole('textbox', { name: 'API Key' }).fill(ds.secureJsonData?.apiKey ?? '');
-  await expect(configPage.saveAndTest()).toBeOK();
-});
-
-test('"Save & test" should fail when configuration is invalid', async ({
-  createDataSourceConfigPage,
-  readProvisionedDataSource,
-  page,
-}) => {
-  const ds = await readProvisionedDataSource<MyDataSourceOptions, MySecureJsonData>({ fileName: 'datasources.yml' });
-  const configPage = await createDataSourceConfigPage({ type: ds.type });
-  await page.getByRole('textbox', { name: 'Path' }).fill(ds.jsonData.path ?? '');
-  await expect(configPage.saveAndTest()).not.toBeOK();
-  await expect(configPage).toHaveAlert('error', { hasText: 'API key is missing' });
+  await expect(page.getByLabel('Base Url')).toBeVisible();
+  await expect(page.getByLabel('Pipeline')).toBeVisible();
+  await expect(page.getByLabel('API Key')).toBeVisible();
 });
diff --git a/tests/queryEditor.spec.ts b/tests/queryEditor.spec.ts
@@ -3,26 +3,5 @@ import { test, expect } from '@grafana/plugin-e2e';
 test('smoke: should render query editor', async ({ panelEditPage, readProvisionedDataSource }) => {
   const ds = await readProvisionedDataSource({ fileName: 'datasources.yml' });
   await panelEditPage.datasource.set(ds.name);
-  await expect(panelEditPage.getQueryEditorRow('A').getByRole('textbox', { name: 'Query Text' })).toBeVisible();
-});
-
-test('should trigger new query when Constant field is changed', async ({
-  panelEditPage,
-  readProvisionedDataSource,
-}) => {
-  const ds = await readProvisionedDataSource({ fileName: 'datasources.yml' });
-  await panelEditPage.datasource.set(ds.name);
-  await panelEditPage.getQueryEditorRow('A').getByRole('textbox', { name: 'Query Text' }).fill('test query');
-  const queryReq = panelEditPage.waitForQueryDataRequest();
-  await panelEditPage.getQueryEditorRow('A').getByRole('spinbutton').fill('10');
-  await expect(await queryReq).toBeTruthy();
-});
-
-test('data query should return values 10 and 20', async ({ panelEditPage, readProvisionedDataSource }) => {
-  const ds = await readProvisionedDataSource({ fileName: 'datasources.yml' });
-  await panelEditPage.datasource.set(ds.name);
-  await panelEditPage.getQueryEditorRow('A').getByRole('textbox', { name: 'Query Text' }).fill('test query');
-  await panelEditPage.setVisualization('Table');
-  await expect(panelEditPage.refreshPanel()).toBeOK();
-  await expect(panelEditPage.panel.data).toContainText(['10', '20']);
+  await expect(panelEditPage.getQueryEditorRow('A').getByRole('code', { name: '' })).toBeVisible();
 });