Skip to content

Commit 7eaa138

Browse files
nozernozer
committed
Fixed tests
1 parent 8123ae9 commit 7eaa138

File tree

6 files changed

+50
-46
lines changed

6 files changed

+50
-46
lines changed

‎package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "quill-delta-to-html",
3-
"version": "0.8.3",
3+
"version": "0.8.4",
44
"description": "Converts Quill's delta ops to HTML",
55
"main": "./dist/commonjs/main.js",
66
"types":"./dist/commonjs/main.d.ts",

‎test/DeltaInsertOp.test.ts‎

Lines changed: 21 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,13 @@ import * as assert from "assert";
44

55
import {InsertData, InsertDataQuill} from './../src/InsertData';
66
import {DeltaInsertOp} from './../src/DeltaInsertOp';
7+
import {DataType, AlignType, ListType} from './../src/value-types';
78

89
describe('DeltaInsertOp', function() {
910

1011
describe('constructor()', function() {
1112
it('should instantiate', function() {
12-
var embed = new InsertDataQuill("image", "https://");
13+
var embed = new InsertDataQuill(DataType.Image, "https://");
1314
var t = new DeltaInsertOp(embed);
1415
assert.equal(t instanceof DeltaInsertOp, true);
1516
assert.equal(t.insert instanceof InsertDataQuill, true);
@@ -18,7 +19,7 @@ describe('DeltaInsertOp', function() {
1819
t = new DeltaInsertOp("test");
1920
assert.deepEqual(t.insert.value, 'test');
2021

21-
t = new DeltaInsertOp(new InsertDataQuill("formula", "x=data"));
22+
t = new DeltaInsertOp(new InsertDataQuill(DataType.Formula, "x=data"));
2223
assert.equal(t.insert.value, "x=data");
2324
});
2425
});
@@ -35,12 +36,12 @@ describe('DeltaInsertOp', function() {
3536

3637
describe('hasSameAdiAs()', function() {
3738
it('should successfully if two ops have same align indent and direction', function() {
38-
var op1 = new DeltaInsertOp("\n", {align: 'right', indent: 2});
39-
var op2 = new DeltaInsertOp("\n", {align: 'right', indent: 2});
39+
var op1 = new DeltaInsertOp("\n", {align: AlignType.Right, indent: 2});
40+
var op2 = new DeltaInsertOp("\n", {align: AlignType.Right, indent: 2});
4041

4142
assert.ok(op1.hasSameAdiAs(op2));
4243

43-
var op2 = new DeltaInsertOp("\n", {align: 'right', indent: 3});
44+
var op2 = new DeltaInsertOp("\n", {align: AlignType.Right, indent: 3});
4445
assert.ok(!op1.hasSameAdiAs(op2));
4546
});
4647
});
@@ -67,7 +68,7 @@ describe('DeltaInsertOp', function() {
6768
var op = new DeltaInsertOp("\n", {});
6869
assert.equal(op.isJustNewline(), true);
6970

70-
op = new DeltaInsertOp("\n\n ", {list: "ordered"});
71+
op = new DeltaInsertOp("\n\n ", {list: ListType.Ordered});
7172
assert.equal(op.isJustNewline(), false);
7273
});
7374
});
@@ -77,74 +78,74 @@ describe('DeltaInsertOp', function() {
7778
var op = new DeltaInsertOp("\n", {});
7879
assert.equal(op.isList(), false);
7980

80-
op = new DeltaInsertOp("fds ", {list: "ordered"});
81+
op = new DeltaInsertOp("fds ", {list: ListType.Ordered});
8182
assert.equal(op.isList(), true);
8283
});
8384
});
8485

8586
describe('isBulletList()', function() {
8687
it('should return true if op is a bullet list', function() {
87-
var op = new DeltaInsertOp("\n", {list: 'bullet'});
88+
var op = new DeltaInsertOp("\n", {list: ListType.Bullet});
8889
assert.equal(op.isBulletList(), true);
8990

90-
op = new DeltaInsertOp("fds ", {list: "ordered"});
91+
op = new DeltaInsertOp("fds ", {list: ListType.Ordered});
9192
assert.equal(op.isBulletList(), false);
9293
});
9394
});
9495

9596
describe('isOrderedList()', function() {
9697
it('should return true if op is an ordered list', function() {
97-
var op = new DeltaInsertOp("\n", {list: 'bullet'});
98+
var op = new DeltaInsertOp("\n", {list: ListType.Bullet});
9899
assert.equal(op.isOrderedList(), false);
99100

100-
op = new DeltaInsertOp("fds ", {list: "ordered"});
101+
op = new DeltaInsertOp("fds ", {list: ListType.Ordered});
101102
assert.equal(op.isOrderedList(), true);
102103
});
103104
});
104105

105106
describe('isSameListAs()', function() {
106107
it('should return true if op list type same as the comparison', function() {
107-
var op = new DeltaInsertOp("\n", {list: 'bullet'});
108-
var op2 = new DeltaInsertOp("ds", {list: 'bullet'});
108+
var op = new DeltaInsertOp("\n", {list: ListType.Bullet});
109+
var op2 = new DeltaInsertOp("ds", {list: ListType.Bullet});
109110
assert.equal(op.isSameListAs(op2), true);
110111

111-
var op3 = new DeltaInsertOp("fds ", {list: "ordered"});
112+
var op3 = new DeltaInsertOp("fds ", {list: ListType.Ordered});
112113
assert.equal(op.isSameListAs(op3), false);
113114
});
114115
});
115116

116117
describe('isText()', function() {
117118
it('should correctly identify insert type', function() {
118-
var op = new DeltaInsertOp("\n", {list: 'bullet'});
119+
var op = new DeltaInsertOp("\n", {list: ListType.Bullet});
119120
assert.equal(op.isVideo(), false);
120121
assert.equal(op.isText(), true);
121122

122-
op = new DeltaInsertOp(new InsertDataQuill("image", "d"), {list: "ordered"});
123+
op = new DeltaInsertOp(new InsertDataQuill(DataType.Image, "d"), {list: ListType.Ordered});
123124
assert.equal(op.isImage(), true);
124125
assert.equal(op.isText(), false);
125126
});
126127
});
127128

128129
describe('isVideo()/isImage()/isFormula()', function() {
129130
it('should correctly identify embed type', function() {
130-
var op = new DeltaInsertOp(new InsertDataQuill("video", ""));
131+
var op = new DeltaInsertOp(new InsertDataQuill(DataType.Video, ""));
131132
assert.equal(op.isVideo(), true);
132133
assert.equal(op.isFormula(), false);
133134
assert.equal(op.isImage(), false);
134135

135-
op = new DeltaInsertOp(new InsertDataQuill("image", "d"));
136+
op = new DeltaInsertOp(new InsertDataQuill(DataType.Image, "d"));
136137
assert.equal(op.isImage(), true);
137138
assert.equal(op.isFormula(), false);
138139

139-
op = new DeltaInsertOp(new InsertDataQuill("formula", "d"));
140+
op = new DeltaInsertOp(new InsertDataQuill(DataType.Formula, "d"));
140141
assert.equal(op.isVideo(), false);
141142
assert.equal(op.isFormula(), true);
142143
});
143144
});
144145

145146
describe('isLink()', function() {
146147
it('should correctly identify if op is a link', function() {
147-
var op = new DeltaInsertOp(new InsertDataQuill("video", ""), {link: 'http://'});
148+
var op = new DeltaInsertOp(new InsertDataQuill(DataType.Video, ""), {link: 'http://'});
148149
assert.equal(op.isLink(), false);
149150

150151

‎test/InsertData.test.ts‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,16 +3,17 @@ import 'mocha';
33
import * as assert from "assert";
44

55
import { InsertData, InsertDataQuill, InsertDataCustom } from './../src/InsertData';
6+
import {DataType} from './../src/value-types';
67

78
describe('InsertData', function () {
89
describe('InsertDataQuill', function () {
910
describe('constructor()', function () {
1011
it('should instantiate', function () {
11-
var t = new InsertDataQuill("video", "https://");
12+
var t = new InsertDataQuill(DataType.Video, "https://");
1213
assert.equal(t.type === "video", true);
1314
assert.equal(t.value === "https://", true);
1415

15-
t = new InsertDataQuill("text", "hello");
16+
t = new InsertDataQuill(DataType.Text, "hello");
1617
assert.equal(t.type === "text", true);
1718
assert.equal(t.value === "hello", true);
1819
});

‎test/OpToHtmlConverter.test.ts‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -71,15 +71,15 @@ describe('OpToHtmlConverter', function () {
7171
'ql-font-roman', 'ql-size-small'];
7272
assert.deepEqual(c.getCssClasses(), classes);
7373

74-
o = new DeltaInsertOp(new InsertDataQuill("image", ""), attrs);
74+
o = new DeltaInsertOp(new InsertDataQuill(DataType.Image, ""), attrs);
7575
c = new OpToHtmlConverter(o);
7676
assert.deepEqual(c.getCssClasses(), classes.concat('ql-image'));
7777

78-
o = new DeltaInsertOp(new InsertDataQuill("video", ""), attrs);
78+
o = new DeltaInsertOp(new InsertDataQuill(DataType.Video, ""), attrs);
7979
c = new OpToHtmlConverter(o);
8080
assert.deepEqual(c.getCssClasses(), classes.concat('ql-video'));
8181

82-
o = new DeltaInsertOp(new InsertDataQuill("formula", ""), attrs);
82+
o = new DeltaInsertOp(new InsertDataQuill(DataType.Formula, ""), attrs);
8383
c = new OpToHtmlConverter(o);
8484
assert.deepEqual(c.getCssClasses(), classes.concat('ql-formula'));
8585

@@ -137,28 +137,28 @@ describe('OpToHtmlConverter', function () {
137137
var c = new OpToHtmlConverter(o);
138138
assert.deepEqual(c.getTagAttributes(), []);
139139

140-
var o = new DeltaInsertOp(new InsertDataQuill("image", "-"), { color: 'red' });
140+
var o = new DeltaInsertOp(new InsertDataQuill(DataType.Image, "-"), { color: 'red' });
141141
var c = new OpToHtmlConverter(o);
142142
assert.deepEqual(c.getTagAttributes(), [
143143
{ key: 'class', value: "ql-image" },
144144
{ key: 'src', value: "-" }
145145
]);
146146

147-
var o = new DeltaInsertOp(new InsertDataQuill("image", "-"), { width: '200' });
147+
var o = new DeltaInsertOp(new InsertDataQuill(DataType.Image, "-"), { width: '200' });
148148
var c = new OpToHtmlConverter(o);
149149
assert.deepEqual(c.getTagAttributes(), [
150150
{ key: 'class', value: "ql-image" },
151151
{ key: 'width', value: "200"},
152152
{ key: 'src', value: "-" }
153153
]);
154154

155-
var o = new DeltaInsertOp(new InsertDataQuill('formula', "-"), { color: 'red' });
155+
var o = new DeltaInsertOp(new InsertDataQuill(DataType.Formula, "-"), { color: 'red' });
156156
var c = new OpToHtmlConverter(o);
157157
assert.deepEqual(c.getTagAttributes(), [
158158
{ key: 'class', value: "ql-formula" }
159159
]);
160160

161-
var o = new DeltaInsertOp(new InsertDataQuill('video', "-"), { color: 'red' });
161+
var o = new DeltaInsertOp(new InsertDataQuill(DataType.Video, "-"), { color: 'red' });
162162
var c = new OpToHtmlConverter(o);
163163
assert.deepEqual(c.getTagAttributes(), [
164164
{ key: 'class', value: "ql-video" },
@@ -195,11 +195,11 @@ describe('OpToHtmlConverter', function () {
195195
c = new OpToHtmlConverter(o);
196196
assert.equal(c.getContent(), 'sss<&>,');
197197

198-
o = new DeltaInsertOp(new InsertDataQuill('formula', 'ff'), { bold: true });
198+
o = new DeltaInsertOp(new InsertDataQuill(DataType.Formula, 'ff'), { bold: true });
199199
c = new OpToHtmlConverter(o);
200200
assert.equal(c.getContent(), 'ff');
201201

202-
o = new DeltaInsertOp(new InsertDataQuill('video', 'ff'), { bold: true });
202+
o = new DeltaInsertOp(new InsertDataQuill(DataType.Video, 'ff'), { bold: true });
203203
c = new OpToHtmlConverter(o);
204204
assert.equal(c.getContent(), '');
205205
});
@@ -258,7 +258,7 @@ describe('OpToHtmlConverter', function () {
258258
c1 = new OpToHtmlConverter(op);
259259
assert.equal(c1.getHtml(), '\n');
260260

261-
var op = new DeltaInsertOp(new InsertDataQuill("image", "http://"));
261+
var op = new DeltaInsertOp(new InsertDataQuill(DataType.Image, "http://"));
262262
c1 = new OpToHtmlConverter(op);
263263
assert.equal(c1.getHtml(), '<img class="ql-image" src="http://"/>');
264264
});

‎test/grouper/Grouper.test.ts‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,14 +5,15 @@ import * as assert from "assert";
55
import { Grouper } from './../../src/grouper/Grouper';
66
import { DeltaInsertOp } from './../../src/DeltaInsertOp';
77
import { InsertData, InsertDataQuill } from './../../src/InsertData';
8-
import { ListGroup, ListItem, VideoItem, InlineGroup, BlockGroup, TDataGroup
8+
import { ListGroup, ListItem, VideoItem, InlineGroup, BlockGroup, TDataGroup
99
} from './../../src/grouper/group-types';
10+
import {DataType} from './../../src/value-types';
1011
describe('Grouper', function () {
1112

1213

1314
describe('#pairOpsWithTheirBlock()', function () {
1415
var ops = [
15-
new DeltaInsertOp(new InsertDataQuill("video", "http://")),
16+
new DeltaInsertOp(new InsertDataQuill(DataType.Video, "http://")),
1617
new DeltaInsertOp("hello"),
1718
new DeltaInsertOp("\n"),
1819
new DeltaInsertOp("how are you?"),

‎test/grouper/ListNester.test.ts‎

Lines changed: 12 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -8,21 +8,22 @@ import { DeltaInsertOp } from './../../src/DeltaInsertOp';
88
import { InsertData } from './../../src/InsertData';
99
import { ListGroup, ListItem, VideoItem, InlineGroup, BlockGroup, TDataGroup
1010
} from './../../src/grouper/group-types';
11+
import {ListType} from './../../src/value-types';
1112

1213
describe('ListNester', function () {
1314

1415
describe('nest()', function () {
1516
it('should not nest different types of lists', function () {
1617
var ops = [
1718
new DeltaInsertOp("ordered list 1 item 1"),
18-
new DeltaInsertOp("\n", { list: 'ordered' }),
19+
new DeltaInsertOp("\n", { list: ListType.Ordered }),
1920
new DeltaInsertOp("bullet list 1 item 1"),
20-
new DeltaInsertOp("\n", { list: 'bullet' }),
21+
new DeltaInsertOp("\n", { list: ListType.Bullet }),
2122
new DeltaInsertOp("bullet list 1 item 2"),
22-
new DeltaInsertOp("\n", { list: 'bullet' }),
23+
new DeltaInsertOp("\n", { list: ListType.Bullet }),
2324
new DeltaInsertOp("haha"),
2425
new DeltaInsertOp("\n"),
25-
new DeltaInsertOp("\n", { list: 'bullet' }),
26+
new DeltaInsertOp("\n", { list: ListType.Bullet }),
2627
];
2728

2829
var groups = Grouper.pairOpsWithTheirBlock(ops);
@@ -41,19 +42,19 @@ describe('ListNester', function () {
4142
it('should nest if lists are same and later ones have higher indent', function () {
4243
var ops = [
4344
new DeltaInsertOp("item 1"),
44-
new DeltaInsertOp("\n", { list: 'ordered' }),
45+
new DeltaInsertOp("\n", { list: ListType.Ordered }),
4546
new DeltaInsertOp("item 1a"),
46-
new DeltaInsertOp("\n", { list: 'ordered', indent: 1 }),
47+
new DeltaInsertOp("\n", { list: ListType.Ordered, indent: 1 }),
4748
new DeltaInsertOp("item 1a-i"),
48-
new DeltaInsertOp("\n", { list: 'ordered', indent: 3 }),
49+
new DeltaInsertOp("\n", { list: ListType.Ordered, indent: 3 }),
4950
new DeltaInsertOp("item 1b"),
50-
new DeltaInsertOp("\n", { list: 'ordered', indent: 1 }),
51+
new DeltaInsertOp("\n", { list: ListType.Ordered, indent: 1 }),
5152
new DeltaInsertOp("item 2", ),
52-
new DeltaInsertOp("\n", { list: 'ordered' }),
53+
new DeltaInsertOp("\n", { list: ListType.Ordered }),
5354
new DeltaInsertOp("haha"),
5455
new DeltaInsertOp("\n"),
55-
new DeltaInsertOp("\n", { list: 'ordered', indent:5 }),
56-
new DeltaInsertOp("\n", { list: 'bullet', indent:4 }),
56+
new DeltaInsertOp("\n", { list: ListType.Ordered, indent:5 }),
57+
new DeltaInsertOp("\n", { list: ListType.Bullet, indent:4 }),
5758
]
5859
var pairs = Grouper.pairOpsWithTheirBlock(ops);
5960

0 commit comments

Comments
 (0)