format

Author: aweng98

playwright-e2e/tests/dsm/kitUploadFlow/kit-upload-ui.spec.ts

@@ -4,11 +4,10 @@ import {WelcomePage} from 'dsm/pages/welcome-page';
 import {Navigation} from 'dsm/component/navigation/navigation';
 import {StudyEnum} from 'dsm/component/navigation/enums/selectStudyNav-enum';
 import {SamplesNavEnum} from 'dsm/component/navigation/enums/samplesNav-enum';
-import {KitTypeEnum} from 'dsm/component/kitType/enums/kitType-enum';
 import KitUploadPage from 'dsm/pages/kitUpload-page/kitUpload-page';
+import {getExpectedKitSelection} from 'utils/test-utils';
 
-// don't run in parallel
-test.describe.serial('Blood Kits upload flow', () => {
+test.describe('Kits Upload UI', () => {
   let welcomePage: WelcomePage;
   let navigation: Navigation;
 
@@ -20,11 +19,10 @@ test.describe.serial('Blood Kits upload flow', () => {
   });
 
   for (const study of studies) {
-    test(`Kit Upload page ui @dsm @${study} @kit`, async ({page}) => {
+    test(`Page verifications @dsm @${study} @kit`, async () => {
       const expectedKitSelection = getExpectedKitSelection(study);
       await welcomePage.selectStudy(study);
 
-      // Kit Upload page
       const kitUploadPage = await navigation.selectFromSamples<KitUploadPage>(SamplesNavEnum.KIT_UPLOAD);
       await kitUploadPage.waitForReady(expectedKitSelection);
 
@@ -38,17 +36,4 @@ test.describe.serial('Blood Kits upload flow', () => {
       expect(test.info().errors).toHaveLength(0);
     })
   }
-
-  function getExpectedKitSelection(study: StudyEnum): KitTypeEnum[] {
-    let types = [KitTypeEnum.SALIVA, KitTypeEnum.BLOOD];
-    switch (study) {
-      case StudyEnum.PANCAN:
-        types = types.concat([KitTypeEnum.STOOL]);
-      break;
-      case StudyEnum.RGP:
-        types = [KitTypeEnum.BLOOD, KitTypeEnum.BLOOD_AND_RNA];
-        break;
-    }
-    return types;
-  }
 })

playwright-e2e/tests/dsm/kitUploadFlow/kit-without-labels-ui.spec.ts

@@ -4,13 +4,11 @@ import {WelcomePage} from 'dsm/pages/welcome-page';
 import {Navigation} from 'dsm/component/navigation/navigation';
 import {StudyEnum} from 'dsm/component/navigation/enums/selectStudyNav-enum';
 import {SamplesNavEnum} from 'dsm/component/navigation/enums/samplesNav-enum';
-import {KitTypeEnum} from 'dsm/component/kitType/enums/kitType-enum';
 import KitsWithoutLabelPage from 'dsm/pages/kitsInfo-pages/kitsWithoutLabel-page';
 import {KitsColumnsEnum} from 'dsm/pages/kitsInfo-pages/enums/kitsColumns-enum';
-import { studyShortName } from 'utils/test-utils';
+import {getExpectedKitSelection, studyShortName} from 'utils/test-utils';
 
-// don't run in parallel
-test.describe.serial('Blood Kits upload flow', () => {
+test.describe('Kits without Labels UI', () => {
   let welcomePage: WelcomePage;
   let navigation: Navigation;
 
@@ -22,12 +20,11 @@ test.describe.serial('Blood Kits upload flow', () => {
   });
 
   for (const study of studies) {
-    test(`Kit Upload page ui @dsm @${study} @kit`, async ({page}) => {
+    test(`Page verifications @dsm @${study} @kit`, async ({page}) => {
       const expectedKitSelection = getExpectedKitSelection(study);
       const { realm: expectedRealm } = studyShortName(study);
       await welcomePage.selectStudy(study);
 
-      // Kit Upload page
       const kitsWithoutLabelPage = await navigation.selectFromSamples<KitsWithoutLabelPage>(SamplesNavEnum.KITS_WITHOUT_LABELS);
       await kitsWithoutLabelPage.waitForReady(expectedKitSelection);
       const kitsTable = kitsWithoutLabelPage.kitsWithoutLabelTable;
@@ -57,17 +54,4 @@ test.describe.serial('Blood Kits upload flow', () => {
       expect(test.info().errors).toHaveLength(0);
     })
   }
-
-  function getExpectedKitSelection(study: StudyEnum): KitTypeEnum[] {
-    let types = [KitTypeEnum.SALIVA, KitTypeEnum.BLOOD];
-    switch (study) {
-      case StudyEnum.PANCAN:
-        types = types.concat([KitTypeEnum.STOOL]);
-      break;
-      case StudyEnum.RGP:
-        types = [KitTypeEnum.BLOOD, KitTypeEnum.BLOOD_AND_RNA];
-        break;
-    }
-    return types;
-  }
 })

playwright-e2e/utils/test-utils.ts

@@ -5,6 +5,7 @@ import Checkbox from 'dss/component/checkbox';
 import Select from 'dss/component/select';
 import axios from 'axios';
 import { logError } from './log-utils';
+import { KitTypeEnum } from 'dsm/component/kitType/enums/kitType-enum';
 
 export interface WaitForResponse {
   uri: string;
@@ -273,6 +274,19 @@ export function studyShortName(study: StudyEnum): { shortName: string | null; re
   return { shortName, realm, collaboratorPrefix };
 }
 
+export function getExpectedKitSelection(study: StudyEnum): KitTypeEnum[] {
+    let types = [KitTypeEnum.SALIVA, KitTypeEnum.BLOOD];
+    switch (study) {
+      case StudyEnum.PANCAN:
+        types = types.concat([KitTypeEnum.STOOL]);
+      break;
+      case StudyEnum.RGP:
+        types = [KitTypeEnum.BLOOD, KitTypeEnum.BLOOD_AND_RNA];
+        break;
+    }
+    return types;
+  }
+
 export function shuffle(array: any[]): any[] {
   for (let i = array.length - 1; i > 0; i--) {
     const j = Math.floor(Math.random() * (i + 1));