Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 15 additions & 0 deletions assert.js
Original file line number Diff line number Diff line change
Expand Up @@ -194,6 +194,21 @@ function getMessage(self) {
// display purposes.

function fail(actual, expected, message, operator, stackStartFunction) {
if (!expected && !message && !operator) {
if (actual) {
message = actual
}
else {
message = "Failed"
}
}
else if (actual && expected && !operator) {
operator = "!="
}

if (actual && expected && !message) {
message = actual.toString() + " " + operator.toString() + " " + expected.toString();
}
throw new assert.AssertionError({
message: message,
actual: actual,
Expand Down
84 changes: 84 additions & 0 deletions test.js
Original file line number Diff line number Diff line change
Expand Up @@ -342,4 +342,88 @@ function tests (assert, what) {
assert.equal(e.toString().split('\n')[0], 'AssertionError: oh no');
}
});

test('assert.fail - actual, expected, operator', function() {
var threw;

try {
threw = false;
assert.fail(1, 2, undefined, ">");
}
catch(e) {
threw = true
assert.equal(e.message, "1 > 2")
}
assert.ok(threw, "Error was not thrown.");
})

test('assert.fail - actual, expected, message', function() {
var threw;

try {
threw = false;
assert.fail(1, 2, 'fail');
}
catch(e) {
threw = true
assert.equal(e.message, "fail")
}
assert.ok(threw, "Error was not thrown.");
})

test('assert.fail - actual, expected, message, operator', function() {
var threw;

try {
threw = false;
assert.fail(1, 2, 'whoops', '>');
}
catch(e) {
threw = true
assert.equal(e.message, "whoops")
}
assert.ok(threw, "Error was not thrown.");
})

test('assert.fail - (no parameters)', function() {
var threw;

try {
threw = false;
assert.fail();
}
catch(e) {
threw = true
assert.equal(e.message, "Failed")
}
assert.ok(threw, "Error was not thrown.");
})

test('assert.fail - message', function() {
var threw;

try {
threw = false;
assert.fail("boom");
}
catch(e) {
threw = true
assert.equal(e.message, "boom")
}
assert.ok(threw, "Error was not thrown.");
})

test('assert.fail - actual, expected', function() {
var threw;

try {
threw = false;
assert.fail('a', 'b');
}
catch(e) {
threw = true
assert.equal(e.message, "a != b")
}
assert.ok(threw, "Error was not thrown.");
})
}