diff options
| author | Stephen Blott | 2015-06-25 05:09:36 +0100 | 
|---|---|---|
| committer | Stephen Blott | 2015-06-25 05:09:36 +0100 | 
| commit | e5faeff7d48a206a080a56a6541963d2d3c86da7 (patch) | |
| tree | 751d29c6c499bf1325a20539b171829586a9b706 /tests/unit_tests | |
| parent | 39e10495709eeafd972a8b66ee741bf25deee7e5 (diff) | |
| parent | aa08e16e6613d5a3760761ab89557df41a50f784 (diff) | |
| download | vimium-e5faeff7d48a206a080a56a6541963d2d3c86da7.tar.bz2 | |
Merge branch 'store-all-settings' into hud-iframe-input-with-store-all-settings
Diffstat (limited to 'tests/unit_tests')
| -rw-r--r-- | tests/unit_tests/settings_test.coffee | 12 | ||||
| -rw-r--r-- | tests/unit_tests/test_chrome_stubs.coffee | 6 | 
2 files changed, 6 insertions, 12 deletions
diff --git a/tests/unit_tests/settings_test.coffee b/tests/unit_tests/settings_test.coffee index 08145190..6270ae3e 100644 --- a/tests/unit_tests/settings_test.coffee +++ b/tests/unit_tests/settings_test.coffee @@ -27,12 +27,6 @@ context "settings",      Settings.set 'scrollStepSize', 20      assert.equal Settings.get('scrollStepSize'), 20 -  should "not store values equal to the default", -> -    Settings.set 'scrollStepSize', 20 -    assert.isTrue Settings.has 'scrollStepSize' -    Settings.set 'scrollStepSize', 60 -    assert.isFalse Settings.has 'scrollStepSize' -    should "revert to defaults if no key is stored", ->      Settings.set 'scrollStepSize', 20      Settings.clear 'scrollStepSize' @@ -55,7 +49,7 @@ context "synced settings",      Settings.set 'scrollStepSize', 20      assert.equal Settings.get('scrollStepSize'), 20      Settings.propagateChangesFromChromeStorage { scrollStepSize: { newValue: "60" } } -    assert.isFalse Settings.has 'scrollStepSize' +    assert.equal Settings.get('scrollStepSize'), 60    should "propagate non-default values from synced storage", ->      chrome.storage.sync.set { scrollStepSize: JSON.stringify(20) } @@ -64,12 +58,12 @@ context "synced settings",    should "propagate default values from synced storage", ->      Settings.set 'scrollStepSize', 20      chrome.storage.sync.set { scrollStepSize: JSON.stringify(60) } -    assert.isFalse Settings.has 'scrollStepSize' +    assert.equal Settings.get('scrollStepSize'), 60    should "clear a setting from synced storage", ->      Settings.set 'scrollStepSize', 20      chrome.storage.sync.remove 'scrollStepSize' -    assert.isFalse Settings.has 'scrollStepSize' +    assert.equal Settings.get('scrollStepSize'), 60    should "trigger a postUpdateHook", ->      message = "Hello World" diff --git a/tests/unit_tests/test_chrome_stubs.coffee b/tests/unit_tests/test_chrome_stubs.coffee index fe2fc298..c6a56521 100644 --- a/tests/unit_tests/test_chrome_stubs.coffee +++ b/tests/unit_tests/test_chrome_stubs.coffee @@ -57,9 +57,9 @@ exports.chrome =    storage:      # chrome.storage.local      local: -      get: -> -      set: -> -      remove: -> +      get: (_, callback) -> callback?() +      set: (_, callback) -> callback?() +      remove: (_, callback) -> callback?()      # chrome.storage.onChanged      onChanged:  | 
