Adds more unit tests

Author: NejcZdovc

app/browser/api/topSites.js

@@ -100,7 +100,7 @@ const getTopSiteData = () => {
     .map((site, key) => {
       const bookmarkKey = bookmarkLocationCache.getCacheKey(state, site.get('location'))
 
-      site = site.set('bookmarked', !bookmarkKey.isEmpty())
+      site = site.set('bookmarked', bookmarkKey.get(0, false))
       site = site.set('key', key)
       return site
     })
@@ -128,7 +128,7 @@ const getTopSiteData = () => {
       })
       .map(site => {
         const bookmarkKey = bookmarkLocationCache.getCacheKey(state, site.get('location'))
-        return site.set('bookmarked', !bookmarkKey.isEmpty())
+        return site.set('bookmarked', bookmarkKey.get(0, false))
       })
     sites = sites.concat(preDefined)
   }

app/common/lib/bookmarkUtil.js

@@ -195,7 +195,7 @@ const isLocationBookmarked = (state, location) => {
   const bookmarks = bookmarksState.getBookmarks(state)
   const siteKeys = bookmarkLocationCache.getCacheKey(state, location)
 
-  if (siteKeys.isEmpty()) {
+  if (siteKeys.isEmpty() || bookmarks.isEmpty()) {
     return false
   }
 
@@ -218,20 +218,6 @@ const toCreateProperties = (bookmark) => {
   }
 }
 
-/**
- * Filters bookmarks relative to a parent folder
- * @param state - The application state
- * @param folderKey The folder key to filter to
- */
-const getBookmarksByParentId = (state, folderKey) => {
-  const bookmarks = bookmarksState.getBookmarks(state)
-  if (!folderKey) {
-    return bookmarks
-  }
-
-  return bookmarks.filter((bookmark) => bookmark.get('parentFolderId') === folderKey)
-}
-
 const isBookmark = (bookmark) => {
   if (bookmark == null) {
     return false
@@ -241,9 +227,10 @@ const isBookmark = (bookmark) => {
 }
 
 const updateTabBookmarked = (state, tabValue) => {
-  if (!tabValue || !tabValue.get('tabId')) {
+  if (!tabValue || !tabValue.has('tabId')) {
     return state
   }
+
   const bookmarked = isLocationBookmarked(state, tabValue.get('url'))
   return tabState.updateTabValue(state, tabValue.set('bookmarked', bookmarked))
 }
@@ -253,7 +240,8 @@ const updateActiveTabBookmarked = (state) => {
   if (!tab) {
     return state
   }
-  return updateTabBookmarked(state, tab)
+
+  return module.exports.updateTabBookmarked(state, tab)
 }
 
 const getKey = (siteDetail) => {
@@ -282,7 +270,6 @@ module.exports = {
   getDetailFromFrame,
   isLocationBookmarked,
   toCreateProperties,
-  getBookmarksByParentId,
   isBookmark,
   updateTabBookmarked,
   updateActiveTabBookmarked,

app/common/state/bookmarksState.js

@@ -283,6 +283,20 @@ const bookmarksState = {
       append
     )
     return state
+  },
+
+  /**
+   * Get bookmarks relative to a parent folder
+   * @param state - The application state
+   * @param folderKey The folder key to filter to
+   */
+  getBookmarksByParentId: (state, folderKey) => {
+    if (folderKey == null) {
+      return Immutable.List()
+    }
+
+    const cache = bookmarkOrderCache.getBookmarksByParentId(state, folderKey)
+    return cache.map((item) => bookmarksState.getBookmark(state, item.get('key')))
   }
 }
 

docs/state.md

@@ -77,6 +77,18 @@ AppStore
       title: string
     }
   },
+  cache: {
+    bookmarLocation: {
+      [location]: Array<string> // array of bookmark keys
+    },
+    bookmarkOrder: {
+      [parentId]: [{
+        key: string, // bookmark or folder key
+        order: number,
+        type: string // siteTags.BOOKMARK or siteTags.BOOKMARK_FOLDER
+      }]
+    }
+  }
   clearBrowsingDataDefaults: {
     allSiteCookies: boolean,
     autocompleteData: boolean,

js/about/newtab.js

@@ -169,7 +169,7 @@ class NewTabPage extends React.Component {
 
   onToggleBookmark (site) {
     if (site.get('bookmarked')) {
-      windowActions.editBookmark(site.get('key'))
+      windowActions.editBookmark(site.get('bookmarked'))
     } else {
       windowActions.onBookmarkAdded(false, site)
     }

js/actions/bookmarkActions.js

@@ -16,7 +16,7 @@ const {getSetting} = require('../settings')
 
 const bookmarkActions = {
   openBookmarksInFolder: function (folderDetail) {
-    const bookmarks = bookmarksUtil.getBookmarksByParentId(appStoreRenderer.state, folderDetail.get('folderId'))
+    const bookmarks = bookmarksState.getBookmarksByParentId(appStoreRenderer.state, folderDetail.get('folderId'))
 
     // Only load the first 25 tabs as loaded
     bookmarks