Fix tests on Windows.

gruntjs · Mar 18, 2016 · 519d4d2 · 519d4d2
1 parent fe81ce8
commit 519d4d2
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 11 deletions.
diff --git a/Gruntfile.js b/Gruntfile.js
@@ -63,11 +63,9 @@ module.exports = function (grunt) {
   grunt.loadNpmTasks('grunt-contrib-nodeunit');
   grunt.loadNpmTasks('grunt-contrib-internal');
 
-  grunt.registerTask('mkdir', grunt.file.mkdir);
   grunt.registerTask('test', [
-    'jshint',
     'clean',
-    'mkdir:tmp',
+    'jshint',
     'sass',
     'nodeunit',
     'clean'

diff --git a/test/test.js b/test/test.js
@@ -1,14 +1,23 @@
 'use strict';
+
 var grunt = require('grunt');
 
+function readFile(file) {
+  var contents = grunt.file.read(file);
+  if (process.platform === 'win32') {
+    contents = contents.replace(/\r\n/g, '\n');
+  }
+  return contents;
+}
+
 exports.sass = {
   compile: function (test) {
     test.expect(4);
 
-    var scss = grunt.file.read('test/tmp/scss.css');
-    var sass = grunt.file.read('test/tmp/sass.css');
-    var css = grunt.file.read('test/tmp/css.css');
-    var expected = grunt.file.read('test/expected/compile.css');
+    var scss = readFile('test/tmp/scss.css');
+    var sass = readFile('test/tmp/sass.css');
+    var css = readFile('test/tmp/css.css');
+    var expected = readFile('test/expected/compile.css');
 
     test.equal(scss, expected, 'should compile SCSS to CSS');
     test.equal(sass, expected, 'should compile SASS to CSS');
@@ -22,10 +31,10 @@ exports.sass = {
   update: function (test) {
     test.expect(3);
 
-    var scss = grunt.file.read('test/tmp/updatetrue.css');
-    var sass = grunt.file.read('test/tmp/updatetrue.css');
-    var css = grunt.file.read('test/tmp/updatetrue.css');
-    var expected = grunt.file.read('test/expected/updatetrue.css');
+    var scss = readFile('test/tmp/updatetrue.css');
+    var sass = readFile('test/tmp/updatetrue.css');
+    var css = readFile('test/tmp/updatetrue.css');
+    var expected = readFile('test/expected/updatetrue.css');
 
     test.equal(scss, expected, 'should compile SCSS to CSS');
     test.equal(sass, expected, 'should compile SASS to CSS');