Commit ebdf5e89 ebdf5e89f26bd7df969a321d6a06dd6816ea69d2 by Nicolas Perriault

upgraded jshint to 1.0.0

1 parent 5cad7e63
......@@ -19,7 +19,6 @@
"predef" : [
"exports",
"phantom",
"require",
"window"
]
}
......
......@@ -2,8 +2,6 @@ docs
modules/vendors
modules/events.js
modules/querystring.js
samples
tests/clitests/tester/
tests/site
tests/testdir
samples/**
tests/**
tmp
......
......@@ -3,7 +3,7 @@ branches:
- "master"
- "1.0"
before_script:
- "npm install -g jshint@0.9.1"
- "npm install -g jshint@1.0.0"
- "phantomjs --version"
- "export PHANTOMJS_EXECUTABLE='phantomjs --local-to-remote-url-access=yes --ignore-ssl-errors=yes'"
script:
......
......@@ -28,8 +28,8 @@
*
*/
/*global console phantom require*/
/*jshint maxstatements:30 maxcomplexity:10*/
/*global console, phantom, require:true*/
/*jshint maxstatements:30, maxcomplexity:10*/
// phantom check
if (!phantom) {
......
......@@ -28,7 +28,7 @@
*
*/
/*global CasperError console exports phantom __utils__ patchRequire*/
/*global CasperError, console, exports, phantom, __utils__, patchRequire*/
var require = patchRequire(require);
var colorizer = require('colorizer');
......
......@@ -28,7 +28,7 @@
*
*/
/*global CasperError console exports phantom patchRequire*/
/*global CasperError, console, exports, phantom, patchRequire*/
var require = patchRequire(require);
var utils = require('utils');
......
......@@ -28,7 +28,7 @@
*
*/
/*global console escape exports NodeList window*/
/*global console, escape, exports, NodeList, window*/
(function(exports) {
"use strict";
......@@ -76,7 +76,7 @@
* @return string
*/
this.decode = function decode(str) {
/*jshint maxstatements:30 maxcomplexity:30 */
/*jshint maxstatements:30, maxcomplexity:30 */
var c1, c2, c3, c4, i = 0, len = str.length, out = "";
while (i < len) {
do {
......
......@@ -28,7 +28,7 @@
*
*/
/*global exports console patchRequire*/
/*global exports, console, patchRequire*/
var require = patchRequire(require);
var fs = require('fs');
......
......@@ -28,7 +28,7 @@
*
*/
/*global CasperError exports patchRequire*/
/*global CasperError, exports, patchRequire*/
var require = patchRequire(require);
var utils = require('utils');
......
......@@ -28,7 +28,7 @@
*
*/
/*global CasperError console exports phantom patchRequire*/
/*global CasperError, console, exports, phantom, patchRequire*/
var require = patchRequire(require);
var utils = require('utils');
......
......@@ -28,7 +28,7 @@
*
*/
/*global CasperError exports phantom __utils__ patchRequire*/
/*global CasperError, exports, phantom, __utils__, patchRequire*/
var require = patchRequire(require);
var fs = require('fs');
......@@ -924,7 +924,7 @@ Tester.prototype.comment = function comment(message) {
*/
Tester.prototype.done = function done() {
"use strict";
/*jshint maxstatements:20 maxcomplexity:20*/
/*jshint maxstatements:20, maxcomplexity:20*/
var planned, config = this.currentSuite.config;
if (utils.isNumber(arguments[0])) {
this.casper.warn('done() `planned` arg is deprecated as of 1.1');
......
......@@ -28,7 +28,7 @@
*
*/
/*global CasperError console exports phantom patchRequire*/
/*global CasperError, console, exports, phantom, patchRequire*/
var require = patchRequire(require);
......
......@@ -28,7 +28,7 @@
*
*/
/*global CasperError console exports phantom patchRequire*/
/*global CasperError, console, exports, phantom, patchRequire*/
var require = patchRequire(require);
var utils = require('utils');
......@@ -166,5 +166,6 @@ XUnitExporter.prototype.setResults = function setResults(results) {
if (!(results instanceof TestSuiteResult)) {
throw new CasperError('Invalid results type.');
}
return this.results = results;
this.results = results;
return results;
};
......