From 285f3ec2856cf422e677a7eb4514f3077e9aed93 Mon Sep 17 00:00:00 2001 From: XhmikosR Date: Thu, 14 Apr 2016 09:52:41 +0300 Subject: [PATCH] Trying to fix Windows tests; one is left broken. --- test/jst_test.js | 60 +++++++++++++++++++++++++++--------------------- 1 file changed, 34 insertions(+), 26 deletions(-) diff --git a/test/jst_test.js b/test/jst_test.js index 1abad6b..789d9a6 100644 --- a/test/jst_test.js +++ b/test/jst_test.js @@ -2,6 +2,14 @@ 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.jst = { main: function(test) { @@ -9,44 +17,44 @@ exports.jst = { test.expect(10); - expect = grunt.file.read('test/expected/jst.js'); - result = grunt.file.read('tmp/jst.js'); + expect = readFile('test/expected/jst.js'); + result = readFile('tmp/jst.js'); test.equal(expect, result, 'should compile underscore templates into JST'); - expect = grunt.file.read('test/expected/uglyfile.js'); - result = grunt.file.read('tmp/uglyfile.js'); + expect = readFile('test/expected/uglyfile.js'); + result = readFile('tmp/uglyfile.js'); test.equal(expect, result, 'should escape single quotes in filenames'); - expect = grunt.file.read('test/expected/ns_nested.js'); - result = grunt.file.read('tmp/ns_nested.js'); + expect = readFile('test/expected/ns_nested.js'); + result = readFile('tmp/ns_nested.js'); test.equal(expect, result, 'should define parts of nested namespaces'); - - expect = grunt.file.read('test/expected/ns_nested.js'); // same as previous test - result = grunt.file.read('tmp/ns_nested_this.js'); + + expect = readFile('test/expected/ns_nested.js'); // same as previous test + result = readFile('tmp/ns_nested_this.js'); test.equal(expect, result, 'should define parts of nested namespaces, ignoring this.'); - - expect = grunt.file.read('test/expected/pretty.js'); - result = grunt.file.read('tmp/pretty.js'); + + expect = readFile('test/expected/pretty.js'); + result = readFile('tmp/pretty.js'); test.equal(expect, result, 'should make the output be 1 line per template, making the output less ugly'); - - expect = grunt.file.read('test/expected/amd_wrapper.js'); - result = grunt.file.read('tmp/amd_wrapper.js'); + + expect = readFile('test/expected/amd_wrapper.js'); + result = readFile('tmp/amd_wrapper.js'); test.equal(expect, result, 'should wrap the template with define for AMD pattern'); - - expect = grunt.file.read('test/expected/amd_wrapper_no_ns.js'); - result = grunt.file.read('tmp/amd_wrapper_no_ns.js'); + + expect = readFile('test/expected/amd_wrapper_no_ns.js'); + result = readFile('tmp/amd_wrapper_no_ns.js'); test.equal(expect, result, 'should wrap the template with define for AMD pattern and return the function itself with no namespace'); - - expect = grunt.file.read('test/expected/pretty_amd.js'); - result = grunt.file.read('tmp/pretty_amd.js'); + + expect = readFile('test/expected/pretty_amd.js'); + result = readFile('tmp/pretty_amd.js'); test.equal(expect, result, 'should make the AMD wrapper output pretty'); - - expect = grunt.file.read('test/expected/process_content.js'); - result = grunt.file.read('tmp/process_content.js'); + + expect = readFile('test/expected/process_content.js'); + result = readFile('tmp/process_content.js'); test.equal(expect, result, 'should convert file content'); - expect = grunt.file.read('test/expected/local_scope.js'); - result = grunt.file.read('tmp/local_scope.js'); + expect = readFile('test/expected/local_scope.js'); + result = readFile('tmp/local_scope.js'); test.equal(expect, result, 'should add `with` block when templateSettings.variable is undefined'); test.done();