Corrected tests and scripts to remove \r\n and only use \n

intervalia · Jan 3, 2015 · af1b0dc · af1b0dc
1 parent 5ef7b3a
commit af1b0dc
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 18 deletions.
diff --git a/src/scripts.js b/src/scripts.js
@@ -11,7 +11,7 @@ function processOneScript(scriptPath, includeName, options, newPluginParams) {
 
   var contents = "/*\n * Included File: " + includeName + "\n */\n";
   contents += plugin.processFilePre(newPluginParams);
-  contents += fs.readFileSync(scriptPath, {"encoding": "utf-8"});
+  contents += fs.readFileSync(scriptPath, {"encoding": "utf-8"}).replace(/\r\n/g, "\n");
   contents += "\n";
   contents += plugin.processFilePost(newPluginParams);
 

diff --git a/test/specs/assemblies.test.js b/test/specs/assemblies.test.js
@@ -5,6 +5,10 @@ var fs = require('fs');
 var gutil = require('gulp-util');
 var should = require('should');
 
+function readDataFile(path) {
+  return fs.readFileSync(path, {"encoding": "utf-8"}).replace(/\r/g, "");
+}
+
 describe('\n    Testing the file assemblies.js', function () {
   var rootPath;
 
@@ -84,7 +88,7 @@ describe('\n    Testing the file assemblies.js', function () {
         };
         var val = assemblies.process(assembly, assemblyFileName, options);
         //fs.writeFileSync("./test/data/sub1.no-options.js", val);
-        temp = fs.readFileSync("./test/data/sub1.no-options.js", {"encoding": "utf-8"});
+        temp = readDataFile("./test/data/sub1.no-options.js");
         val.should.equal(temp);
         done();
       });
@@ -95,7 +99,7 @@ describe('\n    Testing the file assemblies.js', function () {
         };
         var val = assemblies.process(assembly, assemblyFileName, options);
         //fs.writeFileSync("./test/data/sub1.locale-fr.js", val);
-        temp = fs.readFileSync("./test/data/sub1.locale-fr.js", {"encoding": "utf-8"});
+        temp = readDataFile("./test/data/sub1.locale-fr.js");
         val.should.equal(temp);
         done();
       });
@@ -107,7 +111,7 @@ describe('\n    Testing the file assemblies.js', function () {
         };
         var val = assemblies.process(assembly, assemblyFileName, options);
         //fs.writeFileSync("./test/data/sub1.exposeLang.js", val);
-        temp = fs.readFileSync("./test/data/sub1.exposeLang.js", {"encoding": "utf-8"});
+        temp = readDataFile("./test/data/sub1.exposeLang.js");
         val.should.equal(temp);
         done();
       });
@@ -119,7 +123,7 @@ describe('\n    Testing the file assemblies.js', function () {
         };
         var val = assemblies.process(assembly, assemblyFileName, options);
         //fs.writeFileSync("./test/data/sub1.supportTransKeys.js", val);
-        temp = fs.readFileSync("./test/data/sub1.supportTransKeys.js", {"encoding": "utf-8"});
+        temp = readDataFile("./test/data/sub1.supportTransKeys.js");
         val.should.equal(temp);
         done();
       });
@@ -131,7 +135,7 @@ describe('\n    Testing the file assemblies.js', function () {
         };
         var val = assemblies.process(assembly, assemblyFileName, options);
         //fs.writeFileSync("./test/data/sub1.tagMissingStrings.js", val);
-        temp = fs.readFileSync("./test/data/sub1.tagMissingStrings.js", {"encoding": "utf-8"});
+        temp = readDataFile("./test/data/sub1.tagMissingStrings.js");
         val.should.equal(temp);
         done();
       });
@@ -151,7 +155,7 @@ describe('\n    Testing the file assemblies.js', function () {
       beforeEach(function() {
         projectPath = path.join(rootPath, "testdata/main/sub2");
         assemblyFileName = path.join(projectPath, "assembly.json");
-        temp = fs.readFileSync(assemblyFileName, {"encoding": "utf-8"});
+        temp = readDataFile(assemblyFileName);
         assembly = JSON.parse(temp);
       });
 
@@ -161,7 +165,7 @@ describe('\n    Testing the file assemblies.js', function () {
         };
         var val = assemblies.process(assembly, assemblyFileName, options);
         //fs.writeFileSync("./test/data/sub2.no-options.js", val);
-        temp = fs.readFileSync("./test/data/sub2.no-options.js", {"encoding": "utf-8"});
+        temp = readDataFile("./test/data/sub2.no-options.js");
         val.should.equal(temp);
         done();
       });
@@ -173,7 +177,7 @@ describe('\n    Testing the file assemblies.js', function () {
         };
         var val = assemblies.process(assembly, assemblyFileName, options);
         //fs.writeFileSync("./test/data/sub2.min-ws.js", val);
-        temp = fs.readFileSync("./test/data/sub2.min-ws.js", {"encoding": "utf-8"});
+        temp = readDataFile("./test/data/sub2.min-ws.js");
         val.should.equal(temp);
         done();
       });
@@ -185,7 +189,7 @@ describe('\n    Testing the file assemblies.js', function () {
         };
         var val = assemblies.process(assembly, assemblyFileName, options);
         //fs.writeFileSync("./test/data/sub2.useStrict.js", val);
-        temp = fs.readFileSync("./test/data/sub2.useStrict.js", {"encoding": "utf-8"});
+        temp = readDataFile("./test/data/sub2.useStrict.js");
         val.should.equal(temp);
         done();
       });
@@ -200,7 +204,7 @@ describe('\n    Testing the file assemblies.js', function () {
         };
         var val = assemblies.process(assembly, assemblyFileName, options);
         //fs.writeFileSync("./test/data/sub2.iifeParams.js", val);
-        temp = fs.readFileSync("./test/data/sub2.iifeParams.js", {"encoding": "utf-8"});
+        temp = readDataFile("./test/data/sub2.iifeParams.js");
         val.should.equal(temp);
         done();
       });

diff --git a/test/specs/plugin.test.js b/test/specs/plugin.test.js
@@ -6,6 +6,10 @@ var fs = require('fs');
 var gutil = require('gulp-util');
 var should = require('should');
 
+function readDataFile(path) {
+  return fs.readFileSync(path, {"encoding": "utf-8"}).replace(/\r/g, "");
+}
+
 describe('\n    Testing the file plugin.js', function () {
   var rootPath;
 
@@ -200,17 +204,11 @@ describe('\n    Testing the file plugin.js', function () {
       };
       var val = assemblies.process(assembly, assemblyFileName, options);
       //fs.writeFileSync("./test/data/sub1.with-plugins.js", val);
-      temp = fs.readFileSync("./test/data/sub1.with-plugins.js", {"encoding": "utf-8"});
+      temp = readDataFile("./test/data/sub1.with-plugins.js");
       val.should.equal(temp);
 
       done();
     });
 
   });
 });
-
-
-/*
- * processPre
- * processPost
- */