Merge pull request #3501 from bsclifton/history-bookmark-issue

Clearing history using modal now clears bookmark timestamps
brave · Aug 28, 2016 · 570f5e8 · 570f5e8
2 parents 67e7073 + dc5d3b7
commit 570f5e8
Show file tree

Hide file tree

Showing 2 changed files with 33 additions and 9 deletions.
diff --git a/js/state/siteUtil.js b/js/state/siteUtil.js
@@ -372,7 +372,13 @@ module.exports.filterSitesRelativeTo = function (sites, relSite) {
  * @param sites The application state's Immutable sites list.
  */
 module.exports.clearSitesWithoutTags = function (sites) {
-  return sites.filter((site) => site.get('tags') && site.get('tags').size > 0)
+  let clearedSites = sites.filter((site) => site.get('tags') && site.get('tags').size > 0)
+  clearedSites.forEach((site, index) => {
+    if (site.get('lastAccessedTime')) {
+      clearedSites = clearedSites.setIn([index, 'lastAccessedTime'], null)
+    }
+  })
+  return clearedSites
 }
 
 /**

diff --git a/test/unit/state/siteUtilTest.js b/test/unit/state/siteUtilTest.js
@@ -469,15 +469,33 @@ describe('siteUtil', function () {
 
   describe('clearSitesWithoutTags', function () {
     it('does not remove sites which have a valid `tags` property', function () {
-      const sites = [
-        Immutable.fromJS({
-          tags: [siteTags.BOOKMARK_FOLDER]
-        }),
-        Immutable.fromJS({
-          tags: [siteTags.BOOKMARK]
-        })]
+      const sites = Immutable.fromJS([
+        { tags: [siteTags.BOOKMARK_FOLDER] },
+        { tags: [siteTags.BOOKMARK] }
+      ])
       const processedSites = siteUtil.clearSitesWithoutTags(sites)
-      assert.deepEqual(sites, processedSites)
+      assert.deepEqual(processedSites.toJS(), sites.toJS())
+    })
+    it('sets the lastAccessedTime for all entries to null', function () {
+      const sites = Immutable.fromJS([
+        {
+          location: 'location1',
+          tags: [],
+          lastAccessedTime: 123
+        },
+        {
+          location: 'location2',
+          tags: [siteTags.BOOKMARK],
+          lastAccessedTime: 123
+        }
+      ])
+      const expectedSites = Immutable.fromJS([{
+        location: 'location2',
+        tags: [siteTags.BOOKMARK],
+        lastAccessedTime: null
+      }])
+      const processedSites = siteUtil.clearSitesWithoutTags(sites)
+      assert.deepEqual(processedSites.toJS(), expectedSites.toJS())
     })
   })