summaryrefslogtreecommitdiffstats
path: root/services/sync/tests/unit
diff options
context:
space:
mode:
authorMoonchild <mcwerewolf@gmail.com>2018-04-24 19:34:58 +0200
committerGitHub <noreply@github.com>2018-04-24 19:34:58 +0200
commit1b0a03a2e1916efd5c4f76efbe24b5917aa0d4c1 (patch)
tree749b48be1987507e6e5be0bc3e3673f0f7d9dd73 /services/sync/tests/unit
parent844da2ccc666afa713ca1e3e7caa077de4a9250d (diff)
parent846bbb9930e6588516a28f58b2f80c2b04e1b372 (diff)
downloadUXP-1b0a03a2e1916efd5c4f76efbe24b5917aa0d4c1.tar
UXP-1b0a03a2e1916efd5c4f76efbe24b5917aa0d4c1.tar.gz
UXP-1b0a03a2e1916efd5c4f76efbe24b5917aa0d4c1.tar.lz
UXP-1b0a03a2e1916efd5c4f76efbe24b5917aa0d4c1.tar.xz
UXP-1b0a03a2e1916efd5c4f76efbe24b5917aa0d4c1.zip
Merge pull request #258 from janekptacijarabaci/forgetAboutSite_1
moebius#30 and #37: ForgetAboutSite.jsm - promise - serialize vs. parallel + a comment
Diffstat (limited to 'services/sync/tests/unit')
-rw-r--r--services/sync/tests/unit/test_service_login.js2
-rw-r--r--services/sync/tests/unit/test_syncscheduler.js2
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();