smartyellow/docx-js
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

removed empty Attributes from ParagraphProperties

Browse Source 
I checked the spec, and "w:pPr" does not take any attributes. I also
converted the paragraph tests to use the deep.equal style to get rid
of some more jsonify!
This commit is contained in:
felipe
2017-03-10 10:32:40 +01:00
parent 958b5ea307
commit 7ff838357a
3 changed files with 103 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
ts/docx/paragraph/properties.ts
View File

@ -4,7 +4,6 @@ export class ParagraphProperties extends XmlComponent {
constructor() {
super("w:pPr");
this.root.push(new Attributes());
}
public push(item: XmlComponent): void {

121
ts/tests/docx/paragraph/paragraphTests.ts
View File

@ -35,80 +35,135 @@ describe("Paragraph", () => {
describe("#heading1()", () => {
it("should add heading style to JSON", () => {
paragraph.heading1();
const newJson = Utility.jsonify(paragraph);
assert.equal(newJson.root[0].root[1].root[0].root.val, "Heading1");
const tree = new Formatter().format(paragraph);
expect(tree).to.deep.equal({
"w:p": [
{
"w:pPr": [{"w:pStyle": [{_attr: {"w:val": "Heading1"}}]}],
},
],
});
});
});
describe("#heading2()", () => {
it("should add heading style to JSON", () => {
paragraph.heading2();
const newJson = Utility.jsonify(paragraph);
assert.equal(newJson.root[0].root[1].root[0].root.val, "Heading2");
const tree = new Formatter().format(paragraph);
expect(tree).to.deep.equal({
"w:p": [
{
"w:pPr": [{"w:pStyle": [{_attr: {"w:val": "Heading2"}}]}],
},
],
});
});
});
describe("#heading3()", () => {
it("should add heading style to JSON", () => {
paragraph.heading3();
const newJson = Utility.jsonify(paragraph);
assert.equal(newJson.root[0].root[1].root[0].root.val, "Heading3");
const tree = new Formatter().format(paragraph);
expect(tree).to.deep.equal({
"w:p": [
{
"w:pPr": [{"w:pStyle": [{_attr: {"w:val": "Heading3"}}]}],
},
],
});
});
});
describe("#title()", () => {
it("should add title style to JSON", () => {
paragraph.title();
const newJson = Utility.jsonify(paragraph);
assert.equal(newJson.root[0].root[1].root[0].root.val, "Title");
const tree = new Formatter().format(paragraph);
expect(tree).to.deep.equal({
"w:p": [
{
"w:pPr": [{"w:pStyle": [{_attr: {"w:val": "Title"}}]}],
},
],
});
});
});
describe("#center()", () => {
it("should add center alignment to JSON", () => {
paragraph.center();
const newJson = Utility.jsonify(paragraph);
assert.equal(newJson.root[0].root[1].root[0].root.val, "center");
const tree = new Formatter().format(paragraph);
expect(tree).to.deep.equal({
"w:p": [
{
"w:pPr": [{"w:jc": [{_attr: {"w:val": "center"}}]}],
},
],
});
});
});
describe("#thematicBreak()", () => {
it("should add thematic break to JSON", () => {
paragraph.thematicBreak();
const newJson = Utility.jsonify(paragraph);
assert.equal(newJson.root[0].root[1].rootKey, "w:pBdr");
const tree = new Formatter().format(paragraph);
expect(tree).to.deep.equal({
"w:p": [{
"w:pPr": [{
"w:pBdr": [{
"w:bottom": [{
_attr: {
"w:val": "single",
"w:color": "auto",
"w:space": "1",
"w:sz": "6",
},
}],
}],
}],
}],
});
});
});
describe("#pageBreak()", () => {
it("should add page break to JSON", () => {
paragraph.pageBreak();
const newJson = Utility.jsonify(paragraph);
assert.equal(newJson.root[0].root[1].root[1].rootKey, "w:br");
const tree = new Formatter().format(paragraph);
expect(tree).to.deep.equal({
"w:p": [{
"w:pPr": [{
"w:r": [
{"w:rPr": []},
{"w:br": [{_attr: {"w:type": "page"}}]},
],
}],
}],
});
it("should add page break with 'page' type", () => {
paragraph.pageBreak();
const newJson = Utility.jsonify(paragraph);
assert.equal(newJson.root[0].root[1].root[1].root[0].root.type, "page");
});
});
describe("#bullet()", () => {
it("should add list paragraph style to JSON", () => {
paragraph.bullet();
const newJson = Utility.jsonify(paragraph);
assert.equal(newJson.root[0].root[1].root[0].root.val, "ListParagraph");
const tree = new Formatter().format(paragraph);
expect(tree).to.have.property("w:p").which.is.an("array").which.has.length.at.least(1);
expect(tree["w:p"][0]).to.have.property("w:pPr").which.is.an("array").which.has.length.at.least(1);
expect(tree["w:p"][0]["w:pPr"][0]).to.deep.equal({
"w:pStyle": [{_attr: {"w:val": "ListParagraph"}}],
});
});
it("it should add numbered properties", () => {
paragraph.bullet();
const newJson = Utility.jsonify(paragraph);
assert.isDefined(newJson.root[0].root[2]);
const tree = new Formatter().format(paragraph);
expect(tree).to.have.property("w:p").which.is.an("array").which.has.length.at.least(1);
expect(tree["w:p"][0]).to.have.property("w:pPr").which.is.an("array").which.has.length.at.least(2);
expect(tree["w:p"][0]["w:pPr"][1]).to.deep.equal({
"w:numPr": [
{"w:ilvl": [{_attr: {"w:val": 0}}]},
{"w:numId": [{_attr: {"w:val": 1}}]},
],
});
});
});
@ -120,8 +175,12 @@ describe("Paragraph", () => {
const letterNumbering = numbering.createConcreteNumbering(numberedAbstract);
paragraph.setNumbering(letterNumbering, 0);
const newJson = Utility.jsonify(paragraph);
assert.equal(newJson.root[0].root[1].root[0].root.val, "ListParagraph");
const tree = new Formatter().format(paragraph);
expect(tree).to.have.property("w:p").which.is.an("array").which.has.length.at.least(1);
expect(tree["w:p"][0]).to.have.property("w:pPr").which.is.an("array").which.has.length.at.least(1);
expect(tree["w:p"][0]["w:pPr"][0]).to.deep.equal({
"w:pStyle": [{_attr: {"w:val": "ListParagraph"}}],
});
});
it("it should add numbered properties", () => {
@ -136,7 +195,6 @@ describe("Paragraph", () => {
"w:p": [
{
"w:pPr": [
{_attr: {}},
{"w:pStyle": [{_attr: {"w:val": "ListParagraph"}}]},
{
"w:numPr": [
@ -159,7 +217,6 @@ describe("Paragraph", () => {
"w:p": [
{
"w:pPr": [
{_attr: {}},
{"w:pStyle": [{_attr: {"w:val": "myFancyStyle"}}]},
],
},
@ -176,7 +233,6 @@ describe("Paragraph", () => {
"w:p": [
{
"w:pPr": [
{_attr: {}},
{"w:ind": [{_attr: {"w:left": 720}}]},
],
},
@ -193,7 +249,6 @@ describe("Paragraph", () => {
"w:p": [
{
"w:pPr": [
{_attr: {}},
{"w:spacing": [{_attr: {"w:before": 90, "w:line": 50}}]},
],
},

30
ts/tests/stylesTest.ts
View File

@ -25,7 +25,7 @@ describe("Styles", () => {
expect(tree).to.deep.equal([{
"w:style": [
{_attr: {"w:type": "paragraph", "w:styleId": "pStyleId"}},
{"w:pPr": [{_attr: {}}]},
{"w:pPr": []},
{"w:rPr": []},
],
}]);
@ -38,7 +38,7 @@ describe("Styles", () => {
"w:style": [
{_attr: {"w:type": "paragraph", "w:styleId": "pStyleId"}},
{"w:name": [{_attr: {"w:val": "Paragraph Style"}}]},
{"w:pPr": [{_attr: {}}]},
{"w:pPr": []},
{"w:rPr": []},
],
}]);
@ -118,7 +118,7 @@ describe("ParagraphStyle", () => {
expect(tree).to.deep.equal({
"w:style": [
{_attr: {"w:type": "paragraph", "w:styleId": "myStyleId"}},
{"w:pPr": [{_attr: {}}]},
{"w:pPr": []},
{"w:rPr": []},
],
});
@ -131,7 +131,7 @@ describe("ParagraphStyle", () => {
"w:style": [
{_attr: {"w:type": "paragraph", "w:styleId": "myStyleId"}},
{"w:name": [{_attr: {"w:val": "Style Name"}}]},
{"w:pPr": [{_attr: {}}]},
{"w:pPr": []},
{"w:rPr": []},
],
});
@ -146,7 +146,7 @@ describe("ParagraphStyle", () => {
expect(tree).to.deep.equal({
"w:style": [
{_attr: {"w:type": "paragraph", "w:styleId": "myStyleId"}},
{"w:pPr": [{_attr: {}}]},
{"w:pPr": []},
{"w:rPr": []},
{"w:basedOn": [{_attr: {"w:val": "otherId"}}]},
],
@ -160,7 +160,7 @@ describe("ParagraphStyle", () => {
expect(tree).to.deep.equal({
"w:style": [
{_attr: {"w:type": "paragraph", "w:styleId": "myStyleId"}},
{"w:pPr": [{_attr: {}}]},
{"w:pPr": []},
{"w:rPr": []},
{"w:qFormat": []},
],
@ -174,7 +174,7 @@ describe("ParagraphStyle", () => {
expect(tree).to.deep.equal({
"w:style": [
{_attr: {"w:type": "paragraph", "w:styleId": "myStyleId"}},
{"w:pPr": [{_attr: {}}]},
{"w:pPr": []},
{"w:rPr": []},
{"w:next": [{_attr: {"w:val": "otherId"}}]},
],
@ -191,7 +191,6 @@ describe("ParagraphStyle", () => {
"w:style": [
{_attr: {"w:type": "paragraph", "w:styleId": "myStyleId"}},
{"w:pPr": [
{_attr: {}},
{"w:ind": [{_attr: {"w:left": 720}}]},
]},
{"w:rPr": []},
@ -207,7 +206,6 @@ describe("ParagraphStyle", () => {
"w:style": [
{_attr: {"w:type": "paragraph", "w:styleId": "myStyleId"}},
{"w:pPr": [
{_attr: {}},
{"w:spacing": [{_attr: {"w:before": 50, "w:after": 150}}]},
]},
{"w:rPr": []},
@ -224,7 +222,7 @@ describe("ParagraphStyle", () => {
expect(tree).to.deep.equal({
"w:style": [
{_attr: {"w:type": "paragraph", "w:styleId": "myStyleId"}},
{"w:pPr": [{_attr: {}}]},
{"w:pPr": []},
{"w:rPr": [
{"w:sz": [{_attr: {"w:val": 24}}]},
]},
@ -239,7 +237,7 @@ describe("ParagraphStyle", () => {
expect(tree).to.deep.equal({
"w:style": [
{_attr: {"w:type": "paragraph", "w:styleId": "myStyleId"}},
{"w:pPr": [{_attr: {}}]},
{"w:pPr": []},
{"w:rPr": [
{"w:b": [{_attr: {"w:val": true}}]},
]},
@ -254,7 +252,7 @@ describe("ParagraphStyle", () => {
expect(tree).to.deep.equal({
"w:style": [
{_attr: {"w:type": "paragraph", "w:styleId": "myStyleId"}},
{"w:pPr": [{_attr: {}}]},
{"w:pPr": []},
{"w:rPr": [
{"w:i": [{_attr: {"w:val": true}}]},
]},
@ -270,7 +268,7 @@ describe("ParagraphStyle", () => {
expect(tree).to.deep.equal({
"w:style": [
{_attr: {"w:type": "paragraph", "w:styleId": "myStyleId"}},
{"w:pPr": [{_attr: {}}]},
{"w:pPr": []},
{"w:rPr": [
{"w:u": [{_attr: {"w:val": "single"}}]},
]},
@ -285,7 +283,7 @@ describe("ParagraphStyle", () => {
expect(tree).to.deep.equal({
"w:style": [
{_attr: {"w:type": "paragraph", "w:styleId": "myStyleId"}},
{"w:pPr": [{_attr: {}}]},
{"w:pPr": []},
{"w:rPr": [
{"w:u": [{_attr: {"w:val": "double"}}]},
]},
@ -300,7 +298,7 @@ describe("ParagraphStyle", () => {
expect(tree).to.deep.equal({
"w:style": [
{_attr: {"w:type": "paragraph", "w:styleId": "myStyleId"}},
{"w:pPr": [{_attr: {}}]},
{"w:pPr": []},
{"w:rPr": [
{"w:u": [{_attr: {"w:val": "double", "w:color": "005599"}}]},
]},
@ -316,7 +314,7 @@ describe("ParagraphStyle", () => {
expect(tree).to.deep.equal({
"w:style": [
{_attr: {"w:type": "paragraph", "w:styleId": "myStyleId"}},
{"w:pPr": [{_attr: {}}]},
{"w:pPr": []},
{"w:rPr": [
{"w:color": [{_attr: {"w:val": "123456"}}]},
]},