From 079e68393a9656a620da720582060d53454bed40 Mon Sep 17 00:00:00 2001
From: "Joshua A. Horton" <joshua_horton@sil.org>
Date: Wed, 8 May 2024 08:50:18 +0700
Subject: [PATCH 1/2] fix(common): Chai 5.0 update strictness broke some
 common/web/types tests

---
 .../test-ldml-keyboard-xml-reader.ts          | 32 ++++++++++++++++---
 1 file changed, 28 insertions(+), 4 deletions(-)

diff --git a/common/web/types/test/ldml-keyboard/test-ldml-keyboard-xml-reader.ts b/common/web/types/test/ldml-keyboard/test-ldml-keyboard-xml-reader.ts
index c54c31ed49..fa99be5267 100644
--- a/common/web/types/test/ldml-keyboard/test-ldml-keyboard-xml-reader.ts
+++ b/common/web/types/test/ldml-keyboard/test-ldml-keyboard-xml-reader.ts
@@ -36,7 +36,13 @@ describe('ldml keyboard xml reader tests', function () {
       callback: (data, source, subpath, callbacks) => {
         assert.ok(source?.keyboard3?.keys);
         const k = pluckKeysFromKeybag(source?.keyboard3?.keys.key, ['a', 'b', 'c']);
-        assert.sameDeepOrderedMembers(k, [
+        assert.sameDeepOrderedMembers(k.map((entry) => {
+          // Drop the Symbol members from the returned keys; assertions may expect their presence.
+          return {
+            id: entry.id,
+            output: entry.output
+          };
+        }), [
           {id: 'a', output: 'a'},
           {id: 'b', output: 'b'},
           {id: 'c', output: 'c'},
@@ -51,7 +57,13 @@ describe('ldml keyboard xml reader tests', function () {
       callback: (data, source, subpath, callbacks) => {
         assert.ok(source?.keyboard3?.keys);
         const k = pluckKeysFromKeybag(source?.keyboard3?.keys.key, ['a', 'b', 'c']);
-        assert.sameDeepOrderedMembers(k, [
+        assert.sameDeepOrderedMembers(k.map((entry) => {
+          // Drop the Symbol members from the returned keys; assertions may expect their presence.
+          return {
+            id: entry.id,
+            output: entry.output
+          };
+        }), [
           {id: 'a', output: 'a'},
           {id: 'b', output: 'b'},
           {id: 'c', output: 'c'},
@@ -63,7 +75,13 @@ describe('ldml keyboard xml reader tests', function () {
       callback: (data, source, subpath, callbacks) => {
         assert.ok(source?.keyboard3?.keys);
         const k = pluckKeysFromKeybag(source?.keyboard3?.keys.key, ['a', 'b', 'c']);
-        assert.sameDeepOrderedMembers(k, [
+        assert.sameDeepOrderedMembers(k.map((entry) => {
+          // Drop the Symbol members from the returned keys; assertions may expect their presence.
+          return {
+            id: entry.id,
+            output: entry.output
+          };
+        }), [
           {id: 'a', output: 'a'},
           {id: 'b', output: 'b'},
           {id: 'c', output: 'c'},
@@ -76,7 +94,13 @@ describe('ldml keyboard xml reader tests', function () {
       callback: (data, source, subpath, callbacks) => {
         assert.ok(source?.keyboard3?.keys);
         const k = pluckKeysFromKeybag(source?.keyboard3?.keys.key, ['a', 'b', 'c', 'zz', 'hash', 'hyphen']);
-        assert.sameDeepOrderedMembers(k, [
+        assert.sameDeepOrderedMembers(k.map((entry) => {
+          // Drop the Symbol members from the returned keys; assertions may expect their presence.
+          return {
+            id: entry.id,
+            output: entry.output
+          };
+        }), [
           { id: 'a',      output: 'a' },       // implied
           { id: 'b',      output: 'b' },
           { id: 'c',      output: 'c' },

From 5c430425895d7df31ba3e17fa414d17c756d5280 Mon Sep 17 00:00:00 2001
From: "Joshua A. Horton" <joshua_horton@sil.org>
Date: Wed, 8 May 2024 16:08:11 +0700
Subject: [PATCH 2/2] chore(web): update Safari BrowserStack target as stopgap
 measure

---
 common/test/resources/karma-browserstack-config.cjs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/common/test/resources/karma-browserstack-config.cjs b/common/test/resources/karma-browserstack-config.cjs
index fd61c40e28..df0cfdf071 100644
--- a/common/test/resources/karma-browserstack-config.cjs
+++ b/common/test/resources/karma-browserstack-config.cjs
@@ -4,9 +4,9 @@
 var PRIMARY_LAUNCHERS = {
   bs_safari_mac_m: {
     browser: 'safari',
-    browser_version: '15.3',
+    browser_version: '17.3',
     os: 'OS X',
-    os_version: 'Monterey'
+    os_version: 'Sonoma'
   },
   bs_chrome_win: {
     os: 'Windows',