Merge pull request #1917 from floccusaddon/fix/addition-failsafe-minimum

fix(Default#applyAdditionFailsafe): Only kick in if at least 20 bookmarks are being added

Author: marcelklehr

src/lib/strategies/Default.ts

@@ -383,7 +383,7 @@ export default class SyncProcess {
 
     Logger.log('Checking addition failsafe: ' + countAdded + '/' + countTotal + '=' + (countAdded / countTotal))
     // Failsafe kicks in if more than 20% is added or more than 1k bookmarks
-    if (countTotal > 5 && (countAdded / countTotal > 0.2 || countAdded > 1000)) {
+    if (countTotal > 5 && ((countAdded >= 20 && countAdded / countTotal > 0.2) || countAdded > 1000)) {
       const failsafe = this.server.getData().failsafe
       if (failsafe !== false || typeof failsafe === 'undefined') {
         throw new AdditionFailsafeError(Math.ceil((countAdded / countTotal) * 100))

src/test/test.js

@@ -2349,12 +2349,12 @@ describe('Floccus', function() {
             })
             // Create 6 bookmarks to be above the negligibility threshold
             await Promise.all([
-              'http://ur.1l/',
-              'http://ur2.l/',
-              'http://ur3.l/',
-              'http://ur4.l/',
-              'http://ur5.l/',
-              'http://ur6.l/'
+              'http://ur1.ll/',
+              'http://ur2.ll/',
+              'http://ur3.ll/',
+              'http://ur4.ll/',
+              'http://ur5.ll/',
+              'http://ur6.ll/'
             ].map(url => browser.bookmarks.create({
               title: 'url',
               url,
@@ -2364,8 +2364,9 @@ describe('Floccus', function() {
             expect(account.getData().error).to.not.be.ok
 
             // Simulate an extreme increase of bookmarks
+            // More than 20 bookmarks need to be added at once to trigger the failsafe
             await Promise.all([
-              'http://ur.1l/',
+              'http://ur1.l/',
               'http://ur2.l/',
               'http://ur3.l/',
               'http://ur4.l/',
@@ -2375,7 +2376,7 @@ describe('Floccus', function() {
               'http://ur8.l/',
               'http://ur9.l/',
               'http://ur10.l/',
-              'http://ur.11l/',
+              'http://ur11.l/',
               'http://ur12.l/',
               'http://ur13.l/',
               'http://ur14.l/',
@@ -2385,6 +2386,7 @@ describe('Floccus', function() {
               'http://ur18.l/',
               'http://ur19.l/',
               'http://ur20.l/',
+              'http://ur21.l/',
             ].map(url => browser.bookmarks.create({
               title: 'url',
               url,