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

Commit 1b9f021

Browse files
committed
one more time with feeling
1 parent c0730c6 commit 1b9f021

File tree

5 files changed

+22
-11
lines changed

5 files changed

+22
-11
lines changed
Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
<unit>
2+
<test>
3+
<case>
4+
<justText>blah blah</justText>
5+
</case>
6+
<case>
7+
<attribText attrib='das'>capital
8+
</attribText>
9+
</case>
10+
</test>
11+
</unit>
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
{"unit":{"test":{"case":[{"justText":{"_t":"blah blah"}},{"attribText":{"attrib":"das","_t":"capital"}},{"spaces":{"_t":"abc\nasdf\n a"}},{"type":"SANATISE","san":{"b":"Smith & Son","_t":"Alpha & Omega"}}]}}}
1+
{"unit":{"test":{"case":[{"justText":{"_t":"blah blah"}},{"attribText":{"attrib":"das","_t":"capital"}}]}}}
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
{"unit":{"test":{"case":[{"justText":{"xx":"blah blah"}},{"attribText":{"attrib":"das","xx":"capital"}},{"spaces":{"xx":"abc\nasdf\n a"}},{"type":"SANATISE","san":{"b":"Smith & Son","xx":"Alpha & Omega"}}]}}}
1+
{"unit":{"test":{"case":[{"justText":{"xx":"blah blah"}},{"attribText":{"attrib":"das","xx":"capital"}}]}}}

test/test.js

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -174,8 +174,8 @@ describe('xml2json', function () {
174174

175175
it('A1: defaults without the option being defined', function(done) {
176176

177-
var xml = internals.readFixture('alternate-text-node.xml');
178-
var result = parser.toJson(data, {});
177+
var xml = internals.readFixture('alternate-text-node-A.xml');
178+
var result = parser.toJson(xml, {});
179179
var json = internals.readFixture('alternate-text-node-A.json');
180180

181181
expect(result).to.equal(json);
@@ -185,8 +185,8 @@ describe('xml2json', function () {
185185

186186
it('A2: defaults with option as false', function(done) {
187187

188-
var xml = internals.readFixture('alternate-text-node.xml');
189-
var result = parser.toJson(data, {alternateTextNode: false});
188+
var xml = internals.readFixture('alternate-text-node-A.xml');
189+
var result = parser.toJson(xml, {alternateTextNode: false});
190190
var json = internals.readFixture('alternate-text-node-A.json');
191191

192192
expect(result).to.equal(json);
@@ -197,8 +197,8 @@ describe('xml2json', function () {
197197

198198
it('B: uses alternate text node with option as true', function(done) {
199199

200-
var xml = internals.readFixture('alternate-text-node.xml');
201-
var result = parser.toJson(data, {alternateTextNode: true});
200+
var xml = internals.readFixture('alternate-text-node-A.xml');
201+
var result = parser.toJson(xml, {alternateTextNode: true});
202202
var json = internals.readFixture('alternate-text-node-B.json');
203203

204204
expect(result).to.equal(json);
@@ -208,14 +208,14 @@ describe('xml2json', function () {
208208

209209
it('C: overrides text node with option as "xx" string', function(done) {
210210

211-
var xml = internals.readFixture('alternate-text-node.xml');
212-
var result = parser.toJson(data, {alternateTextNode: "xx"});
211+
var xml = internals.readFixture('alternate-text-node-A.xml');
212+
var result = parser.toJson(xml, {alternateTextNode: "xx"});
213213
var json = internals.readFixture('alternate-text-node-C.json');
214214
});
215215

216216
it('D: double check sanatize and trim', function (done) {
217217

218-
var xml = internals.readFixture('alternate-text-node.xml');
218+
var xml = internals.readFixture('alternate-text-node-D.xml');
219219
var result = parser.toJson(xml, {alternateTextNode: "zz", sanitize: true, trim: true});
220220
var json = internals.readFixture('alternate-text-node-D.json');
221221

0 commit comments

Comments
 (0)