Add content-types to image elements

2 files changed, 17 insertions, 9 deletions

diff --git a/tests/document-to-html.tests.js b/tests/document-to-html.tests.js
index a01018a..864e3ee 100644
--- a/tests/document-to-html.tests.js
+++ b/tests/document-to-html.tests.js
@@ -176,11 +176,11 @@ describe('DocumentConverter', function() {
     
     test('images are written with data URIs', function() {
         var imageBuffer = new Buffer("Not an image at all!");
-        var image = new documents.Image(
-            function(encoding) {
+        var image = new documents.Image({
+            readImage: function(encoding) {
                 return q.when(imageBuffer.toString(encoding));
             }
-        );
+        });
         var converter = new DocumentConverter();
         return converter.convertToHtml(image).then(function(result) {
             assert.equal(result.value, '<img src="data:image/png;base64,' + imageBuffer.toString("base64") + '" />');
@@ -189,12 +189,12 @@ describe('DocumentConverter', function() {
     
     test('images have alt attribute if available', function() {
         var imageBuffer = new Buffer("Not an image at all!");
-        var image = new documents.Image(
-            function() {
+        var image = new documents.Image({
+            readImage: function() {
                 return q.when(imageBuffer);
             },
-            "It's a hat"
-        );
+            altText: "It's a hat"
+        });
         var converter = new DocumentConverter();
         return converter.convertToHtml(image)
             .then(function(result) {
diff --git a/tests/document-xml-reader.tests.js b/tests/document-xml-reader.tests.js
index 96b307d..75ce8d8 100644
--- a/tests/document-xml-reader.tests.js
+++ b/tests/document-xml-reader.tests.js
@@ -18,6 +18,12 @@ function readXmlElementValue(element) {
     return result.value;
 }
 
+var fakeContentTypes = {
+    findContentType: function(path) {
+        return "<content-type: " + path + ">";
+    }
+};
+
 describe("readXmlElement: ", function() {
     test("paragraph has no style if it has no properties", function() {
         var paragraphXml = new XmlElement("w:p", {}, []);
@@ -104,13 +110,13 @@ describe("readXmlElement: ", function() {
             relationshipId: "rId5",
             description: "It's a hat"
         });
-            
         
         var imageBuffer = new Buffer("Not an image at all!");
         var reader = new DocumentXmlReader(
             {
                 "rId5": {target: "media/hat.png"}
             },
+            fakeContentTypes,
             createFakeDocxFile({
                 "word/media/hat.png": imageBuffer
             })
@@ -120,9 +126,10 @@ describe("readXmlElement: ", function() {
         var element = single(result.value);
         assert.equal("image", element.type);
         assert.equal(element.altText, "It's a hat");
+        assert.equal(element.contentType, "<content-type: word/media/hat.png>");
         return element.read()
             .then(function(readValue) {
-                assert.equal(readValue, imageBuffer)
+                assert.equal(readValue, imageBuffer);
             });
     });
     
@@ -147,6 +154,7 @@ describe("readXmlElement: ", function() {
             {
                 "rId5": {target: "media/hat.png"}
             },
+            fakeContentTypes,
             createFakeDocxFile({
                 "word/media/hat.png": imageBuffer
             })