diff options
| author | wolfbeast <mcwerewolf@gmail.com> | 2018-04-25 23:08:37 +0200 |
|---|---|---|
| committer | wolfbeast <mcwerewolf@gmail.com> | 2018-04-25 23:08:37 +0200 |
| commit | 42f8488a5f66d7c1e5324bd1755d7f693b16ee97 (patch) | |
| tree | 54c7d2a62c4ea34b1250b5362c8e6f89d03f1a02 /services/sync | |
| parent | 681c39a0ecc84fc918b2bec72cc69ad27d39903a (diff) | |
| parent | 6c3f95480a191ce432ddfb2aa400a6d70c4884a8 (diff) | |
| download | UXP-42f8488a5f66d7c1e5324bd1755d7f693b16ee97.tar UXP-42f8488a5f66d7c1e5324bd1755d7f693b16ee97.tar.gz UXP-42f8488a5f66d7c1e5324bd1755d7f693b16ee97.tar.lz UXP-42f8488a5f66d7c1e5324bd1755d7f693b16ee97.tar.xz UXP-42f8488a5f66d7c1e5324bd1755d7f693b16ee97.zip | |
Merge branch 'master' into Basilisk-releasev2018.04.26
Diffstat (limited to 'services/sync')
| -rw-r--r-- | services/sync/tests/unit/test_service_login.js | 2 | ||||
| -rw-r--r-- | services/sync/tests/unit/test_syncscheduler.js | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/services/sync/tests/unit/test_service_login.js b/services/sync/tests/unit/test_service_login.js index 42c163915..2ecb0a377 100644 --- a/services/sync/tests/unit/test_service_login.js +++ b/services/sync/tests/unit/test_service_login.js @@ -206,7 +206,7 @@ add_test(function test_login_on_sync() { _("Old passphrase function is " + oldGetter); Service.identity.__defineGetter__("syncKey", function() { - throw "User canceled Master Password entry"; + throw "User canceled master password entry"; }); let oldClearSyncTriggers = Service.scheduler.clearSyncTriggers; diff --git a/services/sync/tests/unit/test_syncscheduler.js b/services/sync/tests/unit/test_syncscheduler.js index b066eae82..730a3f996 100644 --- a/services/sync/tests/unit/test_syncscheduler.js +++ b/services/sync/tests/unit/test_syncscheduler.js @@ -535,7 +535,7 @@ add_task(function* test_autoconnect_mp_locked() { delete Service.identity.syncKey; Service.identity.__defineGetter__("syncKey", function() { _("Faking Master Password entry cancelation."); - throw "User canceled Master Password entry"; + throw "User canceled master password entry"; }); let deferred = Promise.defer(); |