Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-11-25 22:01:30 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1268912 - Use unicode apostrophe for client.name2 in sync properties, working around issues with sync tests. r=markh

Browse Source 
MozReview-Commit-ID: 5XArwMUQwQF

--HG--
extra : rebase_source : 99a8b6e1f7806bb6a37a613cbdd93626c6593378
This commit is contained in:
Thom Chiovoloni 2016-07-13 11:55:19 -04:00
parent b104fbf64d
commit 348a37a7ec
3 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
browser/base/content/test/general/browser_misused_characters_in_strings.js
View File

@ -100,10 +100,6 @@ let gWhitelist = [{
file: "netErrorApp.dtd", file: "netErrorApp.dtd",
key: "securityOverride.warningContent", key: "securityOverride.warningContent",
type: "single-quote" type: "single-quote"
}, {
file: "sync.properties",
key: "client.name2",
type: "apostrophe"
} }
]; ];

2
services/sync/locales/en-US/sync.properties
View File

@ -3,7 +3,7 @@
# file, You can obtain one at http://mozilla.org/MPL/2.0/. # file, You can obtain one at http://mozilla.org/MPL/2.0/.
# %1: the user name (Ed), %2: the app name (Firefox), %3: the operating system (Android) # %1: the user name (Ed), %2: the app name (Firefox), %3: the operating system (Android)
client.name2 = %1$S's %2$S on %3$S client.name2 = %1$S’s %2$S on %3$S
# %S is the date and time at which the last sync successfully completed # %S is the date and time at which the last sync successfully completed
lastSync2.label = Last sync: %S lastSync2.label = Last sync: %S

10
services/sync/tests/unit/head_helpers.js
View File

@ -4,6 +4,7 @@
Cu.import("resource://services-common/async.js"); Cu.import("resource://services-common/async.js");
Cu.import("resource://testing-common/services/common/utils.js"); Cu.import("resource://testing-common/services/common/utils.js");
Cu.import("resource://testing-common/PlacesTestUtils.jsm"); Cu.import("resource://testing-common/PlacesTestUtils.jsm");
Cu.import("resource://services-sync/util.js");
Cu.import("resource://gre/modules/XPCOMUtils.jsm"); Cu.import("resource://gre/modules/XPCOMUtils.jsm");
XPCOMUtils.defineLazyGetter(this, 'SyncPingSchema', function() { XPCOMUtils.defineLazyGetter(this, 'SyncPingSchema', function() {
@ -390,3 +391,12 @@ function sync_engine_and_validate_telem(engine, allowErrorPings, onError) {
} }
}); });
} }
// Avoid an issue where `client.name2` containing unicode characters causes
// a number of tests to fail, due to them assuming that we do not need to utf-8
// encode or decode data sent through the mocked server (see bug 1268912).
Utils.getDefaultDeviceName = function() {
return "Test device name";
};