fixed 10 tests

tests/y-array.tests.js

@@ -120,44 +120,27 @@ export const testInsertThenMergeDeleteOnSync = tc => {
   compare(users)
 }
 
-/**
- * @param {Object<string,any>} is
- * @param {Object<string,any>} should
- */
-const compareEvent = (is, should) => {
-  for (var key in should) {
-    t.assert(
-      should[key] === is[key] ||
-      JSON.stringify(should[key]) === JSON.stringify(is[key])
-      , 'event works as expected'
-    )
-  }
-}
-
 /**
  * @param {t.TestCase} tc
  */
 export const testInsertAndDeleteEvents = tc => {
   const { array0, users } = init(tc, { users: 2 })
   /**
-   * @type {Object<string,any>}
+   * @type {Object<string,any>?}
    */
-  let event = {}
+  let event = null
   array0.observe(e => {
     event = e
   })
   array0.insert(0, [0, 1, 2])
-  compareEvent(event, {
-    remote: false
-  })
+  t.assert(event !== null)
+  event = null
   array0.delete(0)
-  compareEvent(event, {
-    remote: false
-  })
+  t.assert(event !== null)
+  event = null
   array0.delete(0, 2)
-  compareEvent(event, {
-    remote: false
-  })
+  t.assert(event !== null)
+  event = null
   compare(users)
 }
 
@@ -167,20 +150,18 @@ export const testInsertAndDeleteEvents = tc => {
 export const testInsertAndDeleteEventsForTypes = tc => {
   const { array0, users } = init(tc, { users: 2 })
   /**
-   * @type {Object<string,any>}
+   * @type {Object<string,any>|null}
    */
-  let event = {}
+  let event = null
   array0.observe(e => {
     event = e
   })
   array0.insert(0, [new Y.Array()])
-  compareEvent(event, {
-    remote: false
-  })
+  t.assert(event !== null)
+  event = null
   array0.delete(0)
-  compareEvent(event, {
-    remote: false
-  })
+  t.assert(event !== null)
+  event = null
   compare(users)
 }
 
@@ -197,14 +178,8 @@ export const testInsertAndDeleteEventsForTypes2 = tc => {
     events.push(e)
   })
   array0.insert(0, ['hi', new Y.Map()])
-  compareEvent(events[0], {
-    remote: false
-  })
   t.assert(events.length === 1, 'Event is triggered exactly once for insertion of two elements')
   array0.delete(1)
-  compareEvent(events[1], {
-    remote: false
-  })
   t.assert(events.length === 2, 'Event is triggered exactly once for deletion')
   compare(users)
 }
@@ -254,9 +229,6 @@ export const testEventTargetIsSetCorrectlyOnRemote = tc => {
   })
   array1.insert(0, ['stuff'])
   testConnector.flushAllMessages()
-  compareEvent(event, {
-    remote: true
-  })
   t.assert(event.target === array0, '"target" property is set correctly')
   compare(users)
 }

tests/y-map.tests.js

@@ -1,5 +1,9 @@
 import { init, compare, applyRandomTests, TestYInstance } from './testHelper.js' // eslint-disable-line
 
+import {
+  compareIDs
+} from '../src/internals.js'
+
 import * as Y from '../src/index.js'
 import * as t from 'lib0/testing.js'
 import * as prng from 'lib0/prng.js'
@@ -190,7 +194,7 @@ export const testObserveDeepProperties = tc => {
       t.assert(event.path.length === 1)
       t.assert(event.path[0] === 'map')
       // @ts-ignore
-      dmapid = event.target.get('deepmap')._id
+      dmapid = event.target.get('deepmap')._item.id
     })
   })
   testConnector.flushAllMessages()
@@ -204,9 +208,10 @@ export const testObserveDeepProperties = tc => {
   const dmap2 = _map2.get('deepmap')
   const dmap3 = _map3.get('deepmap')
   t.assert(calls > 0)
-  t.assert(dmap1._id.equals(dmap2._id))
-  t.assert(dmap1._id.equals(dmap3._id))
-  t.assert(dmap1._id.equals(dmapid))
+  t.assert(compareIDs(dmap1._item.id, dmap2._item.id))
+  t.assert(compareIDs(dmap1._item.id, dmap3._item.id))
+  // @ts-ignore we want the possibility of dmapid being undefined
+  t.assert(compareIDs(dmap1._item.id, dmapid))
   compare(users)
 }