Merge pull request #2669 from MaxLeiter/humandate-refactor
refactor getHumanDate() to accept a timestamp; avoids possible test failure; more accurate log times
This commit is contained in:
commit
e8c02d5ad2
@ -32,7 +32,7 @@ module.exports = {
|
||||
read(options, callback);
|
||||
},
|
||||
|
||||
getHumanDate() {
|
||||
return moment().format("YYYY-MM-DD HH:mm:ss");
|
||||
getHumanDate(ts) {
|
||||
return moment(ts).format("YYYY-MM-DD HH:mm:ss");
|
||||
},
|
||||
};
|
||||
|
@ -41,7 +41,7 @@ class TextFileMessageStorage {
|
||||
return;
|
||||
}
|
||||
|
||||
let line = `[${log.getHumanDate()}] `;
|
||||
let line = `[${log.getHumanDate(msg.time)}] `;
|
||||
|
||||
// message types from src/models/msg.js
|
||||
switch (msg.type) {
|
||||
|
@ -56,6 +56,6 @@ describe("Helper", function() {
|
||||
});
|
||||
|
||||
describe("#getHumanDate()", function() {
|
||||
expect(log.getHumanDate()).to.equal(moment().format("YYYY-MM-DD HH:mm:ss"));
|
||||
expect(log.getHumanDate(moment(1455090480000).utc())).to.equal("2016-02-10 07:48:00");
|
||||
});
|
||||
});
|
||||
|
Loading…
Reference in New Issue
Block a user