Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

util,test: Use consistent Date representation for util/inspect #4318

Closed
wants to merge 1 commit into from
Closed

util,test: Use consistent Date representation for util/inspect #4318

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 2 additions & 2 deletions lib/util.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -269,7 +269,7 @@ function formatValue(ctx, value, recurseTimes) {
return ctx.stylize(RegExp.prototype.toString.call(value), 'regexp');
}
if (isDate(value)) {
return ctx.stylize(Date.prototype.toString.call(value), 'date');
return ctx.stylize(Date.prototype.toISOString.call(value), 'date');
}
if (isError(value)) {
return formatError(value);
Expand Down Expand Up @@ -390,7 +390,7 @@ function formatValue(ctx, value, recurseTimes) {

// Make dates with properties first say the date
if (isDate(value)) {
base = ' ' + Date.prototype.toUTCString.call(value);
base = ' ' + Date.prototype.toISOString.call(value);
}

// Make error with message first say the error
Expand Down
10 changes: 8 additions & 2 deletions test/parallel/test-util-inspect.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ assert.equal(util.inspect(undefined), 'undefined');
assert.equal(util.inspect(null), 'null');
assert.equal(util.inspect(/foo(bar\n)?/gi), '/foo(bar\\n)?/gi');
assert.equal(util.inspect(new Date('Sun, 14 Feb 2010 11:48:40 GMT')),
new Date('2010-02-14T12:48:40+01:00').toString());
new Date('2010-02-14T12:48:40+01:00').toISOString());

assert.equal(util.inspect('\n\u0001'), "'\\n\\u0001'");

Expand Down Expand Up @@ -220,7 +220,7 @@ assert.equal(util.inspect(value), '{ /123/gi aprop: 42 }');
// Dates with properties
value = new Date('Sun, 14 Feb 2010 11:48:40 GMT');
value.aprop = 42;
assert.equal(util.inspect(value), '{ Sun, 14 Feb 2010 11:48:40 GMT aprop: 42 }'
assert.equal(util.inspect(value), '{ 2010-02-14T11:48:40.000Z aprop: 42 }'
);

// test the internal isDate implementation
Expand Down Expand Up @@ -313,6 +313,12 @@ assert.doesNotThrow(function() {
util.inspect(d);
});

assert.doesNotThrow(function() {
var d = new Date();
d.toISOString = null;
util.inspect(d);
});

assert.doesNotThrow(function() {
var r = /regexp/;
r.toString = null;
Expand Down