Fixed issue with incorrect specificity and missing params values (and…

…rewplummer#569).
inflex13 · Aug 21, 2018 · cbbdbba · cbbdbba
1 parent d9d7b28
commit cbbdbba
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 1 deletion.
diff --git a/lib/common.js b/lib/common.js
@@ -635,6 +635,7 @@ function simpleClone(obj) {
   return simpleMerge({}, obj);
 }
 
+// TODO: Use Object.assign here going forward.
 function simpleMerge(target, source) {
   forEachProperty(source, function(val, key) {
     target[key] = val;

diff --git a/lib/date.js b/lib/date.js
@@ -1735,7 +1735,7 @@ function getExtendedDate(contextDate, d, opt, forceClone) {
       afterDateSet(function() {
         updateDate(date, params, true, 0, false, weekdayDir);
         if (optParams) {
-          optParams.specificity = params.specificity;
+          simpleMerge(optParams, params);
         }
       });
       if (set.edge) {

diff --git a/test/tests/date.js b/test/tests/date.js
@@ -204,6 +204,14 @@ namespace('Date', function () {
     // Issue #582 "now" with "fromUTC"
     assertDateParsed('now', { fromUTC: true }, new Date(), 'now with fromUTC');
 
+    // Issue #569 Incorrect specificity and missing time
+    var params = {};
+    testCreateDate('yesterday at 2:30pm', { params: params });
+    equal(params.hour, 14);
+    equal(params.minute, 30);
+    equal(params.day, -1);
+    equal(params.specificity, 2);
+
   });
 
   group('Create | Simple', function() {