Merge pull request #13999 from ryanml/min-visit-time-fix

Fixes extra visit time on first logged visit being ignored
brave · May 4, 2018 · 2033592 · 2033592
1 parent 3f3c154
commit 2033592
Show file tree

Hide file tree

Showing 4 changed files with 77 additions and 4 deletions.
diff --git a/app/browser/reducers/ledgerReducer.js b/app/browser/reducers/ledgerReducer.js
@@ -24,7 +24,7 @@ const tabState = require('../../common/state/tabState')
 const windows = require('../windows')
 const ledgerApi = require('../../browser/api/ledger')
 const ledgerNotifications = require('../../browser/api/ledgerNotifications')
-const {makeImmutable} = require('../../common/state/immutableUtil')
+const {makeImmutable, makeJS} = require('../../common/state/immutableUtil')
 const getSetting = require('../../../js/settings').getSetting
 
 const ledgerReducer = (state, action, immutableAction) => {
@@ -535,7 +535,9 @@ const ledgerReducer = (state, action, immutableAction) => {
       }
     case appConstants.APP_ON_PUBLISHER_TOGGLE_UPDATE:
       {
+        const viewData = makeJS(action.get('viewData'))
         state = ledgerApi.pageDataChanged(state, {}, true)
+        state = ledgerApi.pageDataChanged(state, viewData, true)
         break
       }
   }

diff --git a/app/renderer/components/navigation/publisherToggle.js b/app/renderer/components/navigation/publisherToggle.js
@@ -66,7 +66,7 @@ class PublisherToggle extends React.Component {
       return
     }
     let updateTimeout = setTimeout(() => {
-      appActions.onPublisherToggleUpdate()
+      appActions.onPublisherToggleUpdate(this.props.viewData)
     }, updateWait)
     this.setState({updateTimeout: updateTimeout})
   }
@@ -117,6 +117,7 @@ class PublisherToggle extends React.Component {
     props.tabId = tabId
     props.location = location
     props.publisherKey = publisherKey
+    props.viewData = {location, tabId}
     props.isVisibleInLedger = ledgerUtil.visibleP(state, publisherKey)
     props.isEnabledForPaymentsPublisher = ledgerUtil.stickyP(state, publisherKey)
     props.isVerifiedPublisher = ledgerState.getPublisherOption(state, publisherKey, 'verified')

diff --git a/js/actions/appActions.js b/js/actions/appActions.js
@@ -1982,9 +1982,10 @@ const appActions = {
     })
   },
 
-  onPublisherToggleUpdate: function () {
+  onPublisherToggleUpdate: function (viewData) {
     dispatch({
-      actionType: appConstants.APP_ON_PUBLISHER_TOGGLE_UPDATE
+      actionType: appConstants.APP_ON_PUBLISHER_TOGGLE_UPDATE,
+      viewData
     })
   }
 }

diff --git a/test/unit/app/browser/reducers/ledgerReducerTest.js b/test/unit/app/browser/reducers/ledgerReducerTest.js
@@ -806,4 +806,73 @@ describe('ledgerReducer unit tests', function () {
       assert.equal(testTabId, addNewLocationSpy.getCall(0).args[2])
     })
   })
+
+  describe('APP_ON_PUBLISHER_TOGGLE_UPDATE', function () {
+    let pageDataChangedSpy
+
+    beforeEach(function () {
+      pageDataChangedSpy = sinon.spy(fakeLedgerApi, 'pageDataChanged')
+    })
+
+    afterEach(function () {
+      pageDataChangedSpy.restore()
+    })
+
+    it('executes', function () {
+      ledgerReducer(appState, Immutable.fromJS({
+        actionType: appConstants.APP_ON_PUBLISHER_TOGGLE_UPDATE,
+        viewData: {
+          location: 'https://brave.com',
+          tabId: 21
+        }
+      }))
+      assert(pageDataChangedSpy.calledTwice)
+    })
+
+    it('modifies state', function () {
+      const newState = ledgerReducer(appState, Immutable.fromJS({
+        actionType: appConstants.APP_ON_PUBLISHER_TOGGLE_UPDATE,
+        viewData: {
+          location: 'https://brave.com',
+          tabId: 21
+        }
+      }))
+      assert.notDeepEqual(newState, appState)
+    })
+
+    it('passes in a empty object on first pageDataChanged call', function () {
+      ledgerReducer(appState, Immutable.fromJS({
+        actionType: appConstants.APP_ON_PUBLISHER_TOGGLE_UPDATE,
+        viewData: {
+          location: 'https://brave.com',
+          tabId: 21
+        }
+      }))
+      assert.deepEqual({}, pageDataChangedSpy.getCall(0).args[1])
+    })
+
+    it('passes in viewData on second pageDataChanged call', function () {
+      const viewData = {
+        location: 'https://brave.com',
+        tabId: 21
+      }
+      ledgerReducer(appState, Immutable.fromJS({
+        actionType: appConstants.APP_ON_PUBLISHER_TOGGLE_UPDATE,
+        viewData
+      }))
+      assert.deepEqual(viewData, pageDataChangedSpy.getCall(1).args[1])
+    })
+
+    it('keepInfo is set to true for both pageDataChanged calls', function () {
+      ledgerReducer(appState, Immutable.fromJS({
+        actionType: appConstants.APP_ON_PUBLISHER_TOGGLE_UPDATE,
+        viewData: {
+          location: 'https://brave.com',
+          tabId: 21
+        }
+      }))
+      assert.equal(true, pageDataChangedSpy.getCall(0).args[2])
+      assert.equal(true, pageDataChangedSpy.getCall(1).args[2])
+    })
+  })
 })