Plugin E2E: Change package imports and exports (#838)

grafana · Mar 26, 2024 · 5c85ff1 · 5c85ff1
1 parent 7f7322d
commit 5c85ff1
Show file tree

Hide file tree

Showing 35 changed files with 524 additions and 638 deletions.
diff --git a/packages/plugin-e2e/src/api.ts b/packages/plugin-e2e/src/api.ts
diff --git a/packages/plugin-e2e/src/auth/auth.setup.ts b/packages/plugin-e2e/src/auth/auth.setup.ts
@@ -1,4 +1,4 @@
-import { test as setup } from '../api';
+import { test as setup } from '../';
 
 setup('authenticate', async ({ login, createUser, user }) => {
  if (user) {

diff --git a/packages/plugin-e2e/src/fixtures/annotationEditPage.ts b/packages/plugin-e2e/src/fixtures/annotationEditPage.ts
@@ -1,14 +1,11 @@
 import { TestFixture } from '@playwright/test';
-import { PluginFixture, PluginOptions } from '../api';
-import { AnnotationEditPage, AnnotationPage } from '../models';
-import { PlaywrightCombinedArgs } from './types';
+import { PlaywrightArgs } from '../types';
+import { AnnotationPage } from '../models/pages/AnnotationPage';
+import { AnnotationEditPage } from '../models/pages/AnnotationEditPage';
 
-type AnnotationEditPageFixture = TestFixture<
- AnnotationEditPage,
- PluginFixture & PluginOptions & PlaywrightCombinedArgs
->;
+type AnnotationEditPageFixture = TestFixture<AnnotationEditPage, PlaywrightArgs>;
 
-const annotationEditPage: AnnotationEditPageFixture = async (
+export const annotationEditPage: AnnotationEditPageFixture = async (
  { page, selectors, grafanaVersion, request },
  use,
  testInfo
@@ -18,5 +15,3 @@ const annotationEditPage: AnnotationEditPageFixture = async (
  const annotationEditPage = await annotationPage.clickAddNew();
  await use(annotationEditPage);
 };
-
-export default annotationEditPage;
diff --git a/packages/plugin-e2e/src/fixtures/commands/createDataSource.ts b/packages/plugin-e2e/src/fixtures/commands/createDataSource.ts
@@ -1,12 +1,10 @@
 import { v4 as uuidv4 } from 'uuid';
 import { APIRequestContext, expect, TestFixture } from '@playwright/test';
-import { PluginFixture, PluginOptions } from '../../api';
-import { CreateDataSourceArgs, DataSourceSettings } from '../../types';
-import { PlaywrightCombinedArgs } from '../types';
+import { CreateDataSourceArgs, DataSourceSettings, PlaywrightArgs } from '../../types';
 
 type CreateDataSourceViaAPIFixture = TestFixture<
  (args: CreateDataSourceArgs) => Promise<DataSourceSettings>,
- PluginFixture & PluginOptions & PlaywrightCombinedArgs
+ PlaywrightArgs
 >;
 
 export const createDataSourceViaAPI = async (
@@ -40,10 +38,8 @@ export const createDataSourceViaAPI = async (
  return existingDataSource.json();
 };
 
-const createDataSource: CreateDataSourceViaAPIFixture = async ({ request }, use) => {
+export const createDataSource: CreateDataSourceViaAPIFixture = async ({ request }, use) => {
  await use(async (args) => {
  return createDataSourceViaAPI(request, args);
  });
 };
-
-export default createDataSource;
diff --git a/packages/plugin-e2e/src/fixtures/commands/createDataSourceConfigPage.ts b/packages/plugin-e2e/src/fixtures/commands/createDataSourceConfigPage.ts
@@ -1,16 +1,14 @@
 import { TestFixture } from '@playwright/test';
-import { PluginFixture, PluginOptions } from '../../api';
-import { CreateDataSourcePageArgs } from '../../types';
-import { PlaywrightCombinedArgs } from '../types';
-import { DataSourceConfigPage } from '../../models';
+import { CreateDataSourcePageArgs, PlaywrightArgs } from '../../types';
 import { createDataSourceViaAPI } from './createDataSource';
+import { DataSourceConfigPage } from '../../models/pages/DataSourceConfigPage';
 
 type CreateDataSourceConfigPageFixture = TestFixture<
  (args: CreateDataSourcePageArgs) => Promise<DataSourceConfigPage>,
- PluginFixture & PluginOptions & PlaywrightCombinedArgs
+ PlaywrightArgs
 >;
 
-const createDataSourceConfigPage: CreateDataSourceConfigPageFixture = async (
+export const createDataSourceConfigPage: CreateDataSourceConfigPageFixture = async (
  { request, page, selectors, grafanaVersion },
  use,
  testInfo
@@ -26,5 +24,3 @@ const createDataSourceConfigPage: CreateDataSourceConfigPageFixture = async (
  });
  deleteDataSource && (await datasourceConfigPage?.deleteDataSource());
 };
-
-export default createDataSourceConfigPage;