Merge pull request #3536 from bsclifton/fix-pw-default

Update getActivePasswordManager call to call getSettings
brave · Aug 30, 2016 · 93a7ee9 · 93a7ee9
2 parents 7f1d28c + 4fea046
commit 93a7ee9
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 1 deletion.
diff --git a/js/settings.js b/js/settings.js
@@ -48,7 +48,7 @@ module.exports.getSetting = (settingKey, settingsCollection) => {
 }
 
 module.exports.getActivePasswordManager = (settingsCollection) => {
-  const passwordManager = resolveValue(settings.ACTIVE_PASSWORD_MANAGER, settingsCollection)
+  const passwordManager = module.exports.getSetting(settings.ACTIVE_PASSWORD_MANAGER, settingsCollection)
 
   let details = {
     name: passwordManager,

diff --git a/test/unit/settingsTest.js b/test/unit/settingsTest.js
@@ -111,5 +111,16 @@ describe('settings unit test', function () {
       const actualResult = settings.getActivePasswordManager(settingsCollection)
       assert.deepEqual(actualResult, expectedResult)
     })
+
+    it('calls getSetting to get the value (providing a default if none exists)', function () {
+      settingsCollection[settingsConst.ONE_PASSWORD_ENABLED] = true
+      const expectedResult = Immutable.fromJS({
+        name: passwordManagers.ONE_PASSWORD,
+        extensionId: extensionIds[passwordManagers.ONE_PASSWORD],
+        displayName: displayNames[passwordManagers.ONE_PASSWORD]
+      })
+      const actualResult = settings.getActivePasswordManager(settingsCollection)
+      assert.deepEqual(actualResult, expectedResult)
+    })
   })
 })