Merge remote-tracking branch 'origin/host/firefox-fixes' into firefox…

…-ci-and-fixes
cardstack · Jul 12, 2024 · dd54824 · dd54824
2 parents aeeead9 + 831fedc
commit dd54824
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/packages/host/tests/acceptance/code-submode/editor-test.ts b/packages/host/tests/acceptance/code-submode/editor-test.ts
@@ -28,7 +28,6 @@ import {
   setupAcceptanceTestRealm,
   visitOperatorMode,
   waitForCodeEditor,
-  waitForSyntaxHighlighting,
   type TestContextWithSSE,
   type TestContextWithSave,
 } from '../../helpers';
@@ -325,7 +324,7 @@ module('Acceptance | code submode | editor tests', function (hooks) {
     // TODO we often timeout waiting for syntax highlighting, so i'm commenting
     // out this assertion and creating a ticket to research this: CS-6770
 
-    await waitForSyntaxHighlighting('"Pet"', 'rgb(4, 81, 165)');
+    // await waitForSyntaxHighlighting('"Pet"', 'rgb(4, 81, 165)');
     // await percySnapshot(assert);
   });
 

diff --git a/packages/host/tests/helpers/index.gts b/packages/host/tests/helpers/index.gts
@@ -136,8 +136,9 @@ export async function waitForSyntaxHighlighting(
 
   await waitUntil(
     () =>
-      finalHighlightedToken?.computedStyleMap()?.get('color')?.toString() ===
-      color,
+      window
+        .getComputedStyle(finalHighlightedToken)
+        .getPropertyValue('color') === color,
     {
       timeout: 2000,
       timeoutMessage: 'timed out waiting for syntax highlighting',