Skip to content

Commit

Permalink
Minor lint tweaks.
Browse files Browse the repository at this point in the history
  • Loading branch information
XhmikosR committed Oct 23, 2015
1 parent eae34f5 commit f32a7bc
Show file tree
Hide file tree
Showing 3 changed files with 20 additions and 20 deletions.
34 changes: 17 additions & 17 deletions Gruntfile.js
Original file line number Diff line number Diff line change
Expand Up @@ -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: [
Expand 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: {
Expand All @@ -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: {
Expand All @@ -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: {
Expand All @@ -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: {
Expand Down Expand Up @@ -114,8 +114,8 @@ module.exports = function(grunt) {
},
selfTest: {
options: {
specs:["test/selfTest/*.js"],
"--web-security": "no"
specs: ['test/selfTest/*.js'],
'--web-security': 'no'
}
}
},
Expand Down
4 changes: 2 additions & 2 deletions tasks/jasmine.js
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
module.exports = function(grunt) {

// node api
var fs = require('fs'),
var fs = require('fs'),
path = require('path');

// npm lib
Expand Down Expand Up @@ -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');
Expand Down
2 changes: 1 addition & 1 deletion tasks/jasmine/reporters/PhantomReporter.js
Original file line number Diff line number Diff line change
Expand Up @@ -121,7 +121,7 @@ if (window._phantom) {
keyMap.push(key);
}
} catch (e) {
return '[Object]';
return '[Object]';
}
return value;
});
Expand Down

0 comments on commit f32a7bc

Please sign in to comment.