From 8676e02f2f987c965340f0401d56fec276761564 Mon Sep 17 00:00:00 2001
From: roymondchen <roymondchen@tencent.com>
Date: Thu, 7 Apr 2022 15:36:12 +0800
Subject: [PATCH] =?UTF-8?q?test(editor):=20=E4=BF=AE=E6=94=B9=E6=B5=8B?=
 =?UTF-8?q?=E8=AF=95=E7=94=A8=E4=BE=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../editor/src/layouts/workspace/PageBar.vue     |  2 +-
 packages/editor/src/services/editor.ts           | 16 ++++++++--------
 .../unit/layouts/layerPanel/LayerMenu.spec.ts    |  5 +++++
 .../tests/unit/layouts/wordspace/PageBar.spec.ts | 10 +++++++++-
 4 files changed, 23 insertions(+), 10 deletions(-)

diff --git a/packages/editor/src/layouts/workspace/PageBar.vue b/packages/editor/src/layouts/workspace/PageBar.vue
index 003b5665..30cb723d 100644
--- a/packages/editor/src/layouts/workspace/PageBar.vue
+++ b/packages/editor/src/layouts/workspace/PageBar.vue
@@ -1,6 +1,6 @@
 <template>
   <div class="m-editor-page-bar" ref="pageBar">
-    <div class="m-editor-page-bar-item m-editor-page-bar-item-icon" @click="addPage">
+    <div id="m-editor-page-bar-add-icon" class="m-editor-page-bar-item m-editor-page-bar-item-icon" @click="addPage">
       <el-icon><plus></plus></el-icon>
     </div>
     <div v-if="canScroll" class="m-editor-page-bar-item m-editor-page-bar-item-icon" @click="scroll('left')">
diff --git a/packages/editor/src/services/editor.ts b/packages/editor/src/services/editor.ts
index d1296cbc..3376ee0a 100644
--- a/packages/editor/src/services/editor.ts
+++ b/packages/editor/src/services/editor.ts
@@ -236,7 +236,7 @@ class Editor extends BaseService {
 
     parentNode?.items?.push(newNode);
 
-    const stage = this.get<StageCore>('stage');
+    const stage = this.get<StageCore | null>('stage');
 
     await stage?.add({ config: cloneDeep(newNode), root: cloneDeep(this.get('root')) });
 
@@ -273,17 +273,17 @@ class Editor extends BaseService {
     if (typeof index !== 'number' || index === -1) throw new Error('找不要删除的节点');
 
     parent.items?.splice(index, 1);
-    const stage = this.get<StageCore>('stage');
+    const stage = this.get<StageCore | null>('stage');
     stage?.remove({ id: node.id, root: this.get('root') });
 
     if (node.type === NodeType.PAGE) {
       if (root.items[0]) {
         await this.select(root.items[0]);
-        stage.select(root.items[0].id);
+        stage?.select(root.items[0].id);
       }
     } else {
       await this.select(parent);
-      stage.select(parent.id);
+      stage?.select(parent.id);
     }
 
     this.addModifiedNodeId(parent.id);
@@ -339,7 +339,7 @@ class Editor extends BaseService {
 
     if (`${newConfig.id}` === `${this.get('node').id}`) {
       this.set('node', newConfig);
-      this.get<StageCore>('stage')?.update({ config: cloneDeep(newConfig), root: this.get('root') });
+      this.get<StageCore | null>('stage')?.update({ config: cloneDeep(newConfig), root: this.get('root') });
     }
 
     if (newConfig.type === NodeType.PAGE) {
@@ -371,7 +371,7 @@ class Editor extends BaseService {
     await this.update(parent);
     await this.select(node);
 
-    this.get<StageCore>('stage')?.update({ config: cloneDeep(node), root: this.get('root') });
+    this.get<StageCore | null>('stage')?.update({ config: cloneDeep(node), root: this.get('root') });
 
     this.addModifiedNodeId(parent.id);
     this.pushHistoryState();
@@ -436,7 +436,7 @@ class Editor extends BaseService {
     }
 
     await this.update(node);
-    this.get<StageCore>('stage')?.update({ config: cloneDeep(toRaw(node)), root: this.get('root') });
+    this.get<StageCore | null>('stage')?.update({ config: cloneDeep(toRaw(node)), root: this.get('root') });
     this.addModifiedNodeId(config.id);
     this.pushHistoryState();
 
@@ -461,7 +461,7 @@ class Editor extends BaseService {
       brothers.splice(index + parseInt(`${offset}`, 10), 0, brothers.splice(index, 1)[0]);
     }
 
-    this.get<StageCore>('stage')?.update({ config: cloneDeep(toRaw(parent)), root: this.get('root') });
+    this.get<StageCore | null>('stage')?.update({ config: cloneDeep(toRaw(parent)), root: this.get('root') });
   }
 
   /**
diff --git a/packages/editor/tests/unit/layouts/layerPanel/LayerMenu.spec.ts b/packages/editor/tests/unit/layouts/layerPanel/LayerMenu.spec.ts
index ae0965ca..926845c8 100644
--- a/packages/editor/tests/unit/layouts/layerPanel/LayerMenu.spec.ts
+++ b/packages/editor/tests/unit/layouts/layerPanel/LayerMenu.spec.ts
@@ -37,6 +37,10 @@ const storeState: any = {
   },
 };
 
+const componentListService = {
+  getList: jest.fn(),
+};
+
 const editorService = {
   get: jest.fn((key: string) => storeState[key]),
   add: jest.fn(),
@@ -51,6 +55,7 @@ const getWrapper = () =>
       provide: {
         services: {
           editorService,
+          componentListService,
         },
       },
     },
diff --git a/packages/editor/tests/unit/layouts/wordspace/PageBar.spec.ts b/packages/editor/tests/unit/layouts/wordspace/PageBar.spec.ts
index d02dad71..431b64d3 100644
--- a/packages/editor/tests/unit/layouts/wordspace/PageBar.spec.ts
+++ b/packages/editor/tests/unit/layouts/wordspace/PageBar.spec.ts
@@ -23,6 +23,14 @@ import { NodeType } from '@tmagic/schema';
 
 import PageBar from '@editor/layouts/workspace/PageBar.vue';
 
+globalThis.ResizeObserver =
+  globalThis.ResizeObserver ||
+  jest.fn().mockImplementation(() => ({
+    disconnect: jest.fn(),
+    observe: jest.fn(),
+    unobserve: jest.fn(),
+  }));
+
 const editorState: Record<string, any> = {
   root: {
     items: [{ key: 0, id: 1, name: 'testName', type: NodeType.PAGE }],
@@ -53,7 +61,7 @@ describe('PageBar', () => {
   it('新增page', (done) => {
     const wrapper = getWrapper();
     setTimeout(async () => {
-      await wrapper.find('i[class="el-icon m-editor-page-bar-menu-add-icon"]').trigger('click');
+      await wrapper.find('#m-editor-page-bar-add-icon').trigger('click');
 
       expect(editorService.add.mock.calls[0][0]).toEqual({
         type: NodeType.PAGE,