Commit 1b2dd431 by XhmikosR

Clean up JSHint's options.

parent faed0cc4
{ {
"node": true, "bitwise": true,
"laxbreak": true, "camelcase": false,
"indent": 2,
"curly": true, "curly": true,
"trailing": true, "eqeqeq": true,
"undef": true, "expr": true,
"unused": true, "immed": true,
"expr":true, "indent": 2,
"laxbreak": true,
"mocha": true,
"multistr": true, "multistr": true,
"globals": { "newcap": true,
"it": true, "noarg": true,
"describe": true "node": true,
} "quotmark": "single",
"strict": false,
"undef": true,
"unused": true
} }
\ No newline at end of file
...@@ -40,7 +40,7 @@ if (!force && !process.env.SKIP_NODE_SASS_TESTS) { ...@@ -40,7 +40,7 @@ if (!force && !process.env.SKIP_NODE_SASS_TESTS) {
timeout: 999999 timeout: 999999
}); });
mocha.addFile(path.resolve(__dirname, "test", "test.js")); mocha.addFile(path.resolve(__dirname, 'test', 'test.js'));
mocha.run(function (done) { mocha.run(function (done) {
if (done !== 0) { if (done !== 0) {
......
...@@ -44,7 +44,7 @@ module.exports = function(options){ ...@@ -44,7 +44,7 @@ module.exports = function(options){
options = options || {}; options = options || {};
// Accept src/dest dir // Accept src/dest dir
if ('string' == typeof options) { if ('string' === typeof options) {
options = { src: options }; options = { src: options };
} }
...@@ -72,7 +72,7 @@ module.exports = function(options){ ...@@ -72,7 +72,7 @@ module.exports = function(options){
// Middleware // Middleware
return function sass(req, res, next){ return function sass(req, res, next){
if ('GET' != req.method && 'HEAD' != req.method) { return next(); } if ('GET' !== req.method && 'HEAD' !== req.method) { return next(); }
var path = url.parse(req.url).pathname; var path = url.parse(req.url).pathname;
if (options.prefix && 0 === path.indexOf(options.prefix)) { if (options.prefix && 0 === path.indexOf(options.prefix)) {
path = path.substring(options.prefix.length); path = path.substring(options.prefix.length);
...@@ -97,7 +97,7 @@ module.exports = function(options){ ...@@ -97,7 +97,7 @@ module.exports = function(options){
// Ignore ENOENT to fall through as 404 // Ignore ENOENT to fall through as 404
var error = function(err) { var error = function(err) {
next('ENOENT' == err.code next('ENOENT' === err.code
? null ? null
: err); : err);
}; };
...@@ -139,7 +139,7 @@ module.exports = function(options){ ...@@ -139,7 +139,7 @@ module.exports = function(options){
fs.stat(cssPath, function(err, cssStats){ fs.stat(cssPath, function(err, cssStats){
// CSS has not been compiled, compile it! // CSS has not been compiled, compile it!
if (err) { if (err) {
if ('ENOENT' == err.code) { if ('ENOENT' === err.code) {
if (debug) { log('not found', cssPath); } if (debug) { log('not found', cssPath); }
compile(); compile();
} else { } else {
......
/*jshint multistr:true */
var sass = require('../sass'); var sass = require('../sass');
var assert = require('assert'); var assert = require('assert');
...@@ -20,8 +19,8 @@ var expectedCommentsScssStr = '/* line 1, ' + sampleFilename + ' */\n\ ...@@ -20,8 +19,8 @@ var expectedCommentsScssStr = '/* line 1, ' + sampleFilename + ' */\n\
#navbar li a {\n\ #navbar li a {\n\
font-weight: bold; }\n'; font-weight: bold; }\n';
describe("compile file with source comments", function() { describe('compile file with source comments', function() {
it("should compile with render and comment outputs", function(done) { it('should compile with render and comment outputs', function(done) {
sass.render({ sass.render({
file: sampleFilename, file: sampleFilename,
source_comments: 'normal', source_comments: 'normal',
......
/*jshint multistr:true */
var sass = require('../sass'); var sass = require('../sass');
var assert = require('assert'); var assert = require('assert');
var sampleFilename = require('path').resolve(__dirname, 'sample.scss'); var sampleFilename = require('path').resolve(__dirname, 'sample.scss');
describe("compile source maps", function() { describe('compile source maps', function() {
it("should compile file with source map URL", function(done) { it('should compile file with source map URL', function(done) {
var mapFileName = 'sample.css.map'; var mapFileName = 'sample.css.map';
sass.render({ sass.render({
file: sampleFilename, file: sampleFilename,
......
/* global beforeEach, afterEach */
/*jshint multistr:true */
var sass = process.env.NODESASS_COVERAGE ? require('../sass-coverage') : require('../sass'); var sass = process.env.NODESASS_COVERAGE ? require('../sass-coverage') : require('../sass');
var assert = require('assert'); var assert = require('assert');
var path = require('path'); var path = require('path');
...@@ -39,18 +37,18 @@ var expectedRender = '#navbar {\n\ ...@@ -39,18 +37,18 @@ var expectedRender = '#navbar {\n\
#navbar li a {\n\ #navbar li a {\n\
font-weight: bold; }\n'; font-weight: bold; }\n';
describe("DEPRECATED: compile scss", function() { describe('DEPRECATED: compile scss', function() {
it("should compile with render", function(done) { it('should compile with render', function(done) {
sass.render(scssStr, function(err) { sass.render(scssStr, function(err) {
done(err); done(err);
}); });
}); });
it("should compile with renderSync", function(done) { it('should compile with renderSync', function(done) {
done(assert.ok(sass.renderSync(scssStr))); done(assert.ok(sass.renderSync(scssStr)));
}); });
it("should match compiled string with render", function(done) { it('should match compiled string with render', function(done) {
sass.render(scssStr, function(err, css) { sass.render(scssStr, function(err, css) {
if (!err) { if (!err) {
done(assert.equal(css, expectedRender)); done(assert.equal(css, expectedRender));
...@@ -60,19 +58,19 @@ describe("DEPRECATED: compile scss", function() { ...@@ -60,19 +58,19 @@ describe("DEPRECATED: compile scss", function() {
}); });
}); });
it("should match compiled string with renderSync", function(done) { it('should match compiled string with renderSync', function(done) {
done(assert.equal(sass.renderSync(scssStr), expectedRender)); done(assert.equal(sass.renderSync(scssStr), expectedRender));
}); });
it("should throw an exception for bad input", function(done) { it('should throw an exception for bad input', function(done) {
done(assert.throws(function() { done(assert.throws(function() {
sass.renderSync(badInput); sass.renderSync(badInput);
})); }));
}); });
}); });
describe("compile scss", function() { describe('compile scss', function() {
it("should compile with render", function(done) { it('should compile with render', function(done) {
sass.render({ sass.render({
data: scssStr, data: scssStr,
success: function(css) { success: function(css) {
...@@ -81,11 +79,11 @@ describe("compile scss", function() { ...@@ -81,11 +79,11 @@ describe("compile scss", function() {
}); });
}); });
it("should compile with renderSync", function(done) { it('should compile with renderSync', function(done) {
done(assert.ok(sass.renderSync({data: scssStr}))); done(assert.ok(sass.renderSync({data: scssStr})));
}); });
it("should match compiled string with render", function(done) { it('should match compiled string with render', function(done) {
sass.render({ sass.render({
data: scssStr, data: scssStr,
success: function(css) { success: function(css) {
...@@ -97,7 +95,7 @@ describe("compile scss", function() { ...@@ -97,7 +95,7 @@ describe("compile scss", function() {
}); });
}); });
it("should have a error status of 1 for bad css", function(done) { it('should have a error status of 1 for bad css', function(done) {
sass.render({ sass.render({
data: '{zzz}', data: '{zzz}',
success: function(css) { success: function(css) {
...@@ -110,24 +108,24 @@ describe("compile scss", function() { ...@@ -110,24 +108,24 @@ describe("compile scss", function() {
}); });
}); });
it("should match compiled string with renderSync", function(done) { it('should match compiled string with renderSync', function(done) {
done(assert.equal(sass.renderSync({data: scssStr}), expectedRender)); done(assert.equal(sass.renderSync({data: scssStr}), expectedRender));
}); });
it("should throw an exception for bad input", function(done) { it('should throw an exception for bad input', function(done) {
done(assert.throws(function() { done(assert.throws(function() {
sass.renderSync({data: badInput}); sass.renderSync({data: badInput});
})); }));
}); });
}); });
describe("compile file with include paths", function(){ describe('compile file with include paths', function(){
it("should compile with render", function(done) { it('should compile with render', function(done) {
sass.render({ sass.render({
file: path.resolve(__dirname, "include_path.scss"), file: path.resolve(__dirname, 'include_path.scss'),
includePaths: [path.resolve(__dirname, "lib"), path.resolve(__dirname, "functions")], includePaths: [path.resolve(__dirname, 'lib'), path.resolve(__dirname, 'functions')],
success: function (css) { success: function (css) {
done(assert.equal(css, "body {\n background: red;\n color: #0000fe; }\n")); done(assert.equal(css, 'body {\n background: red;\n color: #0000fe; }\n'));
}, },
error: function (error) { error: function (error) {
done(error); done(error);
...@@ -136,13 +134,13 @@ describe("compile file with include paths", function(){ ...@@ -136,13 +134,13 @@ describe("compile file with include paths", function(){
}); });
}); });
describe("compile file with image path", function(){ describe('compile file with image path', function(){
it("should compile with render", function(done) { it('should compile with render', function(done) {
sass.render({ sass.render({
file: path.resolve(__dirname, "image_path.scss"), file: path.resolve(__dirname, 'image_path.scss'),
imagePath: '/path/to/images', imagePath: '/path/to/images',
success: function (css) { success: function (css) {
done(assert.equal(css, "body {\n background-image: url(\"/path/to/images/image.png\"); }\n")); done(assert.equal(css, 'body {\n background-image: url(\"/path/to/images/image.png\"); }\n'));
}, },
error: function (error) { error: function (error) {
done(error); done(error);
...@@ -151,8 +149,8 @@ describe("compile file with image path", function(){ ...@@ -151,8 +149,8 @@ describe("compile file with image path", function(){
}); });
}); });
describe("compile file", function() { describe('compile file', function() {
it("should compile with render", function(done) { it('should compile with render', function(done) {
sass.render({ sass.render({
file: sampleFilename, file: sampleFilename,
success: function (css) { success: function (css) {
...@@ -164,11 +162,11 @@ describe("compile file", function() { ...@@ -164,11 +162,11 @@ describe("compile file", function() {
}); });
}); });
it("should compile with renderSync", function(done) { it('should compile with renderSync', function(done) {
done(assert.ok(sass.renderSync({file: sampleFilename}))); done(assert.ok(sass.renderSync({file: sampleFilename})));
}); });
it("should match compiled string with render", function(done) { it('should match compiled string with render', function(done) {
sass.render({ sass.render({
file: sampleFilename, file: sampleFilename,
success: function(css) { success: function(css) {
...@@ -180,18 +178,18 @@ describe("compile file", function() { ...@@ -180,18 +178,18 @@ describe("compile file", function() {
}); });
}); });
it("should match compiled string with renderSync", function(done) { it('should match compiled string with renderSync', function(done) {
done(assert.equal(sass.renderSync({file: sampleFilename}), expectedRender)); done(assert.equal(sass.renderSync({file: sampleFilename}), expectedRender));
}); });
it("should throw an exception for bad input", function(done) { it('should throw an exception for bad input', function(done) {
done(assert.throws(function() { done(assert.throws(function() {
sass.renderSync({file: badSampleFilename}); sass.renderSync({file: badSampleFilename});
})); }));
}); });
}); });
describe("render to file", function() { describe('render to file', function() {
var outFile = path.resolve(__dirname, 'out.css'), var outFile = path.resolve(__dirname, 'out.css'),
filesWritten; filesWritten;
...@@ -205,7 +203,7 @@ describe("render to file", function() { ...@@ -205,7 +203,7 @@ describe("render to file", function() {
afterEach(function() { afterEach(function() {
fs.writeFile.restore(); fs.writeFile.restore();
}); });
it("should compile with renderFile", function(done) { it('should compile with renderFile', function(done) {
sass.renderFile({ sass.renderFile({
file: sampleFilename, file: sampleFilename,
outFile: outFile, outFile: outFile,
...@@ -219,22 +217,22 @@ describe("render to file", function() { ...@@ -219,22 +217,22 @@ describe("render to file", function() {
}); });
}); });
it("should raise an error for bad input", function(done) { it('should raise an error for bad input', function(done) {
sass.renderFile({ sass.renderFile({
file: badSampleFilename, file: badSampleFilename,
outFile: outFile, outFile: outFile,
success: function() { success: function() {
assert(false, "success() should not be called"); assert(false, 'success() should not be called');
done(); done();
}, },
error: function() { error: function() {
assert(true, "error() called"); assert(true, 'error() called');
done(); done();
} }
}); });
}); });
it("should save the sourceMap to the default file name", function(done) { it('should save the sourceMap to the default file name', function(done) {
sass.renderFile({ sass.renderFile({
file: sampleFilename, file: sampleFilename,
outFile: outFile, outFile: outFile,
...@@ -254,7 +252,7 @@ describe("render to file", function() { ...@@ -254,7 +252,7 @@ describe("render to file", function() {
}); });
}); });
it("should save the sourceMap to a specified file name", function(done) { it('should save the sourceMap to a specified file name', function(done) {
var mapFileName = 'foo.css.map'; var mapFileName = 'foo.css.map';
sass.renderFile({ sass.renderFile({
file: sampleFilename, file: sampleFilename,
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment