Merge pull request brave#8951 from brave/fix/improve-8894

Address feedback in PR brave#8894
kumarrishav · May 19, 2017 · 00e2a0c · 00e2a0c
2 parents 5fc6f05 + a524bd8
commit 00e2a0c
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 10 deletions.
diff --git a/app/browser/reducers/sitesReducer.js b/app/browser/reducers/sitesReducer.js
@@ -6,7 +6,7 @@
 
 const appConstants = require('../../../js/constants/appConstants')
 const filtering = require('../../filtering')
-const siteCache = require('../../../js/state/siteCache')
+const siteCache = require('../../common/state/siteCache')
 const siteTags = require('../../../js/constants/siteTags')
 const siteUtil = require('../../../js/state/siteUtil')
 const syncActions = require('../../../js/actions/syncActions')

diff --git a/js/state/siteCache.js → app/common/state/siteCache.js b/js/state/siteCache.js → app/common/state/siteCache.js
@@ -3,8 +3,8 @@
 
 'use strict'
 const Immutable = require('immutable')
-const siteUtil = require('./siteUtil')
-const UrlUtil = require('../lib/urlutil')
+const siteUtil = require('../../../js/state/siteUtil')
+const UrlUtil = require('../../../js/lib/urlutil')
 
 const createLocationSiteKeysCache = (state) => {
   state = state.set('locationSiteKeysCache', new Immutable.Map())

diff --git a/js/about/newtab.js b/js/about/newtab.js
@@ -96,7 +96,6 @@ class NewTabPage extends React.Component {
     }).size > 0
   }
   isBookmarked (siteProps) {
-    // XXX: Fixme, not passing state in!
     return siteUtil.isSiteBookmarked(this.topSites, siteProps)
   }
   get gridLayout () {

diff --git a/js/state/siteUtil.js b/js/state/siteUtil.js
@@ -4,7 +4,7 @@
 'use strict'
 const Immutable = require('immutable')
 const normalizeUrl = require('normalize-url')
-const siteCache = require('./siteCache')
+const siteCache = require('../../app/common/state/siteCache')
 const siteTags = require('../constants/siteTags')
 const settings = require('../constants/settings')
 const getSetting = require('../settings').getSetting

diff --git a/test/unit/state/siteCacheTest.js → test/unit/app/common/state/siteCacheTest.js b/test/unit/state/siteCacheTest.js → test/unit/app/common/state/siteCacheTest.js
@@ -1,12 +1,10 @@
 /* global describe, it */
 
-const siteTags = require('../../../js/constants/siteTags')
-const siteCache = require('../../../js/state/siteCache')
-const siteUtil = require('../../../js/state/siteUtil')
+const siteTags = require('../../../../../js/constants/siteTags')
+const siteCache = require('../../../../../app/common/state/siteCache')
+const siteUtil = require('../../../../../js/state/siteUtil')
 const assert = require('assert')
 const Immutable = require('immutable')
-// const mockery = require('mockery')
-// const settings = require('../../../js/constants/settings')
 
 describe('siteCache', function () {
   const testUrl1 = 'https://brave.com/'