Skip to content

Commit 519d4d2

Browse files
committed
Fix tests on Windows.
1 parent fe81ce8 commit 519d4d2

File tree

2 files changed

+18
-11
lines changed

2 files changed

+18
-11
lines changed

Gruntfile.js

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -63,11 +63,9 @@ module.exports = function (grunt) {
6363
grunt.loadNpmTasks('grunt-contrib-nodeunit');
6464
grunt.loadNpmTasks('grunt-contrib-internal');
6565

66-
grunt.registerTask('mkdir', grunt.file.mkdir);
6766
grunt.registerTask('test', [
68-
'jshint',
6967
'clean',
70-
'mkdir:tmp',
68+
'jshint',
7169
'sass',
7270
'nodeunit',
7371
'clean'

test/test.js

Lines changed: 17 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,23 @@
11
'use strict';
2+
23
var grunt = require('grunt');
34

5+
function readFile(file) {
6+
var contents = grunt.file.read(file);
7+
if (process.platform === 'win32') {
8+
contents = contents.replace(/\r\n/g, '\n');
9+
}
10+
return contents;
11+
}
12+
413
exports.sass = {
514
compile: function (test) {
615
test.expect(4);
716

8-
var scss = grunt.file.read('test/tmp/scss.css');
9-
var sass = grunt.file.read('test/tmp/sass.css');
10-
var css = grunt.file.read('test/tmp/css.css');
11-
var expected = grunt.file.read('test/expected/compile.css');
17+
var scss = readFile('test/tmp/scss.css');
18+
var sass = readFile('test/tmp/sass.css');
19+
var css = readFile('test/tmp/css.css');
20+
var expected = readFile('test/expected/compile.css');
1221

1322
test.equal(scss, expected, 'should compile SCSS to CSS');
1423
test.equal(sass, expected, 'should compile SASS to CSS');
@@ -22,10 +31,10 @@ exports.sass = {
2231
update: function (test) {
2332
test.expect(3);
2433

25-
var scss = grunt.file.read('test/tmp/updatetrue.css');
26-
var sass = grunt.file.read('test/tmp/updatetrue.css');
27-
var css = grunt.file.read('test/tmp/updatetrue.css');
28-
var expected = grunt.file.read('test/expected/updatetrue.css');
34+
var scss = readFile('test/tmp/updatetrue.css');
35+
var sass = readFile('test/tmp/updatetrue.css');
36+
var css = readFile('test/tmp/updatetrue.css');
37+
var expected = readFile('test/expected/updatetrue.css');
2938

3039
test.equal(scss, expected, 'should compile SCSS to CSS');
3140
test.equal(sass, expected, 'should compile SASS to CSS');

0 commit comments

Comments
 (0)