Further Windows fixes

test/api.js

@@ -14,7 +14,7 @@ describe('api (deprecated)', function() {
 
       sass.render(src, function(err, css) {
         assert(!err);
-        assert.equal(css.trim(), expected);
+        assert.equal(css.trim(), expected.replace(/\r\n/g, '\n'));
         done();
       });
     });
@@ -32,7 +32,7 @@ describe('api (deprecated)', function() {
       var src = read(fixture('simple/index.scss'), 'utf8');
       var expected = read(fixture('simple/expected.css'), 'utf8').trim();
 
-      assert.equal(sass.renderSync(src).trim(), expected);
+      assert.equal(sass.renderSync(src).trim(), expected.replace(/\r\n/g, '\n'));
       done();
     });
 
@@ -55,7 +55,7 @@ describe('api', function() {
       sass.render({
         data: src,
         success: function(css) {
-          assert.equal(css.trim(), expected);
+          assert.equal(css.trim(), expected.replace(/\r\n/g, '\n'));
           done();
         }
       });
@@ -83,7 +83,7 @@ describe('api', function() {
           fixture('include-path/lib')
         ],
         success: function(css) {
-          assert.equal(css.trim(), expected);
+          assert.equal(css.trim(), expected.replace(/\r\n/g, '\n'));
           done();
         }
       });
@@ -97,7 +97,7 @@ describe('api', function() {
         data: src,
         imagePath: '/path/to/images',
         success: function(css) {
-          assert.equal(css.trim(), expected);
+          assert.equal(css.trim(), expected.replace(/\r\n/g, '\n'));
           done();
         }
       });
@@ -124,7 +124,7 @@ describe('api', function() {
         data: src,
         precision: 10,
         success: function(css) {
-          assert.equal(css.trim(), expected);
+          assert.equal(css.trim(), expected.replace(/\r\n/g, '\n'));
           done();
         }
       });
@@ -151,7 +151,7 @@ describe('api', function() {
       var src = read(fixture('simple/index.scss'), 'utf8');
       var expected = read(fixture('simple/expected.css'), 'utf8').trim();
 
-      assert.equal(sass.renderSync({ data: src }).trim(), expected);
+      assert.equal(sass.renderSync({ data: src }).trim(), expected.replace(/\r\n/g, '\n'));
       done();
     });
 
@@ -174,7 +174,7 @@ describe('api', function() {
         data: src,
         outFile: dest,
         success: function() {
-          assert.equal(read(dest, 'utf8').trim(), expected);
+          assert.equal(read(dest, 'utf8').trim(), expected.replace(/\r\n/g, '\n'));
           fs.unlinkSync(dest);
           done();
         }
@@ -283,18 +283,26 @@ describe('api', function() {
     });
 
     it('should contain an array of all included files', function(done) {
-      assert.equal(stats.includedFiles[0], resolveFixture('include-files/bar.scss'));
-      assert.equal(stats.includedFiles[1], resolveFixture('include-files/foo.scss'));
-      assert.equal(stats.includedFiles[2], resolveFixture('include-files/index.scss'));
+      var expected = [
+        fixture('include-files/bar.scss').replace(/\\/g, '/'),
+        fixture('include-files/foo.scss').replace(/\\/g, '/'),
+        fixture('include-files/index.scss').replace(/\\/g, '/')
+      ];
+
+      assert.equal(stats.includedFiles[0], expected[0]);
+      assert.equal(stats.includedFiles[1], expected[1]);
+      assert.equal(stats.includedFiles[2], expected[2]);
       done();
     });
 
     it('should contain array with the entry if there are no import statements', function(done) {
+      var expected = fixture('simple/index.scss').replace(/\\/g, '/');
+
       sass.render({
         file: fixture('simple/index.scss'),
         stats: stats,
         success: function () {
-          assert.deepEqual(stats.includedFiles, [resolveFixture('simple/index.scss')]);
+          assert.deepEqual(stats.includedFiles, [expected]);
           done();
         }
       });
@@ -358,19 +366,26 @@ describe('api', function() {
     });
 
     it('should contain an array of all included files', function(done) {
-      assert.equal(stats.includedFiles[0], resolveFixture('include-files/bar.scss'));
-      assert.equal(stats.includedFiles[1], resolveFixture('include-files/foo.scss'));
-      assert.equal(stats.includedFiles[2], resolveFixture('include-files/index.scss'));
+      var expected = [
+        fixture('include-files/bar.scss').replace(/\\/g, '/'),
+        fixture('include-files/foo.scss').replace(/\\/g, '/'),
+        fixture('include-files/index.scss').replace(/\\/g, '/')
+      ];
+
+      assert.equal(stats.includedFiles[0], expected[0]);
+      assert.equal(stats.includedFiles[1], expected[1]);
+      assert.equal(stats.includedFiles[2], expected[2]);
       done();
     });
 
     it('should contain array with the entry if there are no import statements', function(done) {
+      var expected = fixture('simple/index.scss').replace(/\\/g, '/');
       sass.renderSync({
         file: fixture('simple/index.scss'),
         stats: stats
       });
 
-      assert.deepEqual(stats.includedFiles, [fixture('simple/index.scss')]);
+      assert.deepEqual(stats.includedFiles, [expected]);
       done();
     });
 

test/cli.js

@@ -10,12 +10,12 @@ describe('cli', function() {
   describe('node-sass < in.scss', function() {
     it('should read data from stdin', function(done) {
       var src = fs.createReadStream(fixture('simple/index.scss'));
-      var expected = fixture('simple/expected.css');
+      var expected = read(fixture('simple/expected.css'), 'utf8').trim();
       var bin = spawn(cli, ['--stdout']);
 
       bin.stdout.setEncoding('utf8');
       bin.stdout.once('data', function(data) {
-        assert.equal(data.trim(), read(expected, 'utf8').trim());
+        assert.equal(data.trim(), expected.replace(/\r\n/g, '\n'));
         done();
       });
 
@@ -38,12 +38,12 @@ describe('cli', function() {
 
     it('should compile sass using the --indented-syntax option', function(done) {
       var src = fs.createReadStream(fixture('indent/index.sass'));
-      var expected = fixture('indent/expected.css');
+      var expected = read(fixture('indent/expected.css'), 'utf8').trim();
       var bin = spawn(cli, ['--stdout', '--indented-syntax']);
 
       bin.stdout.setEncoding('utf8');
       bin.stdout.once('data', function(data) {
-        assert.equal(data.trim(), read(expected, 'utf8').trim());
+        assert.equal(data.trim(), expected.replace(/\r\n/g, '\n'));
         done();
       });
 
@@ -52,12 +52,12 @@ describe('cli', function() {
 
     it('should compile with the --output-style option', function(done) {
       var src = fs.createReadStream(fixture('compressed/index.scss'));
-      var expected = fixture('compressed/expected.css');
+      var expected = read(fixture('compressed/expected.css'), 'utf8').trim();
       var bin = spawn(cli, ['--stdout', '--output-style', 'compressed']);
 
       bin.stdout.setEncoding('utf8');
       bin.stdout.once('data', function(data) {
-        assert.equal(data.trim(), read(expected, 'utf8').trim());
+        assert.equal(data.trim(), expected.replace(/\r\n/g, '\n'));
         done();
       });
 
@@ -66,12 +66,12 @@ describe('cli', function() {
 
     it('should compile with the --source-comments option', function(done) {
       var src = fs.createReadStream(fixture('source-comments/index.scss'));
-      var expected = fixture('source-comments/expected.css');
+      var expected = read(fixture('source-comments/expected.css'), 'utf8').trim();
       var bin = spawn(cli, ['--stdout', '--source-comments']);
 
       bin.stdout.setEncoding('utf8');
       bin.stdout.once('data', function(data) {
-        assert.equal(data.trim(), read(expected, 'utf8').trim());
+        assert.equal(data.trim(), expected.replace(/\r\n/g, '\n'));
         done();
       });
 
@@ -80,12 +80,12 @@ describe('cli', function() {
 
     it('should compile with the --image-path option', function(done) {
       var src = fs.createReadStream(fixture('image-path/index.scss'));
-      var expected = fixture('image-path/expected.css');
+      var expected = read(fixture('image-path/expected.css'), 'utf8').trim();
       var bin = spawn(cli, ['--stdout', '--image-path', '/path/to/images']);
 
       bin.stdout.setEncoding('utf8');
       bin.stdout.once('data', function(data) {
-        assert.equal(data.trim(), read(expected, 'utf8').trim());
+        assert.equal(data.trim(), expected.replace(/\r\n/g, '\n'));
         done();
       });
 
@@ -116,12 +116,12 @@ describe('cli', function() {
       ];
 
       var src = fixture('include-path/index.scss');
-      var expected = fixture('include-path/expected.css');
+      var expected = read(fixture('include-path/expected.css'), 'utf8').trim();
       var bin = spawn(cli, [src, '--stdout'].concat(includePaths));
 
       bin.stdout.setEncoding('utf8');
       bin.stdout.once('data', function(data) {
-        assert.equal(data.trim(), read(expected, 'utf8').trim());
+        assert.equal(data.trim(), expected.replace(/\r\n/g, '\n'));
         done();
       });
     });
@@ -162,12 +162,12 @@ describe('cli', function() {
     it('should compile with the --source-map option', function(done) {
       var src = fixture('source-map/index.scss');
       var dest = fixture('source-map/build.css');
-      var expected = fixture('source-map/expected.css');
+      var expected = read(fixture('source-map/expected.css'), 'utf8').trim();
       var map = fixture('source-map/index.map');
       var bin = spawn(cli, [src, '--output', dest, '--source-map', map]);
 
       bin.on('close', function () {
-        assert.equal(read(dest, 'utf8').trim(), read(expected, 'utf8').trim());
+        assert.equal(read(dest, 'utf8').trim(), expected);
         assert(fs.existsSync(map));
         fs.unlinkSync(map);
         fs.unlinkSync(dest);