From aeb60aaf362200477e36c3c5ae17f8c063a21568 Mon Sep 17 00:00:00 2001 From: Michael Williamson Date: Tue, 26 Nov 2013 13:51:46 +0000 Subject: Add test for reading hyperlinks --- lib/web.js | 3 ++- tests/document-xml-reader.tests.js | 16 ++++++++++++++-- 2 files changed, 16 insertions(+), 3 deletions(-) diff --git a/lib/web.js b/lib/web.js index c777360..38e0cd9 100644 --- a/lib/web.js +++ b/lib/web.js @@ -71,7 +71,8 @@ function handleConvert(request, response, next) { }) .fin(function() { return q.nfcall(fs.unlink, documentPath); - }); + }) + .done(); } function renderTemplate(request, response, next) { diff --git a/tests/document-xml-reader.tests.js b/tests/document-xml-reader.tests.js index f2872a3..01ecac4 100644 --- a/tests/document-xml-reader.tests.js +++ b/tests/document-xml-reader.tests.js @@ -9,8 +9,9 @@ var testing = require("./testing"); var test = testing.test; var createFakeDocxFile = testing.createFakeDocxFile; -function readXmlElement(element) { - return new DocumentXmlReader({}).readXmlElement(element); +function readXmlElement(element, options) { + options = options || {} + return new DocumentXmlReader(options.relationships || {}).readXmlElement(element); } function readXmlElementValue(element) { @@ -221,6 +222,17 @@ describe("readXmlElement: ", function() { var result = readXmlElement(insXml); assert.deepEqual(result.value[0].type, "run"); }); + + test("w:hyperlink is read as document hyperlink if it has a relationship ID", function() { + var runXml = new XmlElement("w:r", {}, []); + var hyperlinkXml = new XmlElement("w:hyperlink", {"r:id": "r42"}, [runXml]); + var relationships = { + "r42": {target: "http://example.com"} + }; + var result = readXmlElement(hyperlinkXml, {relationships: relationships}); + assert.deepEqual(result.value.href, "http://example.com"); + assert.deepEqual(result.value.children[0].type, "run"); + }); }); function runWithProperties(children) { -- cgit v1.2.3