From 850ce4f0aae48d7c47db2a2e578cfeae11345192 Mon Sep 17 00:00:00 2001
From: mathuo <{ID}+{username}@users.noreply.github.com>
Date: Mon, 7 Jun 2021 18:32:41 +0100
Subject: [PATCH] fix: tests

---
 .../src/__tests__/groupview/groupview.spec.ts      | 14 +++++++++++---
 .../src/__tests__/groupview/panel/content.spec.ts  |  2 +-
 .../dockview/src/dockview/dockviewGroupPanel.ts    |  8 +++++---
 3 files changed, 17 insertions(+), 7 deletions(-)

diff --git a/packages/dockview/src/__tests__/groupview/groupview.spec.ts b/packages/dockview/src/__tests__/groupview/groupview.spec.ts
index 9bb98c1a7..bfe6f6f95 100644
--- a/packages/dockview/src/__tests__/groupview/groupview.spec.ts
+++ b/packages/dockview/src/__tests__/groupview/groupview.spec.ts
@@ -16,12 +16,12 @@ import { fireEvent } from '@testing-library/dom';
 import { LocalSelectionTransfer } from '../../dnd/dataTransfer';
 import { Position } from '../../dnd/droptarget';
 import { GroupviewPanel } from '../../groupview/groupviewPanel';
+import { GroupOptions, GroupDropEvent } from '../../groupview/groupview';
+import { DockviewPanelApi } from '../../api/groupPanelApi';
 import {
     DefaultGroupPanelView,
     IGroupPanelView,
-} from '../../react/dockview/v2/defaultGroupPanelView';
-import { GroupOptions, GroupDropEvent } from '../../groupview/groupview';
-import { DockviewPanelApi } from '../../api/groupPanelApi';
+} from '../../dockview/defaultGroupPanelView';
 
 class Watermark implements IWatermarkRenderer {
     public readonly element = document.createElement('div');
@@ -137,6 +137,14 @@ class TestPanel implements IGroupPanel {
     private _onDidChangeState = new Emitter<void>();
     readonly onDidStateChange = this._onDidChangeState.event;
 
+    get title() {
+        return '';
+    }
+
+    get suppressClosable() {
+        return false;
+    }
+
     get group() {
         return this._group;
     }
diff --git a/packages/dockview/src/__tests__/groupview/panel/content.spec.ts b/packages/dockview/src/__tests__/groupview/panel/content.spec.ts
index 3605138c3..462385cad 100644
--- a/packages/dockview/src/__tests__/groupview/panel/content.spec.ts
+++ b/packages/dockview/src/__tests__/groupview/panel/content.spec.ts
@@ -9,7 +9,7 @@ import {
 import { GroupviewPanel } from '../../../groupview/groupviewPanel';
 import { CompositeDisposable } from '../../../lifecycle';
 import { PanelUpdateEvent } from '../../../panel/types';
-import { IGroupPanelView } from '../../../react/dockview/v2/defaultGroupPanelView';
+import { IGroupPanelView } from '../../../dockview/defaultGroupPanelView';
 
 class TestContentRenderer
     extends CompositeDisposable
diff --git a/packages/dockview/src/dockview/dockviewGroupPanel.ts b/packages/dockview/src/dockview/dockviewGroupPanel.ts
index bd5858dd7..8575941ec 100644
--- a/packages/dockview/src/dockview/dockviewGroupPanel.ts
+++ b/packages/dockview/src/dockview/dockviewGroupPanel.ts
@@ -104,17 +104,19 @@ export class DockviewGroupPanel
     public toJSON(): GroupviewPanelState {
         const state = this.api.getState();
 
-        return {
+        const objectState: GroupviewPanelState = {
             id: this.id,
             view: this.view!.toJSON(),
             params:
                 Object.keys(this._params || {}).length > 0
                     ? this._params
                     : undefined,
-            title: this._params?.title as string,
-            suppressClosable: this._params?.suppressClosable,
             state: state && Object.keys(state).length > 0 ? state : undefined,
+            suppressClosable: this.suppressClosable || undefined,
+            title: this.title,
         };
+
+        return objectState;
     }
 
     public update(event: GroupPanelUpdateEvent): void {