Skip to content

Commit d19d4c9

Browse files
devcrustdevcrust
committed
- fixed tests to use chai assert
1 parent a022916 commit d19d4c9

File tree

7 files changed

+55
-77
lines changed

7 files changed

+55
-77
lines changed

‎test/dependency/container.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/*global suite: false, setup: false, test: false*/
22

3-
var assert = require('assert'),
3+
var assert = require('chai').assert,
44
Container = require('../../src/lib/dependency/container.js');
55

66
suite('Dependency Container', function ()

‎test/dependency/core.js‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/*global suite: false, test: false*/
22

3-
var assert = require('assert'),
4-
util = require('util'),
3+
var util = require('util'),
4+
assert = require('chai').assert,
55
core = require('../../src/lib/dependency/core.js');
66

77
suite('Core Dependencies', function ()
@@ -14,13 +14,13 @@ suite('Core Dependencies', function ()
1414
{
1515

1616
// Check is array
17-
assert.equal(Array.isArray(modules), true, 'Modules is not an array');
17+
assert.isArray(modules, 'Modules is not an array');
1818

1919
// Check is object
20-
assert.equal(dependencies instanceof Object, true, 'Dependencies not an object');
20+
assert.isObject(dependencies, 'Dependencies not an object');
2121

2222
// Check matches content
23-
assert.deepEqual(Object.keys(dependencies), modules, 'Dependencies do not match');
23+
assert.deepEqual(Object.keys(dependencies).sort(), modules.sort(), 'Dependencies do not match');
2424

2525
});
2626

@@ -37,7 +37,7 @@ suite('Core Dependencies', function ()
3737
if (id === 'repl') {
3838

3939
// Check object keys only
40-
assert.deepEqual(Object.keys(dependencies[id]), Object.keys(require(id)),
40+
assert.deepEqual(Object.keys(dependencies[id]).sort(), Object.keys(require(id)).sort(),
4141
util.format('Result for core module "%s" does not match', id));
4242

4343
return;

‎test/dependency/npm.js‎

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/*global suite: false, test: false*/
22

3-
var assert = require('assert'),
4-
util = require('util'),
3+
var util = require('util'),
4+
assert = require('chai').assert,
55
npm = require('../../src/lib/dependency/npm.js');
66

77
suite('NPM Dependencies', function ()
@@ -75,13 +75,16 @@ suite('NPM Dependencies', function ()
7575
dependencies = npm.getDependencies(undefined, ['mocha']);
7676

7777
// Check equal
78-
assert.deepEqual(Object.keys(dependencies), ['blanket', 'coveralls', 'mocha-lcov-reporter'], 'Result does not match');
78+
assert.deepEqual(Object.keys(dependencies).sort(),
79+
['blanket', 'chai', 'coveralls', 'mocha-lcov-reporter'].sort(),
80+
'Result does not match');
7981

8082
// Get dependencies
8183
dependencies = npm.getDependencies(undefined, [/mocha/]);
8284

8385
// Check equal
84-
assert.deepEqual(Object.keys(dependencies), ['blanket', 'coveralls'], 'Result does not match');
86+
assert.deepEqual(Object.keys(dependencies).sort(), ['blanket', 'chai', 'coveralls'].sort(),
87+
'Result does not match');
8588

8689
});
8790

‎test/dips.js‎

Lines changed: 31 additions & 56 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/*global suite: false, test: false, setup: false*/
22

3-
var assert = require('assert'),
4-
path = require('path'),
3+
var path = require('path'),
4+
assert = require('chai').assert,
55
Dips = require('../src/dips.js'),
66
Container = require('../src/lib/dependency/container.js');
77

@@ -79,9 +79,9 @@ suite('Dips', function ()
7979
});
8080

8181
// Check equal
82-
assert.deepEqual(Object.keys(dips.$),
82+
assert.deepEqual(Object.keys(dips.$).sort(),
8383
Object.keys(require('../src/lib/entity/file.js').getEntities(['helpers', 'lib'],
84-
path.resolve(__dirname, '_fixtures'))), 'Result does not match');
84+
path.resolve(__dirname, '_fixtures'))).sort(), 'Result does not match');
8585

8686
// Check equal
8787
assert.equal(dips.resolve('not_exists'), undefined, 'Result does not match');
@@ -152,12 +152,12 @@ suite('Dips', function ()
152152
});
153153

154154
// Check equal
155-
assert.deepEqual(Object.keys(dips.$), Object.keys(require('../src/lib/entity/file.js').getEntities({
155+
assert.deepEqual(Object.keys(dips.$).sort(), Object.keys(require('../src/lib/entity/file.js').getEntities({
156156

157157
libraries : 'lib',
158158
json_helpers : 'helpers/view/json'
159159

160-
}, path.resolve(__dirname, '_fixtures'))), 'Result does not match');
160+
}, path.resolve(__dirname, '_fixtures'))).sort(), 'Result does not match');
161161

162162
/*
163163
* ---------------
@@ -190,12 +190,12 @@ suite('Dips', function ()
190190
});
191191

192192
// Check equal
193-
assert.deepEqual(Object.keys(dips.$), Object.keys(require('../src/lib/entity/file.js').getEntities({
193+
assert.deepEqual(Object.keys(dips.$).sort(), Object.keys(require('../src/lib/entity/file.js').getEntities({
194194

195195
libraries : 'lib',
196196
json_helpers : 'helpers/view/json'
197197

198-
}, path.resolve(__dirname, '_fixtures'), 'my')), 'Result does not match');
198+
}, path.resolve(__dirname, '_fixtures'), 'my')).sort(), 'Result does not match');
199199

200200
});
201201

@@ -260,7 +260,7 @@ suite('Dips', function ()
260260
*/
261261

262262
// Check equal
263-
assert.deepEqual(dips2.getContainers(), Object.keys(containers), 'Result does not match');
263+
assert.deepEqual(dips2.getContainers().sort(), Object.keys(containers).sort(), 'Result does not match');
264264

265265
});
266266

@@ -277,7 +277,7 @@ suite('Dips', function ()
277277
assert.deepEqual(dips.setContainers(containers), dips, 'Result does not match');
278278

279279
// Check equal
280-
assert.deepEqual(dips.getContainers(), Object.keys(containers), 'Result does not match');
280+
assert.deepEqual(dips.getContainers().sort(), Object.keys(containers).sort(), 'Result does not match');
281281

282282
// Check equal
283283
assert.deepEqual(dips.setContainers({}), dips, 'Result does not match');
@@ -301,7 +301,7 @@ suite('Dips', function ()
301301
assert.deepEqual(dips2.setContainers(containers), dips2, 'Result does not match');
302302

303303
// Check equal
304-
assert.deepEqual(dips2.getContainers(), Object.keys(containers), 'Result does not match');
304+
assert.deepEqual(dips2.getContainers().sort(), Object.keys(containers).sort(), 'Result does not match');
305305

306306
});
307307

@@ -350,7 +350,8 @@ suite('Dips', function ()
350350
*/
351351

352352
// Check equal
353-
assert.deepEqual(dips2.getContainer(Object.keys(containers)[0]), containers[Object.keys(containers)[0]],
353+
assert.deepEqual(dips2.getContainer(Object.keys(containers).sort()[0]),
354+
containers[Object.keys(containers).sort()[0]],
354355
'Result does not match')
355356

356357
// Check equal
@@ -473,13 +474,10 @@ suite('Dips', function ()
473474
// Add dips
474475
keys.push('dips');
475476

476-
// Sort keys
477-
keys.sort()
478-
479477
return keys;
480478

481479

482-
})(), 'Result does not match');
480+
})().sort(), 'Result does not match');
483481

484482
/*
485483
* ---------------
@@ -494,15 +492,12 @@ suite('Dips', function ()
494492
var keys = Object.keys(dependencies);
495493

496494
// Add dips
497-
keys.unshift('dips');
498-
499-
// Sort keys
500-
keys.sort()
495+
keys.push('dips');
501496

502497
return keys;
503498

504499

505-
})(), 'Result does not match');
500+
})().sort(), 'Result does not match');
506501

507502
});
508503

@@ -543,7 +538,8 @@ suite('Dips', function ()
543538
assert.equal(dips2.hasDependency('http'), true, 'Dependency does not exist');
544539

545540
// Check equal
546-
assert.deepEqual(dips2.getDependencies().sort(), Object.keys(dependencies2).sort(), 'Result does not match');
541+
assert.deepEqual(dips2.getDependencies().sort(), Object.keys(dependencies2).sort(),
542+
'Result does not match');
547543

548544
// Set dependencies
549545
assert.deepEqual(dips2.setDependencies(dependencies), dips2, 'Result does not match');
@@ -692,15 +688,12 @@ suite('Dips', function ()
692688
var keys = Object.keys(require('../src/lib/dependency/core.js').getDependencies());
693689

694690
// Add dips
695-
keys.unshift('dips');
696-
697-
// Sort keys
698-
keys.sort();
691+
keys.push('dips');
699692

700693
return keys;
701694

702695

703-
})(), 'Result does not match');
696+
})().sort(), 'Result does not match');
704697

705698
/*
706699
* ---------------
@@ -730,15 +723,12 @@ suite('Dips', function ()
730723
var keys = Object.keys(require('../src/lib/dependency/core.js').getDependencies('core'));
731724

732725
// Add dips
733-
keys.unshift('dips');
734-
735-
// Sort keys
736-
keys.sort();
726+
keys.push('dips');
737727

738728
return keys;
739729

740730

741-
})(), 'Result does not match');
731+
})().sort(), 'Result does not match');
742732

743733
});
744734

@@ -771,13 +761,10 @@ suite('Dips', function ()
771761
// Add dips
772762
keys.push('dips');
773763

774-
// Sort keys
775-
keys.sort();
776-
777764
return keys;
778765

779766

780-
})(), 'Result does not match');
767+
})().sort(), 'Result does not match');
781768

782769
/*
783770
* ---------------
@@ -807,15 +794,12 @@ suite('Dips', function ()
807794
var keys = Object.keys(require('../src/lib/dependency/npm.js').getDependencies('npm'));
808795

809796
// Add dips
810-
keys.unshift('dips');
811-
812-
// Sort keys
813-
keys.sort()
797+
keys.push('dips');
814798

815799
return keys;
816800

817801

818-
})(), 'Result does not match');
802+
})().sort(), 'Result does not match');
819803

820804
/*
821805
* ----------------
@@ -845,15 +829,12 @@ suite('Dips', function ()
845829
var keys = Object.keys(require('../src/lib/dependency/npm.js').getDependencies(undefined, ['mocha']));
846830

847831
// Add dips
848-
keys.unshift('dips');
849-
850-
// Sort keys
851-
keys.sort()
832+
keys.push('dips');
852833

853834
return keys;
854835

855836

856-
})(), 'Result does not match');
837+
})().sort(), 'Result does not match');
857838

858839
});
859840

@@ -902,15 +883,12 @@ suite('Dips', function ()
902883
require('../src/lib/dependency/core.js').getDependencies()));
903884

904885
// Add dips
905-
keys.unshift('dips');
906-
907-
// Sort keys
908-
keys.sort();
886+
keys.push('dips');
909887

910888
return keys;
911889

912890

913-
})(), 'Result does not match');
891+
})().sort(), 'Result does not match');
914892

915893
/*
916894
* ---------------
@@ -947,15 +925,12 @@ suite('Dips', function ()
947925
require('../src/lib/dependency/core.js').getDependencies('core')));
948926

949927
// Add dips
950-
keys.unshift('dips');
951-
952-
// Sort keys
953-
keys.sort();
928+
keys.push('dips');
954929

955930
return keys;
956931

957932

958-
})(), 'Result does not match');
933+
})().sort(), 'Result does not match');
959934

960935
});
961936

‎test/entity/file.js‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/*global suite: false, test: false*/
22

3-
var assert = require('assert'),
4-
path = require('path'),
3+
var path = require('path'),
4+
assert = require('chai').assert,
55
file = require('../../src/lib/entity/file.js');
66

77
suite('File Entities', function ()

‎test/helper/arguments.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/*global suite: false, test: false*/
22

3-
var assert = require('assert'),
3+
var assert = require('chai').assert,
44
Container = require('../../src/lib/dependency/container.js'),
55
args = require('../../src/lib/helper/arguments.js');
66

0 commit comments

Comments
 (0)