test: update fixture

SSShooter · SSShooter · commit 5548c7f36178 · 2024-02-24T15:29:42.000+08:00
diff --git a/test.html b/test.html
@@ -17,8 +17,9 @@
       border-color: #e5e7eb;
     }
 
-    #map {
-      margin-top: 50px;
+    #map,
+    #map2 {
+      margin-top: 30px;
       height: 300px;
       width: 100%;
     }
@@ -27,6 +28,7 @@
 
 <body>
   <div id="map"></div>
+  <div id="map2"></div>
   <script type="module">
     import MindElixir from '/src/index.ts'
     window.MindElixir = MindElixir
diff --git a/tests/MindElixirFixture.ts b/tests/MindElixirFixture.ts
@@ -18,24 +18,35 @@ export class MindElixirFixture {
   async goto() {
     await this.page.goto('http://localhost:23333/test.html')
   }
-  async init(data: MindElixirData) {
-    const mind = await this.page.evaluate(data => {
-      const MindElixir = window.MindElixir
-      const options: Options = {
-        el: '#map',
-        direction: MindElixir.SIDE,
-      }
-      const mind = new MindElixir(options)
-      mind.init(JSON.parse(JSON.stringify(data)))
-      window.m = mind
-      return mind
-    }, data)
-    this.m = mind
+  async init(data: MindElixirData, el = '#map') {
+    // evaluate return Serializable value
+    await this.page.evaluate(
+      ({ data, el }) => {
+        const MindElixir = window.MindElixir
+        const options: Options = {
+          el,
+          direction: MindElixir.SIDE,
+        }
+        const mind = new MindElixir(options)
+        mind.init(JSON.parse(JSON.stringify(data)))
+        window[el] = mind
+        return mind
+      },
+      { data, el }
+    )
   }
-  async getData() {
-    return await this.page.evaluate(() => {
-      return window.m.getData()
-    })
+  async getInstance(el = '#map') {
+    const instanceHandle = await this.page.evaluateHandle(el => Promise.resolve(window[el] as MindElixirInstance), el)
+    return instanceHandle
+  }
+  async getData(el = '#map') {
+    const data = await this.page.evaluate(el => {
+      return window[el].getData()
+    }, el)
+    // console.log(a)
+    // const dataHandle = await this.page.evaluateHandle(() => Promise.resolve(window.m.getData()))
+    // const data = await dataHandle.jsonValue()
+    return data
   }
   async dblclick(topic: string) {
     await this.page.getByText(topic).dblclick({
