upgraded jshint to 1.0.0
Showing
13 changed files
with
18 additions
and
20 deletions
... | @@ -3,7 +3,7 @@ branches: | ... | @@ -3,7 +3,7 @@ branches: |
3 | - "master" | 3 | - "master" |
4 | - "1.0" | 4 | - "1.0" |
5 | before_script: | 5 | before_script: |
6 | - "npm install -g jshint@0.9.1" | 6 | - "npm install -g jshint@1.0.0" |
7 | - "phantomjs --version" | 7 | - "phantomjs --version" |
8 | - "export PHANTOMJS_EXECUTABLE='phantomjs --local-to-remote-url-access=yes --ignore-ssl-errors=yes'" | 8 | - "export PHANTOMJS_EXECUTABLE='phantomjs --local-to-remote-url-access=yes --ignore-ssl-errors=yes'" |
9 | script: | 9 | script: | ... | ... |
... | @@ -28,8 +28,8 @@ | ... | @@ -28,8 +28,8 @@ |
28 | * | 28 | * |
29 | */ | 29 | */ |
30 | 30 | ||
31 | /*global console phantom require*/ | 31 | /*global console, phantom, require:true*/ |
32 | /*jshint maxstatements:30 maxcomplexity:10*/ | 32 | /*jshint maxstatements:30, maxcomplexity:10*/ |
33 | 33 | ||
34 | // phantom check | 34 | // phantom check |
35 | if (!phantom) { | 35 | if (!phantom) { | ... | ... |
... | @@ -28,7 +28,7 @@ | ... | @@ -28,7 +28,7 @@ |
28 | * | 28 | * |
29 | */ | 29 | */ |
30 | 30 | ||
31 | /*global CasperError console exports phantom __utils__ patchRequire*/ | 31 | /*global CasperError, console, exports, phantom, __utils__, patchRequire*/ |
32 | 32 | ||
33 | var require = patchRequire(require); | 33 | var require = patchRequire(require); |
34 | var colorizer = require('colorizer'); | 34 | var colorizer = require('colorizer'); | ... | ... |
... | @@ -28,7 +28,7 @@ | ... | @@ -28,7 +28,7 @@ |
28 | * | 28 | * |
29 | */ | 29 | */ |
30 | 30 | ||
31 | /*global CasperError console exports phantom patchRequire*/ | 31 | /*global CasperError, console, exports, phantom, patchRequire*/ |
32 | 32 | ||
33 | var require = patchRequire(require); | 33 | var require = patchRequire(require); |
34 | var utils = require('utils'); | 34 | var utils = require('utils'); | ... | ... |
... | @@ -28,7 +28,7 @@ | ... | @@ -28,7 +28,7 @@ |
28 | * | 28 | * |
29 | */ | 29 | */ |
30 | 30 | ||
31 | /*global console escape exports NodeList window*/ | 31 | /*global console, escape, exports, NodeList, window*/ |
32 | 32 | ||
33 | (function(exports) { | 33 | (function(exports) { |
34 | "use strict"; | 34 | "use strict"; |
... | @@ -76,7 +76,7 @@ | ... | @@ -76,7 +76,7 @@ |
76 | * @return string | 76 | * @return string |
77 | */ | 77 | */ |
78 | this.decode = function decode(str) { | 78 | this.decode = function decode(str) { |
79 | /*jshint maxstatements:30 maxcomplexity:30 */ | 79 | /*jshint maxstatements:30, maxcomplexity:30 */ |
80 | var c1, c2, c3, c4, i = 0, len = str.length, out = ""; | 80 | var c1, c2, c3, c4, i = 0, len = str.length, out = ""; |
81 | while (i < len) { | 81 | while (i < len) { |
82 | do { | 82 | do { | ... | ... |
... | @@ -28,7 +28,7 @@ | ... | @@ -28,7 +28,7 @@ |
28 | * | 28 | * |
29 | */ | 29 | */ |
30 | 30 | ||
31 | /*global exports console patchRequire*/ | 31 | /*global exports, console, patchRequire*/ |
32 | 32 | ||
33 | var require = patchRequire(require); | 33 | var require = patchRequire(require); |
34 | var fs = require('fs'); | 34 | var fs = require('fs'); | ... | ... |
... | @@ -28,7 +28,7 @@ | ... | @@ -28,7 +28,7 @@ |
28 | * | 28 | * |
29 | */ | 29 | */ |
30 | 30 | ||
31 | /*global CasperError exports patchRequire*/ | 31 | /*global CasperError, exports, patchRequire*/ |
32 | 32 | ||
33 | var require = patchRequire(require); | 33 | var require = patchRequire(require); |
34 | var utils = require('utils'); | 34 | var utils = require('utils'); | ... | ... |
... | @@ -28,7 +28,7 @@ | ... | @@ -28,7 +28,7 @@ |
28 | * | 28 | * |
29 | */ | 29 | */ |
30 | 30 | ||
31 | /*global CasperError console exports phantom patchRequire*/ | 31 | /*global CasperError, console, exports, phantom, patchRequire*/ |
32 | 32 | ||
33 | var require = patchRequire(require); | 33 | var require = patchRequire(require); |
34 | var utils = require('utils'); | 34 | var utils = require('utils'); | ... | ... |
... | @@ -28,7 +28,7 @@ | ... | @@ -28,7 +28,7 @@ |
28 | * | 28 | * |
29 | */ | 29 | */ |
30 | 30 | ||
31 | /*global CasperError exports phantom __utils__ patchRequire*/ | 31 | /*global CasperError, exports, phantom, __utils__, patchRequire*/ |
32 | 32 | ||
33 | var require = patchRequire(require); | 33 | var require = patchRequire(require); |
34 | var fs = require('fs'); | 34 | var fs = require('fs'); |
... | @@ -924,7 +924,7 @@ Tester.prototype.comment = function comment(message) { | ... | @@ -924,7 +924,7 @@ Tester.prototype.comment = function comment(message) { |
924 | */ | 924 | */ |
925 | Tester.prototype.done = function done() { | 925 | Tester.prototype.done = function done() { |
926 | "use strict"; | 926 | "use strict"; |
927 | /*jshint maxstatements:20 maxcomplexity:20*/ | 927 | /*jshint maxstatements:20, maxcomplexity:20*/ |
928 | var planned, config = this.currentSuite.config; | 928 | var planned, config = this.currentSuite.config; |
929 | if (utils.isNumber(arguments[0])) { | 929 | if (utils.isNumber(arguments[0])) { |
930 | this.casper.warn('done() `planned` arg is deprecated as of 1.1'); | 930 | this.casper.warn('done() `planned` arg is deprecated as of 1.1'); | ... | ... |
... | @@ -28,7 +28,7 @@ | ... | @@ -28,7 +28,7 @@ |
28 | * | 28 | * |
29 | */ | 29 | */ |
30 | 30 | ||
31 | /*global CasperError console exports phantom patchRequire*/ | 31 | /*global CasperError, console, exports, phantom, patchRequire*/ |
32 | 32 | ||
33 | var require = patchRequire(require); | 33 | var require = patchRequire(require); |
34 | var utils = require('utils'); | 34 | var utils = require('utils'); |
... | @@ -166,5 +166,6 @@ XUnitExporter.prototype.setResults = function setResults(results) { | ... | @@ -166,5 +166,6 @@ XUnitExporter.prototype.setResults = function setResults(results) { |
166 | if (!(results instanceof TestSuiteResult)) { | 166 | if (!(results instanceof TestSuiteResult)) { |
167 | throw new CasperError('Invalid results type.'); | 167 | throw new CasperError('Invalid results type.'); |
168 | } | 168 | } |
169 | return this.results = results; | 169 | this.results = results; |
170 | return results; | ||
170 | }; | 171 | }; | ... | ... |
-
Please register or sign in to post a comment