Revert "Fix/newlines in cells (#114)"

This reverts commit a8c63f4. Conflicts: test/helpers/load-fixtures.js test/index.js
zemirco · Jun 29, 2016 · 6fc4213 · 6fc4213
1 parent 27871f4
commit 6fc4213
Show file tree

Hide file tree

Showing 5 changed files with 4 additions and 32 deletions.
diff --git a/lib/json2csv.js b/lib/json2csv.js
@@ -188,10 +188,7 @@ function createColumnContent(params, str) {
           //JSON.stringify('\\') results in a string with two backslash
           //characters in it. I.e. '\\\\'.
           stringifiedElement = stringifiedElement.replace(/\\\\/g, '\\');
-
-          // preserve newlines
-          stringifiedElement = stringifiedElement.split('\\n').join('\n')
-
+
           if (params.excelStrings && typeof val === 'string') {
             stringifiedElement = '"="' + stringifiedElement + '""';
           }

diff --git a/test/fixtures/csv/newLineCellContent.csv b/test/fixtures/csv/newLineCellContent.csv
diff --git a/test/fixtures/json/newlines.json b/test/fixtures/json/newlines.json
diff --git a/test/helpers/load-fixtures.js b/test/helpers/load-fixtures.js
@@ -23,7 +23,6 @@ var fixtures = [
   'fancyfields',
   'trailingBackslash',
   'excelStrings',
-  'newLineCellContent',
   'overriddenDefaultValue',
   'emptyRow',
   'emptyRowNotIncluded',

diff --git a/test/index.js b/test/index.js
@@ -11,7 +11,6 @@ var jsonNested = require('./fixtures/json/nested');
 var jsonDefaultValue = require('./fixtures/json/defaultValue');
 var jsonDefaultValueEmpty = require('./fixtures/json/defaultValueEmpty');
 var jsonTrailingBackslash = require('./fixtures/json/trailingBackslash');
-var jsonNewlines = require('./fixtures/json/newlines');
 var jsonOverriddenDefaultValue = require('./fixtures/json/overridenDefaultValue');
 var jsonEmptyRow = require('./fixtures/json/emptyRow');
 var csvFixtures = {};
@@ -54,7 +53,7 @@ async.parallel(loadFixtures(csvFixtures), function (err) {
       t.end();
     });
   });
-
+  
 
   test('should parse json to csv without fields', function (t) {
     json2csv({
@@ -365,7 +364,7 @@ async.parallel(loadFixtures(csvFixtures), function (err) {
       t.end();
     });
   });
-
+  
   test('should escape " when preceeded by \\', function (t){
     json2csv({
       data: [{field: '\\"'}]
@@ -375,7 +374,7 @@ async.parallel(loadFixtures(csvFixtures), function (err) {
       t.end();
     });
   });
-
+  
   test('should format strings to force excel to view the values as strings', function (t) {
     json2csv({
       data: jsonDefault,
@@ -388,16 +387,6 @@ async.parallel(loadFixtures(csvFixtures), function (err) {
     });
   });
 
-  test('should preserve newlines within cell content', function (t) {
-    json2csv({
-      data: jsonNewlines
-    }, function (error, csv) {
-      t.error(error);
-      t.equal(csv, csvFixtures.newLineCellContent);
-      t.end();
-    });
-  });
-
   test('should override defaultValue with field.defaultValue', function (t) {
     json2csv({
       data: jsonOverriddenDefaultValue,