Minor lint tweaks.
This commit is contained in:
parent
eae34f591e
commit
f32a7bc3ad
34
Gruntfile.js
34
Gruntfile.js
@ -16,14 +16,14 @@ module.exports = function(grunt) {
|
||||
return500: {
|
||||
options: {
|
||||
port: 10921,
|
||||
middleware: function(connect, options) {
|
||||
return [function(req, res, next){
|
||||
res.statusCode = 500;
|
||||
res.end();
|
||||
}];
|
||||
}
|
||||
middleware: function() {
|
||||
return [function(req, res) {
|
||||
res.statusCode = 500;
|
||||
res.end();
|
||||
}];
|
||||
}
|
||||
}
|
||||
}
|
||||
},
|
||||
jshint: {
|
||||
all: [
|
||||
@ -36,10 +36,10 @@ module.exports = function(grunt) {
|
||||
jshintrc: '.jshintrc'
|
||||
}
|
||||
},
|
||||
watch : {
|
||||
dev : {
|
||||
files : ['tasks/**/*'],
|
||||
tasks : ['jasmine:pivotal:build']
|
||||
watch: {
|
||||
dev: {
|
||||
files: ['tasks/**/*'],
|
||||
tasks: ['jasmine:pivotal:build']
|
||||
}
|
||||
},
|
||||
jasmine: {
|
||||
@ -54,10 +54,10 @@ module.exports = function(grunt) {
|
||||
}
|
||||
}
|
||||
},
|
||||
phantom_polyfills: {
|
||||
phantomPolyfills: {
|
||||
src: 'test/fixtures/phantom-polyfills/src/**/*.js',
|
||||
options : {
|
||||
specs : 'test/fixtures/phantom-polyfills/spec/**/*.js',
|
||||
options: {
|
||||
specs: 'test/fixtures/phantom-polyfills/spec/**/*.js'
|
||||
}
|
||||
},
|
||||
consoleDisplayOptions: {
|
||||
@ -66,7 +66,7 @@ module.exports = function(grunt) {
|
||||
specs: 'test/fixtures/pivotal/spec/*Spec.js',
|
||||
helpers: 'test/fixtures/pivotal/spec/*Helper.js',
|
||||
display: 'short',
|
||||
summary: true,
|
||||
summary: true
|
||||
}
|
||||
},
|
||||
consoleDisplayOptionsNone: {
|
||||
@ -75,7 +75,7 @@ module.exports = function(grunt) {
|
||||
specs: 'test/fixtures/pivotal/spec/*Spec.js',
|
||||
helpers: 'test/fixtures/pivotal/spec/*Helper.js',
|
||||
display: 'none',
|
||||
summary: true,
|
||||
summary: true
|
||||
}
|
||||
},
|
||||
deepOutfile: {
|
||||
@ -114,8 +114,8 @@ module.exports = function(grunt) {
|
||||
},
|
||||
selfTest: {
|
||||
options: {
|
||||
specs:["test/selfTest/*.js"],
|
||||
"--web-security": "no"
|
||||
specs: ['test/selfTest/*.js'],
|
||||
'--web-security': 'no'
|
||||
}
|
||||
}
|
||||
},
|
||||
|
@ -11,7 +11,7 @@
|
||||
module.exports = function(grunt) {
|
||||
|
||||
// node api
|
||||
var fs = require('fs'),
|
||||
var fs = require('fs'),
|
||||
path = require('path');
|
||||
|
||||
// npm lib
|
||||
@ -397,7 +397,7 @@ module.exports = function(grunt) {
|
||||
var template = grunt.file.read(options.junit.template || junitTemplate);
|
||||
if (options.junit.consolidate) {
|
||||
var xmlFile = path.join(options.junit.path, 'TEST-' + testsuites.suite1.name.replace(/[^\w]/g, '') + '.xml');
|
||||
grunt.file.write(xmlFile, grunt.util._.template(template, { testsuites: _.values(testsuites)}));
|
||||
grunt.file.write(xmlFile, grunt.util._.template(template, { testsuites: _.values(testsuites) }));
|
||||
} else {
|
||||
_.forEach(testsuites, function(suiteData) {
|
||||
var xmlFile = path.join(options.junit.path, 'TEST-' + suiteData.name.replace(/[^\w]/g, '') + '.xml');
|
||||
|
@ -121,7 +121,7 @@ if (window._phantom) {
|
||||
keyMap.push(key);
|
||||
}
|
||||
} catch (e) {
|
||||
return '[Object]';
|
||||
return '[Object]';
|
||||
}
|
||||
return value;
|
||||
});
|
||||
|
Loading…
Reference in New Issue
Block a user