From b46c24e386b4b374275f2d6f5af7b66ca4c47cdf Mon Sep 17 00:00:00 2001 From: Chase Manning Date: Fri, 4 Dec 2020 18:43:30 +1300 Subject: [PATCH 1/2] :fire: Remove Underscore From Test Format --- test/test_formats.js | 75 ++++++++++++++++++++++---------------------- 1 file changed, 38 insertions(+), 37 deletions(-) diff --git a/test/test_formats.js b/test/test_formats.js index df186ca..a9df89d 100644 --- a/test/test_formats.js +++ b/test/test_formats.js @@ -1,38 +1,36 @@ -var assert = require('assert'); +var assert = require("assert"); -var _ = require('underscore'); - -var dateFormat = require('../lib/dateformat'); +var dateFormat = require("../lib/dateformat"); var expects = { - 'default': 'Wed Nov 26 2014 13:19:44', - 'shortDate': '11/26/14', - 'mediumDate': 'Nov 26, 2014', - 'longDate': 'November 26, 2014', - 'fullDate': 'Wednesday, November 26, 2014', - 'shortTime': '1:19 PM', - 'mediumTime': '1:19:44 PM', - 'longTime': '1:19:44 PM %TZ_PREFIX%%TZ_OFFSET%', - 'isoDate': '2014-11-26', - 'isoTime': '13:19:44', - 'isoDateTime': '2014-11-26T13:19:44%TZ_OFFSET%', - 'isoUtcDateTime': '', - 'expiresHeaderFormat': 'Wed, 26 Nov 2014 13:19:44 %TZ_PREFIX%%TZ_OFFSET%' + default: "Wed Nov 26 2014 13:19:44", + shortDate: "11/26/14", + mediumDate: "Nov 26, 2014", + longDate: "November 26, 2014", + fullDate: "Wednesday, November 26, 2014", + shortTime: "1:19 PM", + mediumTime: "1:19:44 PM", + longTime: "1:19:44 PM %TZ_PREFIX%%TZ_OFFSET%", + isoDate: "2014-11-26", + isoTime: "13:19:44", + isoDateTime: "2014-11-26T13:19:44%TZ_OFFSET%", + isoUtcDateTime: "", + expiresHeaderFormat: "Wed, 26 Nov 2014 13:19:44 %TZ_PREFIX%%TZ_OFFSET%", }; function pad(num, size) { - var s = num + ''; - while (s.length < size) { - s = '0' + s; - } - return s; + var s = num + ""; + while (s.length < size) { + s = "0" + s; + } + return s; } function parseOffset(date) { var offset = date.getTimezoneOffset(); - var hours = Math.floor(-1 * offset / 60); - var minutes = (-1 * offset) - (hours * 60); - var sign = offset > 0 ? '-' : '+'; + var hours = Math.floor((-1 * offset) / 60); + var minutes = -1 * offset - hours * 60; + var sign = offset > 0 ? "-" : "+"; return { offset: offset, hours: hours, @@ -46,28 +44,31 @@ function timezoneOffset(date) { return offset.sign + pad(offset.hours, 2) + pad(offset.minutes, 2); } -describe('dateformat([now], [mask])', function() { - _.each(dateFormat.masks, function(value, key) { - it('should format `' + key + '` mask', function(done) { +describe("dateformat([now], [mask])", function () { + Object.keys(dateFormat.masks).forEach(function (key) { + it("should format `" + key + "` mask", function (done) { var now = new Date(2014, 10, 26, 13, 19, 44); var tzOffset = timezoneOffset(now); - var expected = expects[key].replace(/%TZ_PREFIX%/, 'GMT') - .replace(/%TZ_OFFSET%/g, tzOffset) - .replace(/GMT\+0000/g, 'UTC'); - if (key === 'isoUtcDateTime') { + var expected = expects[key] + .replace(/%TZ_PREFIX%/, "GMT") + .replace(/%TZ_OFFSET%/g, tzOffset) + .replace(/GMT\+0000/g, "UTC"); + if (key === "isoUtcDateTime") { var offset = parseOffset(now); - now.setHours(now.getHours() - offset.hours, - now.getMinutes() - offset.minutes); - var expected = now.toISOString().replace(/\.000/g, ''); + now.setHours( + now.getHours() - offset.hours, + now.getMinutes() - offset.minutes + ); + var expected = now.toISOString().replace(/\.000/g, ""); } var actual = dateFormat(now, key); assert.strictEqual(actual, expected); done(); }); }); - it('should use `default` mask, when `mask` is empty', function(done) { + it("should use `default` mask, when `mask` is empty", function (done) { var now = new Date(2014, 10, 26, 13, 19, 44); - var expected = expects['default']; + var expected = expects["default"]; var actual = dateFormat(now); assert.strictEqual(actual, expected); From ff86e6dd963c0a7dc40b0faf8a66497b159efcab Mon Sep 17 00:00:00 2001 From: Chase Manning Date: Fri, 4 Dec 2020 18:43:46 +1300 Subject: [PATCH 2/2] :fire: Remove Underscore from Dev Dependencies --- package.json | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/package.json b/package.json index fcfadf3..859097d 100644 --- a/package.json +++ b/package.json @@ -19,8 +19,7 @@ "@babel/cli": "^7.12.1", "@babel/core": "^7.12.3", "@babel/preset-env": "^7.12.1", - "mocha": "^8.2.1", - "underscore": "1.7.0" + "mocha": "^8.2.1" }, "engines": { "node": "*"