Skip to content

Commit 3a4b7e0

Browse files
committed
Enforce coding standards
This repo already had jshint and jscs rules, but they weren't enforced by the test suite and they weren't being followed consistently. This adds jshint and jscs checking to Travis and cleans up the places where they were failing.
1 parent e3bd05f commit 3a4b7e0

File tree

4 files changed

+24
-23
lines changed

4 files changed

+24
-23
lines changed

.jshintrc

Lines changed: 5 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -13,20 +13,17 @@
1313
"expect",
1414
"ok",
1515
"throws",
16-
"define",
17-
"loader",
18-
"require",
19-
"requirejs",
2016
"test",
21-
"-Promise"
17+
"-Promise",
18+
"module"
2219
],
2320
"expr": true,
2421
"proto": true,
2522
"strict": true,
2623
"indent": 2,
27-
"camelcase": true,
28-
"node": true,
29-
"browser": false,
24+
"camelcase": false,
25+
"node": false,
26+
"browser": true,
3027
"boss": true,
3128
"curly": true,
3229
"latedef": "nofunc",

lib/loader/loader.js

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,8 @@ var loader, define, requireModule, require, requirejs;
33
(function(global) {
44
'use strict';
55

6+
var stats;
7+
68
// Save off the original values of these globals, so we can restore them if someone asks us to
79
var oldGlobals = {
810
loader: loader,
@@ -40,7 +42,6 @@ var loader, define, requireModule, require, requirejs;
4042
requirejs._stats = stats;
4143
}
4244

43-
var stats;
4445

4546
resetStats();
4647

@@ -132,7 +133,7 @@ var loader, define, requireModule, require, requirejs;
132133
this.finalized = false;
133134
this._foundDeps = false;
134135
this.isPending = false;
135-
this.module = { exports: {}};
136+
this.module = { exports: {} };
136137
};
137138

138139
Module.prototype.reify = function() {
@@ -179,7 +180,7 @@ var loader, define, requireModule, require, requirejs;
179180
r['default'] = r;
180181
r.has = function(dep) {
181182
return has(resolve(dep, name));
182-
}
183+
};
183184
return r;
184185
};
185186

package.json

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,13 +9,15 @@
99
"dependencies": {},
1010
"devDependencies": {
1111
"ara": "0.0.3",
12+
"jscs": "^2.11.0",
13+
"jshint": "^2.9.2",
1214
"ora": "^0.2.1",
1315
"promise-map-series": "^0.2.2",
1416
"qunitjs": "^1.20.0",
1517
"testem": "^1.0.0"
1618
},
1719
"scripts": {
18-
"test": "testem ci",
20+
"test": "testem ci && jshint lib tests && jscs lib tests",
1921
"test:dev": "testem"
2022
},
2123
"author": "",

tests/all.js

Lines changed: 12 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
/*globals newDefine:false, newLoader:false, newRequire:false*/
2-
/*globals define:true, loader:true, require:true*/
2+
/*globals define:true, loader:true, require:true, requirejs:true */
3+
/* jshint -W097 */
34

45
'use strict';
56

@@ -460,7 +461,7 @@ test('already evaluated modules are not pushed into the queue', function() {
460461
};
461462
});
462463

463-
var bar = require('bar');
464+
require('bar');
464465
deepEqual(require._stats, {
465466
findDeps: 2,
466467
define: 2,
@@ -474,7 +475,7 @@ test('already evaluated modules are not pushed into the queue', function() {
474475
pendingQueueLength: 2
475476
});
476477

477-
var foo = require('foo');
478+
require('foo');
478479
deepEqual(require._stats, {
479480
findDeps: 2,
480481
define: 2,
@@ -502,7 +503,7 @@ test('same pending modules should not be pushed to the queue more than once', fu
502503
};
503504
});
504505

505-
var bar = require('bar');
506+
require('bar');
506507
deepEqual(require._stats, {
507508
findDeps: 2,
508509
define: 2,
@@ -515,7 +516,7 @@ test('same pending modules should not be pushed to the queue more than once', fu
515516
resolveRelative: 0,
516517
pendingQueueLength: 2
517518
});
518-
})
519+
});
519520

520521
test('basic CJS mode', function() {
521522
define('a/foo', ['require', 'exports', 'module'], function(require, exports, module) {
@@ -1051,7 +1052,7 @@ test('alias with target \w deps', function() {
10511052
return bar;
10521053
});
10531054

1054-
define('bar', [], function(bar) {
1055+
define('bar', [], function() {
10551056
return 'I AM BAR';
10561057
});
10571058

@@ -1074,7 +1075,7 @@ test('alias with target \w deps', function() {
10741075
});
10751076

10761077
test('alias chain (simple)', function() {
1077-
define('bar', [], function(bar) {
1078+
define('bar', [], function() {
10781079
return 'I AM BAR';
10791080
});
10801081

@@ -1098,7 +1099,7 @@ test('alias chain (simple)', function() {
10981099
});
10991100

11001101
test('alias chain (long)', function() {
1101-
define('bar', [], function(bar) {
1102+
define('bar', [], function() {
11021103
return 'I AM BAR';
11031104
});
11041105

@@ -1124,11 +1125,11 @@ test('alias chain (long)', function() {
11241125
});
11251126

11261127
test('alias chains are lazy', function() {
1127-
define('bar', [], function(bar) {
1128+
define('bar', [], function() {
11281129
return 'I AM BAR';
11291130
});
11301131

1131-
define('bar2', [], function(bar) {
1132+
define('bar2', [], function() {
11321133
return 'I AM BAR2';
11331134
});
11341135

@@ -1162,7 +1163,7 @@ test('alias chains are lazy', function() {
11621163
test('alias chains propogate unsee', function() {
11631164
var counter = 0;
11641165

1165-
define('bar', [], function(bar) {
1166+
define('bar', [], function() {
11661167
counter++;
11671168
return 'I AM BAR';
11681169
});

0 commit comments

Comments
 (0)