From dd686b563d692b31a41b99a25ad80098ec628369 Mon Sep 17 00:00:00 2001 From: Pavel Djundik Date: Wed, 12 Sep 2018 21:09:43 +0300 Subject: [PATCH] Remove tests, fix lint, update packages --- client/components/DateMarker.vue | 12 +++++----- .../js/libs/handlebars/friendlydateTest.js | 24 ------------------- .../js/libs/handlebars/localedateTest.js | 19 --------------- 3 files changed, 6 insertions(+), 49 deletions(-) delete mode 100644 test/client/js/libs/handlebars/friendlydateTest.js delete mode 100644 test/client/js/libs/handlebars/localedateTest.js diff --git a/client/components/DateMarker.vue b/client/components/DateMarker.vue index 33e0d8bb..ce7568aa 100644 --- a/client/components/DateMarker.vue +++ b/client/components/DateMarker.vue @@ -18,6 +18,11 @@ export default { props: { message: Object, }, + computed: { + localeDate() { + return moment(this.message.time).format("D MMMM YYYY"); + }, + }, mounted() { if (this.hoursPassed() < 48) { this.$root.$on("daychange", this.dayChange); @@ -26,14 +31,9 @@ export default { beforeDestroy() { this.$root.$off("daychange", this.dayChange); }, - computed: { - localeDate() { - return moment(this.message.time).format("D MMMM YYYY"); - }, - }, methods: { hoursPassed() { - return moment.duration(moment().diff(moment(this.message.time))).asHours() + return moment.duration(moment().diff(moment(this.message.time))).asHours(); }, dayChange() { this.$forceUpdate(); diff --git a/test/client/js/libs/handlebars/friendlydateTest.js b/test/client/js/libs/handlebars/friendlydateTest.js deleted file mode 100644 index d9091e11..00000000 --- a/test/client/js/libs/handlebars/friendlydateTest.js +++ /dev/null @@ -1,24 +0,0 @@ -"use strict"; - -const expect = require("chai").expect; -const moment = require("moment"); -const friendlydate = require("../../../../../client/js/libs/handlebars/friendlydate"); - -describe("friendlydate Handlebars helper", () => { - it("should render 'Today' as a human-friendly date", () => { - const time = new Date().getTime(); - expect(friendlydate(time)).to.equal("Today"); - }); - - it("should render 'Yesterday' as a human-friendly date", () => { - const time = new Date().getTime() - 24 * 3600 * 1000; - expect(friendlydate(time)).to.equal("Yesterday"); - }); - - it("should not render any friendly dates prior to the day before", () => { - [2, 7, 30, 365, 1000].forEach((day) => { - const time = new Date().getTime() - 24 * 3600 * 1000 * day; - expect(friendlydate(time)).to.equal(moment(time).format("D MMMM YYYY")); - }); - }); -}); diff --git a/test/client/js/libs/handlebars/localedateTest.js b/test/client/js/libs/handlebars/localedateTest.js deleted file mode 100644 index f7cacc30..00000000 --- a/test/client/js/libs/handlebars/localedateTest.js +++ /dev/null @@ -1,19 +0,0 @@ -"use strict"; - -const expect = require("chai").expect; -const localedate = require("../../../../../client/js/libs/handlebars/localedate"); - -describe("localedate Handlebars helper", function() { - it("should render a human-readable date", function() { - // 12PM in UTC time - const date = new Date("2014-05-22T12:00:00Z"); - - // Offset between UTC and local timezone - const offset = date.getTimezoneOffset() * 60 * 1000; - - // Pretend local timezone is UTC by moving the clock of that offset - const time = date.getTime() + offset; - - expect(localedate(time)).to.equal("22 May 2014"); - }); -});