Skip to content

Commit 09b53da

Browse files
committed
Update tests:
- rename assert.eql to assert.equal. assert.eql is undefined in Node v0.3.1+ (http://nodejs.org/docs/v0.3.1/api/assert.html) - require accepts relative paths
1 parent 01da667 commit 09b53da

File tree

2 files changed

+23
-23
lines changed

2 files changed

+23
-23
lines changed

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
"url": "git://github.com/kpdecker/jsdiff.git"
2525
},
2626
"engines": {
27-
"node": ">=0.1.9"
27+
"node": ">=0.3.1"
2828
},
2929
"main": "./diff",
3030
"scripts": {

test/diffTest.js

Lines changed: 22 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,21 @@
11
const VERBOSE = false;
22

33
var assert = require('assert'),
4-
diff = require('diff');
4+
diff = require('../diff');
55

66
function log() {
77
VERBOSE && console.log.apply(console, arguments);
88
}
99

1010
exports['Whitespace diff'] = function() {
1111
diffResult = diff.diffWords("New Value", "New ValueMoreData");
12-
assert.eql(
12+
assert.equal(
1313
"New <ins>ValueMoreData</ins><del>Value</del>",
1414
diff.convertChangesToXML(diffResult),
1515
"Single whitespace diffResult Value");
1616

1717
diffResult = diff.diffWords("New Value ", "New ValueMoreData ");
18-
assert.eql(
18+
assert.equal(
1919
"New <ins>ValueMoreData</ins><del>Value</del> ",
2020
diff.convertChangesToXML(diffResult),
2121
"Multiple whitespace diffResult Value");
@@ -24,22 +24,22 @@ exports['Whitespace diff'] = function() {
2424
// Diff on word boundary
2525
exports['Word Diff'] = function() {
2626
diffResult = diff.diffWords("New :Value:Test", "New ValueMoreData ");
27-
assert.eql(
27+
assert.equal(
2828
"New <ins>ValueMoreData </ins><del>:Value:Test</del>",
2929
diff.convertChangesToXML(diffResult),
3030
"Nonmatching word boundary diffResult Value");
3131
diffResult = diff.diffWords("New Value:Test", "New Value:MoreData ");
32-
assert.eql(
32+
assert.equal(
3333
"New Value:<ins>MoreData </ins><del>Test</del>",
3434
diff.convertChangesToXML(diffResult),
3535
"Word boundary diffResult Value");
3636
diffResult = diff.diffWords("New Value-Test", "New Value:MoreData ");
37-
assert.eql(
37+
assert.equal(
3838
"New Value<ins>:MoreData </ins><del>-Test</del>",
3939
diff.convertChangesToXML(diffResult),
4040
"Uninque boundary diffResult Value");
4141
diffResult = diff.diffWords("New Value", "New Value:MoreData ");
42-
assert.eql(
42+
assert.equal(
4343
"New Value<ins>:MoreData </ins>",
4444
diff.convertChangesToXML(diffResult),
4545
"Word boundary diffResult Value");
@@ -48,17 +48,17 @@ exports['Word Diff'] = function() {
4848
// Diff without changes
4949
exports['Diff without changes'] = function() {
5050
diffResult = diff.diffWords("New Value", "New Value");
51-
assert.eql(
51+
assert.equal(
5252
"New Value",
5353
diff.convertChangesToXML(diffResult),
5454
"No changes diffResult Value");
5555
diffResult = diff.diffWords("New Value", "New Value");
56-
assert.eql(
56+
assert.equal(
5757
"New Value",
5858
diff.convertChangesToXML(diffResult),
5959
"No changes whitespace diffResult Value");
6060
diffResult = diff.diffWords("", "");
61-
assert.eql(
61+
assert.equal(
6262
"",
6363
diff.convertChangesToXML(diffResult),
6464
"Empty no changes diffResult Value");
@@ -67,21 +67,21 @@ exports['Diff without changes'] = function() {
6767
// Empty diffs
6868
exports['Empty diffs'] = function() {
6969
diffResult = diff.diffWords("New Value", "");
70-
assert.eql(1, diffResult.length, "Empty diff result length");
71-
assert.eql(
70+
assert.equal(1, diffResult.length, "Empty diff result length");
71+
assert.equal(
7272
"<del>New Value</del>",
7373
diff.convertChangesToXML(diffResult),
7474
"Empty diffResult Value");
7575
diffResult = diff.diffWords("", "New Value");
76-
assert.eql(
76+
assert.equal(
7777
"<ins>New Value</ins>",
7878
diff.convertChangesToXML(diffResult),
7979
"Empty diffResult Value");
8080
};
8181

8282
// With without anchor (the Heckel algorithm error case)
8383
diffResult = diff.diffWords("New Value New Value", "Value Value New New");
84-
assert.eql(
84+
assert.equal(
8585
"<ins>Value</ins><del>New</del> Value New <ins>New</ins><del>Value</del>",
8686
diff.convertChangesToXML(diffResult),
8787
"No anchor diffResult Value");
@@ -91,7 +91,7 @@ exports['CSS diffs'] = function() {
9191
diffResult = diff.diffCss(
9292
".test,#value .test{margin-left:50px;margin-right:-40px}",
9393
".test2, #value2 .test {\nmargin-top:50px;\nmargin-right:-400px;\n}");
94-
assert.eql(
94+
assert.equal(
9595
"<ins>.test2</ins><del>.test</del>,<del>#value</del> <ins>#value2 </ins>.test<ins> </ins>{<ins>\n"
9696
+ "margin-top</ins><del>margin-left</del>:50px;<ins>\n</ins>"
9797
+ "margin-right:<ins>-400px;\n</ins><del>-40px</del>}",
@@ -104,14 +104,14 @@ exports['Line diffs'] = function() {
104104
diffResult = diff.diffLines(
105105
"line\nold value\nline",
106106
"line\nnew value\nline");
107-
assert.eql(
107+
assert.equal(
108108
"line\n<ins>new value\n</ins><del>old value\n</del>line",
109109
diff.convertChangesToXML(diffResult),
110110
"Line diffResult Value");
111111
diffResult = diff.diffLines(
112112
"line\nvalue\nline",
113113
"line\nvalue\nline");
114-
assert.eql(
114+
assert.equal(
115115
"line\nvalue\nline",
116116
diff.convertChangesToXML(diffResult),
117117
"Line same diffResult Value");
@@ -120,7 +120,7 @@ exports['Line diffs'] = function() {
120120
"line\nvalue\nline");
121121
log("diffResult", diffResult);
122122
log("diffResult", diff.convertChangesToXML(diffResult));
123-
assert.eql(
123+
assert.equal(
124124
"line\n<ins>value\n</ins><del>value \n</del>line",
125125
diff.convertChangesToXML(diffResult),
126126
"Line whitespace diffResult Value");
@@ -354,8 +354,8 @@ exports['Large Test'] = function() {
354354
}
355355

356356
log("diffResult remove length: " + removeCount);
357-
assert.eql(largeTest.replace(/s+/g, ""), removeChanges.join("").replace(/s+/g, ""), "New Diff results match");
358-
assert.eql(largeNewValue.replace(/s+/g, ""), addChanges.join("").replace(/s+/g, ""), "Old Diff results match");
357+
assert.equal(largeTest.replace(/s+/g, ""), removeChanges.join("").replace(/s+/g, ""), "New Diff results match");
358+
assert.equal(largeNewValue.replace(/s+/g, ""), addChanges.join("").replace(/s+/g, ""), "Old Diff results match");
359359
};
360360

361361
exports['Patch'] = function() {
@@ -485,7 +485,7 @@ exports['Patch'] = function() {
485485
+ "\\ No newline at end of file\n";
486486

487487
diffResult = diff.createPatch("testFileName", oldFile, newFile, "Old Header", "New Header");
488-
assert.eql(
488+
assert.equal(
489489
expectedResult,
490490
diffResult,
491491
"Patch diffResult Value");
@@ -497,7 +497,7 @@ exports['Patch'] = function() {
497497
+ "+++ testFileName\tNew Header\n"
498498
+ "\\ No newline at end of file\n";
499499
diffResult = diff.createPatch("testFileName", oldFile, oldFile, "Old Header", "New Header");
500-
assert.eql(
500+
assert.equal(
501501
expectedResult,
502502
diffResult,
503503
"Patch same diffResult Value");

0 commit comments

Comments
 (0)