Merge pull request #14218 from NejcZdovc/fix/#10767-fix

Fixes WebTorrent not being enabled
brave · May 23, 2018 · 03e86dd · 03e86dd
1 parent 961cfdf
commit 03e86dd
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 27 deletions.
diff --git a/app/common/state/extensionState.js b/app/common/state/extensionState.js
@@ -5,7 +5,6 @@
 const Immutable = require('immutable')
 
 // Constants
-const config = require('../../../js/constants/config')
 const settings = require('../../../js/constants/settings')
 
 // Utils
@@ -220,10 +219,7 @@ const extensionState = {
     }
 
     const settingsState = state.get('settings')
-    const extension = extensionState.getExtensionById(state, config.torrentExtensionId)
-    const extensionEnabled = extension != null ? extension.get('enabled') : false
-    const torrentEnabled = getSetting(settings.TORRENT_VIEWER_ENABLED, settingsState)
-    return extensionEnabled && torrentEnabled
+    return getSetting(settings.TORRENT_VIEWER_ENABLED, settingsState)
   }
 }
 

diff --git a/test/unit/app/common/state/extensionStateTest.js b/test/unit/app/common/state/extensionStateTest.js
@@ -1,6 +1,5 @@
 /* global describe, it, before */
 const extensionState = require('../../../../../app/common/state/extensionState')
-const config = require('../../../../../js/constants/config')
 const settings = require('../../../../../js/constants/settings')
 const Immutable = require('immutable')
 const assert = require('assert')
@@ -686,43 +685,25 @@ describe('extensionState', function () {
   })
 
   describe('isWebTorrentEnabled', function () {
-    const torrentId = config.torrentExtensionId
-
     it('null case', function () {
       const result = extensionState.isWebTorrentEnabled()
       assert.equal(result, false)
     })
 
-    it('empty state', function () {
+    it('torrent is enabled by default', function () {
       const result = extensionState.isWebTorrentEnabled(defaultAppState)
-      assert.equal(result, false)
-    })
-
-    it('extension is disabled', function () {
-      const state = defaultAppState
-        .setIn(['extensions', torrentId], Immutable.fromJS({
-          enabled: false
-        }))
-        .setIn(['settings', settings.TORRENT_VIEWER_ENABLED], true)
-      const result = extensionState.isWebTorrentEnabled(state)
-      assert.equal(result, false)
+      assert.equal(result, true)
     })
 
     it('torrent is disabled', function () {
       const state = defaultAppState
-        .setIn(['extensions', torrentId], Immutable.fromJS({
-          enabled: true
-        }))
         .setIn(['settings', settings.TORRENT_VIEWER_ENABLED], false)
       const result = extensionState.isWebTorrentEnabled(state)
       assert.equal(result, false)
     })
 
-    it('everything is enabled', function () {
+    it('torrent is enabled', function () {
       const state = defaultAppState
-        .setIn(['extensions', torrentId], Immutable.fromJS({
-          enabled: true
-        }))
         .setIn(['settings', settings.TORRENT_VIEWER_ENABLED], true)
       const result = extensionState.isWebTorrentEnabled(state)
       assert.equal(result, true)