Skip to content
This repository was archived by the owner on May 5, 2021. It is now read-only.

Commit 148bf5b

Browse files
GorashGorash
committed
adaptation des tests
1 parent dbda3cd commit 148bf5b

File tree

6 files changed

+868
-431
lines changed

6 files changed

+868
-431
lines changed

‎packages/plugin-char/test/CharDomObjectRenderer.test.ts‎

Lines changed: 12 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,10 @@ import { Char } from '../src/Char';
44
import { CharNode } from '../src/CharNode';
55
import { Renderer } from '../../plugin-renderer/src/Renderer';
66
import { ContainerNode } from '../../core/src/VNodes/ContainerNode';
7-
import { DomObject } from '../../plugin-renderer-dom-object/src/DomObjectRenderingEngine';
7+
import {
8+
DomObject,
9+
DomObjectRenderingEngine,
10+
} from '../../plugin-renderer-dom-object/src/DomObjectRenderingEngine';
811
import { DomLayout } from '../../plugin-dom-layout/src/DomLayout';
912
import { VNode } from '../../core/src/VNodes/VNode';
1013

@@ -30,13 +33,12 @@ describe('CharDomObjectRenderer', () => {
3033
root.append(new CharNode({ char: 'b' }));
3134

3235
const renderer = editor.plugins.get(Renderer);
33-
const rendered = await renderer.render<DomObject>('dom/object', char);
36+
const engine = renderer.engines['dom/object'] as DomObjectRenderingEngine;
37+
const cache = await engine.render(root.childVNodes);
38+
const rendered = cache.renderings.get(char);
3439
expect(rendered).to.deep.equal({ text: 'a \u00A0b' });
3540

36-
const locations = renderer.engines['dom/object'].locations as Map<
37-
DomObject,
38-
VNode[]
39-
>;
41+
const locations = cache.locations as Map<DomObject, VNode[]>;
4042
expect(rendered && locations.get(rendered)).to.deep.equal(root.childVNodes);
4143
});
4244
it('should insert 2 spaces and 2 nbsp instead of 4 spaces', async () => {
@@ -50,13 +52,12 @@ describe('CharDomObjectRenderer', () => {
5052
root.append(new CharNode({ char: 'b' }));
5153

5254
const renderer = editor.plugins.get(Renderer);
53-
const rendered = await renderer.render<DomObject>('dom/object', char);
55+
const engine = renderer.engines['dom/object'] as DomObjectRenderingEngine;
56+
const cache = await engine.render(root.childVNodes);
57+
const rendered = cache.renderings.get(char);
5458
expect(rendered).to.deep.equal({ text: 'a \u00A0 \u00A0b' });
5559

56-
const locations = renderer.engines['dom/object'].locations as Map<
57-
DomObject,
58-
VNode[]
59-
>;
60+
const locations = cache.locations as Map<DomObject, VNode[]>;
6061
expect(rendered && locations.get(rendered)).to.deep.equal(root.children());
6162
});
6263
});

‎packages/plugin-devtools/test/devtools.test.ts‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -302,7 +302,7 @@ describe('Plugin: DevTools', () => {
302302
'"</devtools-td></devtools-tr>' +
303303
'<devtools-tr><devtools-td>length</devtools-td><devtools-td>3</devtools-td></devtools-tr>' +
304304
'<devtools-tr><devtools-td>atomic</devtools-td><devtools-td>false</devtools-td></devtools-tr>' +
305-
'<devtools-tr><devtools-td>modifiers</devtools-td><devtools-td>[ Attributes: {} ]</devtools-td></devtools-tr>' +
305+
'<devtools-tr><devtools-td>modifiers</devtools-td><devtools-td>[]</devtools-td></devtools-tr>' +
306306
'<devtools-tr><devtools-td>total length</devtools-td><devtools-td>3</devtools-td></devtools-tr>' +
307307
'<devtools-tr><devtools-td>text content</devtools-td><devtools-td>' +
308308
root.children()[1].textContent +
@@ -906,7 +906,7 @@ describe('Plugin: DevTools', () => {
906906
[...subpanel.querySelectorAll('devtools-td:not(.numbering)')].map(
907907
td => td.textContent,
908908
),
909-
).to.deep.equal(['insertText', 'setSelection']);
909+
).to.deep.equal(['@commit', 'insertText', '@commit', 'setSelection']);
910910
});
911911
it('should select "hide"', async () => {
912912
await openDevTools();
@@ -1092,7 +1092,7 @@ describe('Plugin: DevTools', () => {
10921092
const subpanel = wrapper
10931093
.querySelector('jw-devtools')
10941094
.querySelector('devtools-panel.active mainpane-contents');
1095-
const line = subpanel.querySelector('.selectable-line');
1095+
const line = subpanel.querySelector('.selectable-line:nth-child(2)');
10961096
await click(line);
10971097
expect(line.classList.contains('selected')).to.equal(true);
10981098

@@ -1107,7 +1107,7 @@ describe('Plugin: DevTools', () => {
11071107
const subpanel = wrapper
11081108
.querySelector('jw-devtools')
11091109
.querySelector('devtools-panel.active mainpane-contents');
1110-
const line = subpanel.querySelector('.selectable-line:nth-child(2)');
1110+
const line = subpanel.querySelector('.selectable-line:nth-child(4)');
11111111
await click(line);
11121112
expect(line.classList.contains('selected')).to.equal(true);
11131113

@@ -1141,7 +1141,7 @@ describe('Plugin: DevTools', () => {
11411141
const subpanel = wrapper
11421142
.querySelector('jw-devtools')
11431143
.querySelector('devtools-panel.active mainpane-contents');
1144-
const line = subpanel.querySelector('.selectable-line:nth-child(2)');
1144+
const line = subpanel.querySelector('.selectable-line:nth-child(3)');
11451145
await click(line);
11461146
await keydown(line, 'ArrowUp');
11471147

@@ -1169,7 +1169,7 @@ describe('Plugin: DevTools', () => {
11691169
const subpanel = wrapper
11701170
.querySelector('jw-devtools')
11711171
.querySelector('devtools-panel.active mainpane-contents');
1172-
const line = subpanel.querySelector('.selectable-line');
1172+
const line = subpanel.querySelector('.selectable-line:nth-child(3)');
11731173
await click(line);
11741174

11751175
await keydown(line, 'ArrowDown');

‎packages/plugin-dom-editable/test/DomEditable.test.ts‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -832,14 +832,14 @@ describe('DomEditable', () => {
832832
await selectAllWithKeyA(container1);
833833
await selectAllWithKeyA(container2);
834834

835-
await editor.stop();
836-
await editor2.stop();
837-
838835
const params = {
839836
context: editor.contextManager.defaultContext,
840837
};
841838
expect(execSpy.args).to.eql([['command-b', params]]);
842839
expect(execSpy2.args).to.eql([['selectAll', {}]]);
840+
841+
await editor.stop();
842+
await editor2.stop();
843843
});
844844
it('deleteContentBackward (SwiftKey) with special keymap', async () => {
845845
section.innerHTML = '<div>abcd</div>';

‎packages/plugin-dom-follow-range/test/FollowRange.test.ts‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -83,10 +83,10 @@ describe('FollowRange', async () => {
8383
});
8484
await editor.start();
8585

86-
editor.memory.create('test').switchTo('test'); // Unfreeze the memory for test.
87-
88-
await editor.plugins.get(Layout).append('aaa', 'range');
89-
await editor.plugins.get(Layout).append('bbb', 'range');
86+
await editor.execBatch(async () => {
87+
await editor.plugins.get(Layout).append('aaa', 'range');
88+
await editor.plugins.get(Layout).append('bbb', 'range');
89+
});
9090
expect(container.innerHTML.replace(/[\s\n]+/g, ' ')).to.equal(
9191
[
9292
'<jw-editor>',

0 commit comments

Comments
 (0)