Merge branch 'main' into atar-cellguide-s3

chanzuckerberg · Feb 23, 2024 · de9779b · de9779b
2 parents 04fdc26 + 56f68fa
commit de9779b
Show file tree

Hide file tree

Showing 4 changed files with 32 additions and 21 deletions.
diff --git a/.github/workflows/deploy-happy-stack.yml b/.github/workflows/deploy-happy-stack.yml
@@ -55,15 +55,15 @@ jobs:
           env-file: /home/runner/work/custom/envfile
           happy_version: "0.79.1"
   smoke-test:
-    timeout-minutes: 30
+    timeout-minutes: 25
     runs-on: ubuntu-22.04
     needs:
       - upgrade
     strategy:
       fail-fast: false
     defaults:
       run:
-        working-directory: client
+        working-directory: ./client
     steps:
       - uses: actions/checkout@v4
         with:
@@ -88,6 +88,7 @@ jobs:
         with:
           # ⚠️ Make sure to configure a `CHROMATIC_PROJECT_TOKEN` repository secret
           projectToken: ${{ secrets.CHROMATIC_PROJECT_TOKEN }}
+          workingDir: ./client
           # This is `npm run build-archive-storybook`
           buildScriptName: "build-archive-storybook"
 

diff --git a/.github/workflows/push_tests.yml b/.github/workflows/push_tests.yml
@@ -81,7 +81,7 @@ jobs:
           cd client && ./node_modules/codecov/bin/codecov --yml=../.codecov.yml --root=../ --gcov-root=../ -C -F frontend,javascript,unitTest
 
   smoke-tests:
-    runs-on: macos-latest
+    runs-on: ubuntu-22.04
     timeout-minutes: 25
     steps:
       - uses: actions/checkout@v4

diff --git a/client/__tests__/e2e/cellxgeneActions.ts b/client/__tests__/e2e/cellxgeneActions.ts
@@ -59,11 +59,19 @@ export async function scroll({
 }
 
 export async function keyboardUndo(page: Page): Promise<void> {
-  await page.keyboard.press("Meta+Z");
+  if (process.platform === "darwin") {
+    await page.keyboard.press("Meta+KeyZ");
+  } else {
+    await page.keyboard.press("Control+KeyZ");
+  }
 }
 
 export async function keyboardRedo(page: Page): Promise<void> {
-  await page.keyboard.press("Meta+Shift+Z");
+  if (process.platform === "darwin") {
+    await page.keyboard.press("Meta+Shift+KeyZ");
+  } else {
+    await page.keyboard.press("Control+Shift+KeyZ");
+  }
 }
 
 const BLUEPRINT_SKELETON_CLASS_NAME = Classes.SKELETON;

diff --git a/client/__tests__/e2e/e2e.test.ts b/client/__tests__/e2e/e2e.test.ts
@@ -154,31 +154,32 @@ describe("metadata loads", () => {
     }
   });
 
-  // TODO(seve) #753
-  test.fixme(
+  test(
     "categories and values from dataset appear and properly truncate if applicable",
     async ({ page }) => {
       await goToPage(page, pageURLTruncate);
 
-      for (const label of Object.keys(
-        dataTruncate.categorical
-      ) as (keyof typeof dataTruncate.categorical)[]) {
-        const element = await page.getByTestId(`category-${label}`).innerHTML();
+      await tryUntil(async () => {
+        for (const label of Object.keys(
+          dataTruncate.categorical
+        ) as (keyof typeof dataTruncate.categorical)[]) {
+          const element = await page.getByTestId(`category-${label}`).innerHTML();
 
-        expect(element).toMatchSnapshot();
+          expect(element).toMatchSnapshot();
 
-        await page.getByTestId(`${label}:category-expand`).click();
+          await page.getByTestId(`${label}:category-expand`).click();
 
-        const categories = await getAllCategoriesAndCounts(label, page);
+          const categories = await getAllCategoriesAndCounts(label, page);
 
-        expect(Object.keys(categories)).toMatchObject(
-          Object.keys(dataTruncate.categorical[label])
-        );
+          expect(Object.keys(categories)).toMatchObject(
+            Object.keys(dataTruncate.categorical[label])
+          );
 
-        expect(Object.values(categories)).toMatchObject(
-          Object.values(dataTruncate.categorical[label])
-        );
-      }
+          expect(Object.values(categories)).toMatchObject(
+            Object.values(dataTruncate.categorical[label])
+          );
+        }
+      }, { page });
     }
   );
 
@@ -695,6 +696,7 @@ for (const option of options) {
         );
       }, { page })
     });
+
     test("edit geneset name and undo/redo", async ({ page }) => {
       /**
        * (thuang): Test is flaky, so we need to retry until it passes