Merge pull request #11977 from NejcZdovc/hotfix/#11973-advance

Fixes advance setting change
brave · Nov 15, 2017 · e729d46 · e729d46
1 parent d2708a0
commit e729d46
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 1 deletion.
diff --git a/app/browser/api/ledger.js b/app/browser/api/ledger.js
@@ -2224,7 +2224,7 @@ const onMediaRequest = (state, xhr, type, tabId) => {
     return state
   }
 
-  const minDuration = getSetting(settings.PAYMENTS_MINIMUM_VISIT_TIME)
+  const minDuration = parseInt(getSetting(settings.PAYMENTS_MINIMUM_VISIT_TIME))
   duration = parseInt(duration)
   if (duration > 0 && duration < minDuration) {
     duration = minDuration

diff --git a/test/unit/app/browser/api/ledgerTest.js b/test/unit/app/browser/api/ledgerTest.js
@@ -745,6 +745,15 @@ describe('ledger api unit tests', function () {
       assert(saveVisitSpy.withArgs(cacheAppState, publisherKey, paymentsMinVisitTime, false).calledOnce)
     })
 
+    it('min duration is set to minimum visit time if below that threshold (string setting)', function () {
+      paymentsMinVisitTime = '5000'
+      const xhr2 = 'https://www.youtube.com/api/stats/watchtime?docid=kLiLOkzLetE&st=20.338&et=21.339'
+      ledgerApi.onMediaRequest(cacheAppState, xhr2, ledgerMediaProviders.YOUTUBE, 1)
+      assert(publisherFromMediaPropsSpy.notCalled)
+      assert(saveVisitSpy.withArgs(cacheAppState, publisherKey, 5000, false).calledOnce)
+      paymentsMinVisitTime = 5000
+    })
+
     it('revisited if visiting the same media in the same tab', function () {
       // first call, revisit false
       ledgerApi.onMediaRequest(cacheAppState, xhr, ledgerMediaProviders.YOUTUBE, 1)