diff --git a/.gitignore b/.gitignore index 3ef79a908..fc172b944 100644 --- a/.gitignore +++ b/.gitignore @@ -9,6 +9,7 @@ pids # Test Output Folder out/* +spec/out/* # Tmp folder tmp/* diff --git a/lib/stream/xlsx/worksheet-writer.js b/lib/stream/xlsx/worksheet-writer.js index 355edf53f..3035bf073 100644 --- a/lib/stream/xlsx/worksheet-writer.js +++ b/lib/stream/xlsx/worksheet-writer.js @@ -394,7 +394,6 @@ WorksheetWriter.prototype = { //stringBufStack.push(xml); }, _writeSheetProperties: function(xml, properties, pageSetup) { - console.log('_writeSheetProperties', properties, pageSetup) var sheetPropertiesModel = { tabColor: properties && properties.tabColor, pageSetup: pageSetup && pageSetup.fitToPage ? { @@ -402,8 +401,6 @@ WorksheetWriter.prototype = { } : undefined }; - console.log('_writeSheetProperties', sheetPropertiesModel); - xml.addText(xform.sheetProperties.toXml(sheetPropertiesModel)); }, _writeSheetFormatProperties: function(xml, properties) { @@ -414,8 +411,6 @@ WorksheetWriter.prototype = { outlineLevelRow: properties.outlineLevelRow } : undefined; - console.log('_writeSheetFormatProperties', sheetFormatPropertiesModel); - xml.addText(xform.sheetFormatProperties.toXml(sheetFormatPropertiesModel)); }, _writeOpenWorksheet: function() { @@ -489,10 +484,10 @@ WorksheetWriter.prototype = { this.stream.write(xform.dataValidations.toXml(this.dataValidations.model)); }, _writePageMargins: function() { - xml.addText(xform.pageMargins.toXml(this.pageSetup.margins)); + this.stream.write(xform.pageMargins.toXml(this.pageSetup.margins)); }, _writePageSetup: function() { - xml.addText(xform.pageMargins.toXml(this.pageSetup)); + this.stream.write(xform.pageSeteup.toXml(this.pageSetup)); }, _writeDimensions: function() { this._write(''); diff --git a/spec-out/README.md b/spec-out/README.md deleted file mode 100644 index e69de29bb..000000000 diff --git a/spec/integration/workbook-xlsx-writer.spec.js b/spec/integration/workbook-xlsx-writer.spec.js index 2e74ef899..48e9bc1a1 100644 --- a/spec/integration/workbook-xlsx-writer.spec.js +++ b/spec/integration/workbook-xlsx-writer.spec.js @@ -26,7 +26,7 @@ describe('WorkbookWriter', function() { // return fsa.unlinkAsync('./wbw.test.xlsx').catch(function(){}); }); - it.only('xlsx file', function() { + it('xlsx file', function() { var options = { filename: './wbw.test.xlsx', useStyles: true diff --git a/spec/out/README.md b/spec/out/README.md new file mode 100644 index 000000000..27e042658 --- /dev/null +++ b/spec/out/README.md @@ -0,0 +1 @@ +output folder for specs \ No newline at end of file diff --git a/spec/unit/xlsx/xform/sheet/data/sheet.2.2.xml b/spec/unit/xlsx/xform/sheet/data/sheet.2.2.xml index cadd0b09c..025cc7b01 100644 --- a/spec/unit/xlsx/xform/sheet/data/sheet.2.2.xml +++ b/spec/unit/xlsx/xform/sheet/data/sheet.2.2.xml @@ -2,7 +2,7 @@ - +