From 0e5b56c6bb72c3cddee96ede34b2c6c84961c4bf Mon Sep 17 00:00:00 2001 From: Kornel Kielczewski Date: Tue, 19 Jul 2016 15:15:46 +0200 Subject: [PATCH 1/2] issue #4114: ui mtime for workspace files fix --- src/js/components/TaskFileListComponent.jsx | 2 +- src/test/units/TaskFileListComponent.test.js | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/js/components/TaskFileListComponent.jsx b/src/js/components/TaskFileListComponent.jsx index 0bd49e629..9680c1a35 100644 --- a/src/js/components/TaskFileListComponent.jsx +++ b/src/js/components/TaskFileListComponent.jsx @@ -114,7 +114,7 @@ var TaskFileListComponent = React.createClass({ return lazy(files) .sortBy(app => app[sortKey], state.sortDescending) .map(file => { - var lastModifiedDate = new Date(file.mtime); + var lastModifiedDate = new Date(file.mtime * 1000); var lastModifiedIsoString = lastModifiedDate.toISOString(); return ( diff --git a/src/test/units/TaskFileListComponent.test.js b/src/test/units/TaskFileListComponent.test.js index f324e62a5..70a5685c5 100644 --- a/src/test/units/TaskFileListComponent.test.js +++ b/src/test/units/TaskFileListComponent.test.js @@ -38,7 +38,7 @@ describe("TaskFileListComponent", function () { files: [{ gid: "staff", mode: "-rw-r--r--", - mtime: 1449573729, + mtime: 1000, nlink: 1, path: "/file/path/filename", size: 506, @@ -118,9 +118,9 @@ describe("TaskFileListComponent", function () { var firstTableRow = this.component.find("tbody").find("tr").first(); var mtimeCell = firstTableRow.find("td").at(6); expect(mtimeCell.text()) - .to.equal(new Date(1449573729).toLocaleString()); + .to.equal(new Date(1000 * 1000).toLocaleString()); expect(mtimeCell.find("time").props().dateTime) - .to.equal("1970-01-17T18:39:33.729Z"); + .to.equal("1970-01-01T00:16:40.000Z"); }); }); From 0fef7c96c526eb9ef06a0d026d58735f98991b52 Mon Sep 17 00:00:00 2001 From: Kornel Kielczewski Date: Tue, 19 Jul 2016 15:40:22 +0200 Subject: [PATCH 2/2] issue #4114: Removed npm install -g npm --- .travis.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 8c6a69f97..def0607f8 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,6 +1,5 @@ language: node_js before_install: - - npm install -g npm - npm cache clear - npm install -g gulp node_js: