mirror of
https://gitlab.winehq.org/wine/wine-gecko.git
synced 2024-09-13 09:24:08 -07:00
Merge b-i to m-c
This commit is contained in:
commit
9525488aeb
@ -418,6 +418,7 @@ pref("dom.global-constructor.disable.mozContact", false);
|
|||||||
pref("dom.phonenumber.substringmatching.BR", 8);
|
pref("dom.phonenumber.substringmatching.BR", 8);
|
||||||
pref("dom.phonenumber.substringmatching.CO", 10);
|
pref("dom.phonenumber.substringmatching.CO", 10);
|
||||||
pref("dom.phonenumber.substringmatching.VE", 7);
|
pref("dom.phonenumber.substringmatching.VE", 7);
|
||||||
|
pref("dom.phonenumber.substringmatching.CL", 8);
|
||||||
|
|
||||||
// WebAlarms
|
// WebAlarms
|
||||||
pref("dom.mozAlarms.enabled", true);
|
pref("dom.mozAlarms.enabled", true);
|
||||||
|
@ -19,7 +19,7 @@
|
|||||||
<copyfile dest="Makefile" src="core/root.mk"/>
|
<copyfile dest="Makefile" src="core/root.mk"/>
|
||||||
</project>
|
</project>
|
||||||
<project name="fake-dalvik" path="dalvik" remote="b2g" revision="ca1f327d5acc198bb4be62fa51db2c039032c9ce"/>
|
<project name="fake-dalvik" path="dalvik" remote="b2g" revision="ca1f327d5acc198bb4be62fa51db2c039032c9ce"/>
|
||||||
<project name="gaia.git" path="gaia" remote="mozillaorg" revision="e6702f8786633bbbe27ee5cbc00a31f7e2f60a8f"/>
|
<project name="gaia.git" path="gaia" remote="mozillaorg" revision="06cfe08cd72f32404f304d34fb902b544bdfeb9e"/>
|
||||||
<project name="gonk-misc" path="gonk-misc" remote="b2g" revision="266bca6e60dad43e395f38b66edabe8bdc882334"/>
|
<project name="gonk-misc" path="gonk-misc" remote="b2g" revision="266bca6e60dad43e395f38b66edabe8bdc882334"/>
|
||||||
<project name="rilproxy" path="rilproxy" remote="b2g" revision="827214fcf38d6569aeb5c6d6f31cb296d1f09272"/>
|
<project name="rilproxy" path="rilproxy" remote="b2g" revision="827214fcf38d6569aeb5c6d6f31cb296d1f09272"/>
|
||||||
<project name="platform_hardware_ril" path="hardware/ril" remote="b2g" revision="d11f524d00cacf5ba0dfbf25e4aa2158b1c3a036"/>
|
<project name="platform_hardware_ril" path="hardware/ril" remote="b2g" revision="d11f524d00cacf5ba0dfbf25e4aa2158b1c3a036"/>
|
||||||
|
@ -17,7 +17,7 @@
|
|||||||
</project>
|
</project>
|
||||||
<project name="rilproxy" path="rilproxy" remote="b2g" revision="827214fcf38d6569aeb5c6d6f31cb296d1f09272"/>
|
<project name="rilproxy" path="rilproxy" remote="b2g" revision="827214fcf38d6569aeb5c6d6f31cb296d1f09272"/>
|
||||||
<project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
|
<project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
|
||||||
<project name="gaia" path="gaia" remote="mozillaorg" revision="e6702f8786633bbbe27ee5cbc00a31f7e2f60a8f"/>
|
<project name="gaia" path="gaia" remote="mozillaorg" revision="06cfe08cd72f32404f304d34fb902b544bdfeb9e"/>
|
||||||
<project name="gonk-misc" path="gonk-misc" remote="b2g" revision="266bca6e60dad43e395f38b66edabe8bdc882334"/>
|
<project name="gonk-misc" path="gonk-misc" remote="b2g" revision="266bca6e60dad43e395f38b66edabe8bdc882334"/>
|
||||||
<project name="moztt" path="external/moztt" remote="b2g" revision="cb16958e41105d7c551d9941f522db97b8312538"/>
|
<project name="moztt" path="external/moztt" remote="b2g" revision="cb16958e41105d7c551d9941f522db97b8312538"/>
|
||||||
<project name="apitrace" path="external/apitrace" remote="apitrace" revision="485846b2a40d8ac7d6c1c5f8af6d15b0c10af19d"/>
|
<project name="apitrace" path="external/apitrace" remote="apitrace" revision="485846b2a40d8ac7d6c1c5f8af6d15b0c10af19d"/>
|
||||||
|
@ -15,7 +15,7 @@
|
|||||||
<project name="platform_build" path="build" remote="b2g" revision="a9e08b91e9cd1f0930f16cfc49ec72f63575d5fe">
|
<project name="platform_build" path="build" remote="b2g" revision="a9e08b91e9cd1f0930f16cfc49ec72f63575d5fe">
|
||||||
<copyfile dest="Makefile" src="core/root.mk"/>
|
<copyfile dest="Makefile" src="core/root.mk"/>
|
||||||
</project>
|
</project>
|
||||||
<project name="gaia" path="gaia" remote="mozillaorg" revision="e6702f8786633bbbe27ee5cbc00a31f7e2f60a8f"/>
|
<project name="gaia" path="gaia" remote="mozillaorg" revision="06cfe08cd72f32404f304d34fb902b544bdfeb9e"/>
|
||||||
<project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
|
<project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
|
||||||
<project name="gonk-misc" path="gonk-misc" remote="b2g" revision="266bca6e60dad43e395f38b66edabe8bdc882334"/>
|
<project name="gonk-misc" path="gonk-misc" remote="b2g" revision="266bca6e60dad43e395f38b66edabe8bdc882334"/>
|
||||||
<project name="moztt" path="external/moztt" remote="b2g" revision="cb16958e41105d7c551d9941f522db97b8312538"/>
|
<project name="moztt" path="external/moztt" remote="b2g" revision="cb16958e41105d7c551d9941f522db97b8312538"/>
|
||||||
|
@ -19,7 +19,7 @@
|
|||||||
<copyfile dest="Makefile" src="core/root.mk"/>
|
<copyfile dest="Makefile" src="core/root.mk"/>
|
||||||
</project>
|
</project>
|
||||||
<project name="fake-dalvik" path="dalvik" remote="b2g" revision="ca1f327d5acc198bb4be62fa51db2c039032c9ce"/>
|
<project name="fake-dalvik" path="dalvik" remote="b2g" revision="ca1f327d5acc198bb4be62fa51db2c039032c9ce"/>
|
||||||
<project name="gaia.git" path="gaia" remote="mozillaorg" revision="e6702f8786633bbbe27ee5cbc00a31f7e2f60a8f"/>
|
<project name="gaia.git" path="gaia" remote="mozillaorg" revision="06cfe08cd72f32404f304d34fb902b544bdfeb9e"/>
|
||||||
<project name="gonk-misc" path="gonk-misc" remote="b2g" revision="266bca6e60dad43e395f38b66edabe8bdc882334"/>
|
<project name="gonk-misc" path="gonk-misc" remote="b2g" revision="266bca6e60dad43e395f38b66edabe8bdc882334"/>
|
||||||
<project name="rilproxy" path="rilproxy" remote="b2g" revision="827214fcf38d6569aeb5c6d6f31cb296d1f09272"/>
|
<project name="rilproxy" path="rilproxy" remote="b2g" revision="827214fcf38d6569aeb5c6d6f31cb296d1f09272"/>
|
||||||
<project name="platform_hardware_ril" path="hardware/ril" remote="b2g" revision="d11f524d00cacf5ba0dfbf25e4aa2158b1c3a036"/>
|
<project name="platform_hardware_ril" path="hardware/ril" remote="b2g" revision="d11f524d00cacf5ba0dfbf25e4aa2158b1c3a036"/>
|
||||||
|
@ -4,6 +4,6 @@
|
|||||||
"branch": "",
|
"branch": "",
|
||||||
"revision": ""
|
"revision": ""
|
||||||
},
|
},
|
||||||
"revision": "4926fae1778461d93ff10b0fe4f8430246373e03",
|
"revision": "4dff379346b266bd93f48291a64cfc90af5d7daa",
|
||||||
"repo_path": "/integration/gaia-central"
|
"repo_path": "/integration/gaia-central"
|
||||||
}
|
}
|
||||||
|
@ -17,7 +17,7 @@
|
|||||||
<copyfile dest="Makefile" src="core/root.mk"/>
|
<copyfile dest="Makefile" src="core/root.mk"/>
|
||||||
</project>
|
</project>
|
||||||
<project name="fake-dalvik" path="dalvik" remote="b2g" revision="ca1f327d5acc198bb4be62fa51db2c039032c9ce"/>
|
<project name="fake-dalvik" path="dalvik" remote="b2g" revision="ca1f327d5acc198bb4be62fa51db2c039032c9ce"/>
|
||||||
<project name="gaia.git" path="gaia" remote="mozillaorg" revision="e6702f8786633bbbe27ee5cbc00a31f7e2f60a8f"/>
|
<project name="gaia.git" path="gaia" remote="mozillaorg" revision="06cfe08cd72f32404f304d34fb902b544bdfeb9e"/>
|
||||||
<project name="gonk-misc" path="gonk-misc" remote="b2g" revision="266bca6e60dad43e395f38b66edabe8bdc882334"/>
|
<project name="gonk-misc" path="gonk-misc" remote="b2g" revision="266bca6e60dad43e395f38b66edabe8bdc882334"/>
|
||||||
<project name="rilproxy" path="rilproxy" remote="b2g" revision="827214fcf38d6569aeb5c6d6f31cb296d1f09272"/>
|
<project name="rilproxy" path="rilproxy" remote="b2g" revision="827214fcf38d6569aeb5c6d6f31cb296d1f09272"/>
|
||||||
<project name="librecovery" path="librecovery" remote="b2g" revision="1f6a1fe07f81c5bc5e1d079c9b60f7f78ca2bf4f"/>
|
<project name="librecovery" path="librecovery" remote="b2g" revision="1f6a1fe07f81c5bc5e1d079c9b60f7f78ca2bf4f"/>
|
||||||
|
@ -15,7 +15,7 @@
|
|||||||
<copyfile dest="Makefile" src="core/root.mk"/>
|
<copyfile dest="Makefile" src="core/root.mk"/>
|
||||||
</project>
|
</project>
|
||||||
<project name="fake-dalvik" path="dalvik" remote="b2g" revision="ca1f327d5acc198bb4be62fa51db2c039032c9ce"/>
|
<project name="fake-dalvik" path="dalvik" remote="b2g" revision="ca1f327d5acc198bb4be62fa51db2c039032c9ce"/>
|
||||||
<project name="gaia.git" path="gaia" remote="mozillaorg" revision="e6702f8786633bbbe27ee5cbc00a31f7e2f60a8f"/>
|
<project name="gaia.git" path="gaia" remote="mozillaorg" revision="06cfe08cd72f32404f304d34fb902b544bdfeb9e"/>
|
||||||
<project name="gonk-misc" path="gonk-misc" remote="b2g" revision="266bca6e60dad43e395f38b66edabe8bdc882334"/>
|
<project name="gonk-misc" path="gonk-misc" remote="b2g" revision="266bca6e60dad43e395f38b66edabe8bdc882334"/>
|
||||||
<project name="rilproxy" path="rilproxy" remote="b2g" revision="827214fcf38d6569aeb5c6d6f31cb296d1f09272"/>
|
<project name="rilproxy" path="rilproxy" remote="b2g" revision="827214fcf38d6569aeb5c6d6f31cb296d1f09272"/>
|
||||||
<project name="librecovery" path="librecovery" remote="b2g" revision="1f6a1fe07f81c5bc5e1d079c9b60f7f78ca2bf4f"/>
|
<project name="librecovery" path="librecovery" remote="b2g" revision="1f6a1fe07f81c5bc5e1d079c9b60f7f78ca2bf4f"/>
|
||||||
|
@ -19,7 +19,7 @@
|
|||||||
<copyfile dest="Makefile" src="core/root.mk"/>
|
<copyfile dest="Makefile" src="core/root.mk"/>
|
||||||
</project>
|
</project>
|
||||||
<project name="fake-dalvik" path="dalvik" remote="b2g" revision="ca1f327d5acc198bb4be62fa51db2c039032c9ce"/>
|
<project name="fake-dalvik" path="dalvik" remote="b2g" revision="ca1f327d5acc198bb4be62fa51db2c039032c9ce"/>
|
||||||
<project name="gaia.git" path="gaia" remote="mozillaorg" revision="e6702f8786633bbbe27ee5cbc00a31f7e2f60a8f"/>
|
<project name="gaia.git" path="gaia" remote="mozillaorg" revision="06cfe08cd72f32404f304d34fb902b544bdfeb9e"/>
|
||||||
<project name="gonk-misc" path="gonk-misc" remote="b2g" revision="266bca6e60dad43e395f38b66edabe8bdc882334"/>
|
<project name="gonk-misc" path="gonk-misc" remote="b2g" revision="266bca6e60dad43e395f38b66edabe8bdc882334"/>
|
||||||
<project name="rilproxy" path="rilproxy" remote="b2g" revision="827214fcf38d6569aeb5c6d6f31cb296d1f09272"/>
|
<project name="rilproxy" path="rilproxy" remote="b2g" revision="827214fcf38d6569aeb5c6d6f31cb296d1f09272"/>
|
||||||
<project name="librecovery" path="librecovery" remote="b2g" revision="1f6a1fe07f81c5bc5e1d079c9b60f7f78ca2bf4f"/>
|
<project name="librecovery" path="librecovery" remote="b2g" revision="1f6a1fe07f81c5bc5e1d079c9b60f7f78ca2bf4f"/>
|
||||||
|
@ -17,7 +17,7 @@
|
|||||||
<copyfile dest="Makefile" src="core/root.mk"/>
|
<copyfile dest="Makefile" src="core/root.mk"/>
|
||||||
</project>
|
</project>
|
||||||
<project name="fake-dalvik" path="dalvik" remote="b2g" revision="ca1f327d5acc198bb4be62fa51db2c039032c9ce"/>
|
<project name="fake-dalvik" path="dalvik" remote="b2g" revision="ca1f327d5acc198bb4be62fa51db2c039032c9ce"/>
|
||||||
<project name="gaia.git" path="gaia" remote="mozillaorg" revision="e6702f8786633bbbe27ee5cbc00a31f7e2f60a8f"/>
|
<project name="gaia.git" path="gaia" remote="mozillaorg" revision="06cfe08cd72f32404f304d34fb902b544bdfeb9e"/>
|
||||||
<project name="gonk-misc" path="gonk-misc" remote="b2g" revision="266bca6e60dad43e395f38b66edabe8bdc882334"/>
|
<project name="gonk-misc" path="gonk-misc" remote="b2g" revision="266bca6e60dad43e395f38b66edabe8bdc882334"/>
|
||||||
<project name="rilproxy" path="rilproxy" remote="b2g" revision="827214fcf38d6569aeb5c6d6f31cb296d1f09272"/>
|
<project name="rilproxy" path="rilproxy" remote="b2g" revision="827214fcf38d6569aeb5c6d6f31cb296d1f09272"/>
|
||||||
<project name="librecovery" path="librecovery" remote="b2g" revision="1f6a1fe07f81c5bc5e1d079c9b60f7f78ca2bf4f"/>
|
<project name="librecovery" path="librecovery" remote="b2g" revision="1f6a1fe07f81c5bc5e1d079c9b60f7f78ca2bf4f"/>
|
||||||
|
@ -17,7 +17,7 @@
|
|||||||
</project>
|
</project>
|
||||||
<project name="rilproxy" path="rilproxy" remote="b2g" revision="827214fcf38d6569aeb5c6d6f31cb296d1f09272"/>
|
<project name="rilproxy" path="rilproxy" remote="b2g" revision="827214fcf38d6569aeb5c6d6f31cb296d1f09272"/>
|
||||||
<project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
|
<project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
|
||||||
<project name="gaia" path="gaia" remote="mozillaorg" revision="e6702f8786633bbbe27ee5cbc00a31f7e2f60a8f"/>
|
<project name="gaia" path="gaia" remote="mozillaorg" revision="06cfe08cd72f32404f304d34fb902b544bdfeb9e"/>
|
||||||
<project name="gonk-misc" path="gonk-misc" remote="b2g" revision="266bca6e60dad43e395f38b66edabe8bdc882334"/>
|
<project name="gonk-misc" path="gonk-misc" remote="b2g" revision="266bca6e60dad43e395f38b66edabe8bdc882334"/>
|
||||||
<project name="moztt" path="external/moztt" remote="b2g" revision="cb16958e41105d7c551d9941f522db97b8312538"/>
|
<project name="moztt" path="external/moztt" remote="b2g" revision="cb16958e41105d7c551d9941f522db97b8312538"/>
|
||||||
<project name="apitrace" path="external/apitrace" remote="apitrace" revision="485846b2a40d8ac7d6c1c5f8af6d15b0c10af19d"/>
|
<project name="apitrace" path="external/apitrace" remote="apitrace" revision="485846b2a40d8ac7d6c1c5f8af6d15b0c10af19d"/>
|
||||||
|
@ -17,7 +17,7 @@
|
|||||||
<copyfile dest="Makefile" src="core/root.mk"/>
|
<copyfile dest="Makefile" src="core/root.mk"/>
|
||||||
</project>
|
</project>
|
||||||
<project name="fake-dalvik" path="dalvik" remote="b2g" revision="ca1f327d5acc198bb4be62fa51db2c039032c9ce"/>
|
<project name="fake-dalvik" path="dalvik" remote="b2g" revision="ca1f327d5acc198bb4be62fa51db2c039032c9ce"/>
|
||||||
<project name="gaia.git" path="gaia" remote="mozillaorg" revision="e6702f8786633bbbe27ee5cbc00a31f7e2f60a8f"/>
|
<project name="gaia.git" path="gaia" remote="mozillaorg" revision="06cfe08cd72f32404f304d34fb902b544bdfeb9e"/>
|
||||||
<project name="gonk-misc" path="gonk-misc" remote="b2g" revision="266bca6e60dad43e395f38b66edabe8bdc882334"/>
|
<project name="gonk-misc" path="gonk-misc" remote="b2g" revision="266bca6e60dad43e395f38b66edabe8bdc882334"/>
|
||||||
<project name="rilproxy" path="rilproxy" remote="b2g" revision="827214fcf38d6569aeb5c6d6f31cb296d1f09272"/>
|
<project name="rilproxy" path="rilproxy" remote="b2g" revision="827214fcf38d6569aeb5c6d6f31cb296d1f09272"/>
|
||||||
<project name="librecovery" path="librecovery" remote="b2g" revision="1f6a1fe07f81c5bc5e1d079c9b60f7f78ca2bf4f"/>
|
<project name="librecovery" path="librecovery" remote="b2g" revision="1f6a1fe07f81c5bc5e1d079c9b60f7f78ca2bf4f"/>
|
||||||
|
@ -13,6 +13,7 @@ skip-if = (toolkit == 'gonk' && debug) #debug-only failure
|
|||||||
[test_contacts_international.html]
|
[test_contacts_international.html]
|
||||||
[test_contacts_substringmatching.html]
|
[test_contacts_substringmatching.html]
|
||||||
[test_contacts_substringmatchingVE.html]
|
[test_contacts_substringmatchingVE.html]
|
||||||
|
[test_contacts_substringmatchingCL.html]
|
||||||
[test_migration.html]
|
[test_migration.html]
|
||||||
support-files =
|
support-files =
|
||||||
test_migration_chrome.js
|
test_migration_chrome.js
|
||||||
|
@ -402,15 +402,17 @@ function next() {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
SimpleTest.waitForExplicitFinish();
|
||||||
|
|
||||||
function start_tests() {
|
function start_tests() {
|
||||||
// Skip tests on Android < 4.0 due to test failures on tbpl (see bugs 897924 & 888891)
|
// Skip tests on Android < 4.0 due to test failures on tbpl (see bugs 897924 & 888891)
|
||||||
let androidVersion = SpecialPowers.Cc['@mozilla.org/system-info;1']
|
let androidVersion = SpecialPowers.Cc['@mozilla.org/system-info;1']
|
||||||
.getService(SpecialPowers.Ci.nsIPropertyBag2)
|
.getService(SpecialPowers.Ci.nsIPropertyBag2)
|
||||||
.getProperty('version');
|
.getProperty('version');
|
||||||
if (!isAndroid || androidVersion >= 14) {
|
if (!isAndroid || androidVersion >= 14) {
|
||||||
SimpleTest.waitForExplicitFinish();
|
next();
|
||||||
addLoadEvent(next);
|
|
||||||
} else {
|
} else {
|
||||||
ok(true, "Skip tests on Android < 4.0 (bugs 897924 & 888891");
|
ok(true, "Skip tests on Android < 4.0 (bugs 897924 & 888891");
|
||||||
|
SimpleTest.finish();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -43,13 +43,13 @@ var properties2 = {
|
|||||||
};
|
};
|
||||||
|
|
||||||
var number3 = {
|
var number3 = {
|
||||||
international1: "0041557932012345",
|
local: "7932012345",
|
||||||
international2: "+557932012345"
|
international: "+557932012345"
|
||||||
};
|
};
|
||||||
|
|
||||||
var properties3 = {
|
var properties3 = {
|
||||||
name: ["Testname2"],
|
name: ["Testname2"],
|
||||||
tel: [{value: number3.international2}]
|
tel: [{value: number3.international}]
|
||||||
};
|
};
|
||||||
|
|
||||||
var req;
|
var req;
|
||||||
@ -95,9 +95,9 @@ var steps = [
|
|||||||
filterValue: number1.local};
|
filterValue: number1.local};
|
||||||
req = mozContacts.find(options);
|
req = mozContacts.find(options);
|
||||||
req.onsuccess = function () {
|
req.onsuccess = function () {
|
||||||
ok(req.result.length == 1, "Found exactly 1 contact.");
|
ise(req.result.length, 1, "Found exactly 1 contact.");
|
||||||
findResult1 = req.result[0];
|
findResult1 = req.result[0];
|
||||||
ok(findResult1.id == sample_id1, "Same ID");
|
ise(findResult1.id, sample_id1, "Same ID");
|
||||||
next();
|
next();
|
||||||
};
|
};
|
||||||
req.onerror = onFailure;
|
req.onerror = onFailure;
|
||||||
@ -109,7 +109,7 @@ var steps = [
|
|||||||
filterValue: number1.international};
|
filterValue: number1.international};
|
||||||
req = mozContacts.find(options);
|
req = mozContacts.find(options);
|
||||||
req.onsuccess = function () {
|
req.onsuccess = function () {
|
||||||
ok(req.result.length == 0, "Found exactly 0 contacts.");
|
ise(req.result.length, 0, "Found exactly 0 contacts.");
|
||||||
next();
|
next();
|
||||||
};
|
};
|
||||||
req.onerror = onFailure;
|
req.onerror = onFailure;
|
||||||
@ -122,7 +122,7 @@ var steps = [
|
|||||||
filterValue: shortNumber};
|
filterValue: shortNumber};
|
||||||
req = mozContacts.find(options);
|
req = mozContacts.find(options);
|
||||||
req.onsuccess = function() {
|
req.onsuccess = function() {
|
||||||
ok(req.result.length == 0, "The prefix short number should not match any contact.");
|
ise(req.result.length, 0, "The prefix short number should not match any contact.");
|
||||||
next();
|
next();
|
||||||
};
|
};
|
||||||
req.onerror = onFailure;
|
req.onerror = onFailure;
|
||||||
@ -135,7 +135,7 @@ var steps = [
|
|||||||
filterValue: shortNumber};
|
filterValue: shortNumber};
|
||||||
req = mozContacts.find(options);
|
req = mozContacts.find(options);
|
||||||
req.onsuccess = function() {
|
req.onsuccess = function() {
|
||||||
ok(req.result.length == 0, "The suffix short number should not match any contact.");
|
ise(req.result.length, 0, "The suffix short number should not match any contact.");
|
||||||
next();
|
next();
|
||||||
};
|
};
|
||||||
req.onerror = onFailure;
|
req.onerror = onFailure;
|
||||||
@ -147,7 +147,7 @@ var steps = [
|
|||||||
filterValue: shortNumber};
|
filterValue: shortNumber};
|
||||||
req = mozContacts.find(options);
|
req = mozContacts.find(options);
|
||||||
req.onsuccess = function() {
|
req.onsuccess = function() {
|
||||||
ok(req.result.length == 1, "Found the contact equally matching the shortNumber.");
|
ise(req.result.length, 1, "Found the contact equally matching the shortNumber.");
|
||||||
next();
|
next();
|
||||||
};
|
};
|
||||||
req.onerror = onFailure;
|
req.onerror = onFailure;
|
||||||
@ -171,7 +171,7 @@ var steps = [
|
|||||||
filterValue: number1.local};
|
filterValue: number1.local};
|
||||||
req = mozContacts.find(options);
|
req = mozContacts.find(options);
|
||||||
req.onsuccess = function () {
|
req.onsuccess = function () {
|
||||||
ok(req.result.length == 0, "Found exactly 0 contact.");
|
ise(req.result.length, 0, "Found exactly 0 contact.");
|
||||||
next();
|
next();
|
||||||
};
|
};
|
||||||
req.onerror = onFailure;
|
req.onerror = onFailure;
|
||||||
@ -183,7 +183,7 @@ var steps = [
|
|||||||
filterValue: number1.international};
|
filterValue: number1.international};
|
||||||
req = mozContacts.find(options);
|
req = mozContacts.find(options);
|
||||||
req.onsuccess = function () {
|
req.onsuccess = function () {
|
||||||
ok(req.result.length == 0, "Found exactly 0 contact.");
|
ise(req.result.length, 0, "Found exactly 0 contact.");
|
||||||
next();
|
next();
|
||||||
};
|
};
|
||||||
req.onerror = onFailure;
|
req.onerror = onFailure;
|
||||||
@ -195,9 +195,9 @@ var steps = [
|
|||||||
filterValue: number2.local};
|
filterValue: number2.local};
|
||||||
req = mozContacts.find(options);
|
req = mozContacts.find(options);
|
||||||
req.onsuccess = function () {
|
req.onsuccess = function () {
|
||||||
ok(req.result.length == 1, "Found exactly 1 contact.");
|
ise(req.result.length, 1, "Found exactly 1 contact.");
|
||||||
findResult1 = req.result[0];
|
findResult1 = req.result[0];
|
||||||
ok(findResult1.id == sample_id1, "Same ID");
|
ise(findResult1.id, sample_id1, "Same ID");
|
||||||
next();
|
next();
|
||||||
};
|
};
|
||||||
req.onerror = onFailure;
|
req.onerror = onFailure;
|
||||||
@ -209,7 +209,7 @@ var steps = [
|
|||||||
filterValue: number2.international};
|
filterValue: number2.international};
|
||||||
req = mozContacts.find(options);
|
req = mozContacts.find(options);
|
||||||
req.onsuccess = function () {
|
req.onsuccess = function () {
|
||||||
ok(req.result.length == 0, "Found exactly 1 contact.");
|
ise(req.result.length, 0, "Found exactly 1 contact.");
|
||||||
next();
|
next();
|
||||||
};
|
};
|
||||||
req.onerror = onFailure;
|
req.onerror = onFailure;
|
||||||
@ -224,7 +224,7 @@ var steps = [
|
|||||||
req.onerror = onFailure;
|
req.onerror = onFailure;
|
||||||
},
|
},
|
||||||
function () {
|
function () {
|
||||||
ok(true, "Adding a new contact with country code");
|
ok(true, "Adding a contact with a Brazilian country code");
|
||||||
createResult1 = new mozContact(properties3);
|
createResult1 = new mozContact(properties3);
|
||||||
req = navigator.mozContacts.save(createResult1);
|
req = navigator.mozContacts.save(createResult1);
|
||||||
req.onsuccess = function () {
|
req.onsuccess = function () {
|
||||||
@ -235,15 +235,15 @@ var steps = [
|
|||||||
req.onerror = onFailure;
|
req.onerror = onFailure;
|
||||||
},
|
},
|
||||||
function () {
|
function () {
|
||||||
ok(true, "Searching for international number with prefix");
|
ok(true, "Searching for Brazilian number using local number");
|
||||||
var options = {filterBy: ["tel"],
|
var options = {filterBy: ["tel"],
|
||||||
filterOp: "match",
|
filterOp: "match",
|
||||||
filterValue: number3.international1};
|
filterValue: number3.local};
|
||||||
req = mozContacts.find(options);
|
req = mozContacts.find(options);
|
||||||
req.onsuccess = function () {
|
req.onsuccess = function () {
|
||||||
ok(req.result.length == 1, "Found exactly 1 contact.");
|
ise(req.result.length, 1, "Found exactly 1 contact.");
|
||||||
findResult1 = req.result[0];
|
findResult1 = req.result[0];
|
||||||
ok(findResult1.id == sample_id1, "Same ID");
|
ise(findResult1.id, sample_id1, "Same ID");
|
||||||
next();
|
next();
|
||||||
};
|
};
|
||||||
req.onerror = onFailure;
|
req.onerror = onFailure;
|
||||||
@ -263,7 +263,11 @@ var steps = [
|
|||||||
}
|
}
|
||||||
];
|
];
|
||||||
|
|
||||||
start_tests();
|
SpecialPowers.pushPrefEnv({
|
||||||
|
set: [
|
||||||
|
["ril.lastKnownSimMcc", "000"]
|
||||||
|
]
|
||||||
|
}, start_tests);
|
||||||
</script>
|
</script>
|
||||||
</pre>
|
</pre>
|
||||||
</body>
|
</body>
|
||||||
|
@ -45,6 +45,15 @@ var prop4 = {
|
|||||||
tel: [{ value: "(0414) 233-9888" }]
|
tel: [{ value: "(0414) 233-9888" }]
|
||||||
};
|
};
|
||||||
|
|
||||||
|
var brazilianNumber = {
|
||||||
|
international1: "0041557932012345",
|
||||||
|
international2: "+557932012345"
|
||||||
|
};
|
||||||
|
|
||||||
|
var prop5 = {
|
||||||
|
tel: [{value: brazilianNumber.international2}]
|
||||||
|
};
|
||||||
|
|
||||||
var req;
|
var req;
|
||||||
var steps = [
|
var steps = [
|
||||||
function () {
|
function () {
|
||||||
@ -293,6 +302,40 @@ var steps = [
|
|||||||
}
|
}
|
||||||
req.onerror = onFailure;
|
req.onerror = onFailure;
|
||||||
},
|
},
|
||||||
|
function () {
|
||||||
|
ok(true, "Adding a new contact with a Brazilian country code");
|
||||||
|
createResult1 = new mozContact(prop5);
|
||||||
|
req = navigator.mozContacts.save(createResult1);
|
||||||
|
req.onsuccess = function () {
|
||||||
|
ok(createResult1.id, "The contact now has an ID.");
|
||||||
|
sample_id1 = createResult1.id;
|
||||||
|
next();
|
||||||
|
};
|
||||||
|
req.onerror = onFailure;
|
||||||
|
},
|
||||||
|
function () {
|
||||||
|
ok(true, "Searching for international number with prefix");
|
||||||
|
var options = {filterBy: ["tel"],
|
||||||
|
filterOp: "match",
|
||||||
|
filterValue: brazilianNumber.international1};
|
||||||
|
req = mozContacts.find(options);
|
||||||
|
req.onsuccess = function () {
|
||||||
|
ok(req.result.length == 1, "Found exactly 1 contact.");
|
||||||
|
findResult1 = req.result[0];
|
||||||
|
ok(findResult1.id == sample_id1, "Same ID");
|
||||||
|
next();
|
||||||
|
};
|
||||||
|
req.onerror = onFailure;
|
||||||
|
},
|
||||||
|
function () {
|
||||||
|
ok(true, "Deleting database");
|
||||||
|
req = mozContacts.clear()
|
||||||
|
req.onsuccess = function () {
|
||||||
|
ok(true, "Deleted the database");
|
||||||
|
next();
|
||||||
|
}
|
||||||
|
req.onerror = onFailure;
|
||||||
|
},
|
||||||
function () {
|
function () {
|
||||||
ok(true, "all done!\n");
|
ok(true, "all done!\n");
|
||||||
SpecialPowers.clearUserPref("dom.phonenumber.substringmatching.BR");
|
SpecialPowers.clearUserPref("dom.phonenumber.substringmatching.BR");
|
||||||
|
204
dom/contacts/tests/test_contacts_substringmatchingCL.html
Normal file
204
dom/contacts/tests/test_contacts_substringmatchingCL.html
Normal file
@ -0,0 +1,204 @@
|
|||||||
|
<!DOCTYPE html>
|
||||||
|
<html>
|
||||||
|
<!--
|
||||||
|
https://bugzilla.mozilla.org/show_bug.cgi?id=877302
|
||||||
|
-->
|
||||||
|
<head>
|
||||||
|
<title>Test for Bug 949537 substring matching for WebContacts</title>
|
||||||
|
<script type="text/javascript" src="/MochiKit/MochiKit.js"></script>
|
||||||
|
<script type="text/javascript" src="/tests/SimpleTest/SimpleTest.js"></script>
|
||||||
|
<link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css" />
|
||||||
|
</head>
|
||||||
|
<body>
|
||||||
|
|
||||||
|
<a target="_blank" href="https://bugzilla.mozilla.org/show_bug.cgi?id=949537">Mozilla Bug 949537</a>
|
||||||
|
<p id="display"></p>
|
||||||
|
<div id="content" style="display: none">
|
||||||
|
|
||||||
|
</div>
|
||||||
|
<pre id="test">
|
||||||
|
<script type="text/javascript;version=1.8" src="http://mochi.test:8888/tests/dom/contacts/tests/shared.js"></script>
|
||||||
|
<script class="testbody" type="text/javascript">
|
||||||
|
"use strict";
|
||||||
|
|
||||||
|
var landlineNumber = "+56 2 27654321";
|
||||||
|
|
||||||
|
var number = {
|
||||||
|
local: "87654321",
|
||||||
|
international: "+56 9 87654321"
|
||||||
|
};
|
||||||
|
|
||||||
|
var properties = {
|
||||||
|
name: ["Testname2"],
|
||||||
|
tel: [{value: number.international}]
|
||||||
|
};
|
||||||
|
|
||||||
|
var req;
|
||||||
|
var steps = [
|
||||||
|
function () {
|
||||||
|
ok(true, "Adding a contact with a Chilean number");
|
||||||
|
createResult1 = new mozContact(properties);
|
||||||
|
req = navigator.mozContacts.save(createResult1);
|
||||||
|
req.onsuccess = function () {
|
||||||
|
ok(createResult1.id, "The contact now has an ID.");
|
||||||
|
sample_id1 = createResult1.id;
|
||||||
|
next();
|
||||||
|
};
|
||||||
|
req.onerror = onFailure;
|
||||||
|
},
|
||||||
|
function () {
|
||||||
|
ok(true, "Searching for Chilean number with prefix");
|
||||||
|
req = mozContacts.find({
|
||||||
|
filterBy: ["tel"],
|
||||||
|
filterOp: "match",
|
||||||
|
filterValue: number.international
|
||||||
|
});
|
||||||
|
req.onsuccess = function () {
|
||||||
|
ise(req.result.length, 1, "Found exactly 1 contact.");
|
||||||
|
findResult1 = req.result[0];
|
||||||
|
ise(findResult1.id, sample_id1, "Same ID");
|
||||||
|
next();
|
||||||
|
};
|
||||||
|
req.onerror = onFailure;
|
||||||
|
},
|
||||||
|
function () {
|
||||||
|
ok(true, "Searching for Chilean number using local number");
|
||||||
|
req = mozContacts.find({
|
||||||
|
filterBy: ["tel"],
|
||||||
|
filterOp: "match",
|
||||||
|
filterValue: number.local
|
||||||
|
});
|
||||||
|
req.onsuccess = function () {
|
||||||
|
ise(req.result.length, 1, "Found 0 contacts.");
|
||||||
|
next();
|
||||||
|
};
|
||||||
|
req.onerror = onFailure;
|
||||||
|
},
|
||||||
|
|
||||||
|
clearDatabase,
|
||||||
|
|
||||||
|
function () {
|
||||||
|
ok(true, "Adding contact with mobile number");
|
||||||
|
createResult1 = new mozContact({tel: [{value: number.international}]});
|
||||||
|
req = navigator.mozContacts.save(createResult1);
|
||||||
|
req.onsuccess = function () {
|
||||||
|
ok(createResult1.id, "The contact now has an ID.");
|
||||||
|
sample_id1 = createResult1.id;
|
||||||
|
next();
|
||||||
|
};
|
||||||
|
req.onerror = onFailure;
|
||||||
|
},
|
||||||
|
function () {
|
||||||
|
ok(true, "Retrieving all contacts");
|
||||||
|
req = mozContacts.find({});
|
||||||
|
req.onsuccess = function () {
|
||||||
|
ise(req.result.length, 1, "One contact.");
|
||||||
|
findResult1 = req.result[0];
|
||||||
|
next();
|
||||||
|
};
|
||||||
|
req.onerror = onFailure;
|
||||||
|
},
|
||||||
|
function () {
|
||||||
|
ok(true, "Retrieving by last 8 digits");
|
||||||
|
req = mozContacts.find({
|
||||||
|
filterBy: ["tel"],
|
||||||
|
filterOp: "match",
|
||||||
|
filterValue: number.international.slice(-8)
|
||||||
|
});
|
||||||
|
req.onsuccess = function () {
|
||||||
|
ise(req.result.length, 1, "Found exactly 1 contact.");
|
||||||
|
findResult1 = req.result[0];
|
||||||
|
ise(findResult1.id, sample_id1, "Same ID");
|
||||||
|
ise(findResult1.tel[0].value, number.international, "Same Value");
|
||||||
|
next();
|
||||||
|
};
|
||||||
|
req.onerror = onFailure;
|
||||||
|
},
|
||||||
|
function () {
|
||||||
|
ok(true, "Retrieving by last 9 digits");
|
||||||
|
req = mozContacts.find({
|
||||||
|
filterBy: ["tel"],
|
||||||
|
filterOp: "match",
|
||||||
|
filterValue: number.international.slice(-9)
|
||||||
|
});
|
||||||
|
req.onsuccess = function () {
|
||||||
|
ise(req.result.length, 1, "Found exactly 1 contact.");
|
||||||
|
findResult1 = req.result[0];
|
||||||
|
ise(findResult1.id, sample_id1, "Same ID");
|
||||||
|
ise(findResult1.tel[0].value, number.international, "Same Value");
|
||||||
|
next();
|
||||||
|
};
|
||||||
|
req.onerror = onFailure;
|
||||||
|
},
|
||||||
|
function () {
|
||||||
|
ok(true, "Retrieving by last 6 digits");
|
||||||
|
req = mozContacts.find({
|
||||||
|
filterBy: ["tel"],
|
||||||
|
filterOp: "match",
|
||||||
|
filterValue: number.international.slice(-6)
|
||||||
|
});
|
||||||
|
req.onsuccess = function () {
|
||||||
|
ise(req.result.length, 0, "Found exactly zero contacts.");
|
||||||
|
next();
|
||||||
|
};
|
||||||
|
req.onerror = onFailure;
|
||||||
|
},
|
||||||
|
|
||||||
|
clearDatabase,
|
||||||
|
|
||||||
|
function () {
|
||||||
|
ok(true, "Adding contact with landline number");
|
||||||
|
createResult1 = new mozContact({tel: [{value: landlineNumber}]});
|
||||||
|
req = navigator.mozContacts.save(createResult1);
|
||||||
|
req.onsuccess = function () {
|
||||||
|
ok(createResult1.id, "The contact now has an ID.");
|
||||||
|
sample_id1 = createResult1.id;
|
||||||
|
next();
|
||||||
|
};
|
||||||
|
req.onerror = onFailure;
|
||||||
|
},
|
||||||
|
function () {
|
||||||
|
ok(true, "Retrieving all contacts");
|
||||||
|
req = mozContacts.find({});
|
||||||
|
req.onsuccess = function () {
|
||||||
|
ise(req.result.length, 1, "One contact.");
|
||||||
|
findResult1 = req.result[0];
|
||||||
|
next();
|
||||||
|
};
|
||||||
|
req.onerror = onFailure;
|
||||||
|
},
|
||||||
|
function () {
|
||||||
|
ok(true, "Retrieving by last 7 digits (local number) with landline calling prefix");
|
||||||
|
req = mozContacts.find({
|
||||||
|
filterBy: ["tel"],
|
||||||
|
filterOp: "match",
|
||||||
|
filterValue: "022" + landlineNumber.slice(-7)
|
||||||
|
});
|
||||||
|
req.onsuccess = function () {
|
||||||
|
ise(req.result.length, 1, "Found exactly 1 contact.");
|
||||||
|
findResult1 = req.result[0];
|
||||||
|
ise(findResult1.id, sample_id1, "Same ID");
|
||||||
|
ise(findResult1.tel[0].value, landlineNumber, "Same Value");
|
||||||
|
next();
|
||||||
|
};
|
||||||
|
req.onerror = onFailure;
|
||||||
|
},
|
||||||
|
|
||||||
|
clearDatabase,
|
||||||
|
|
||||||
|
function () {
|
||||||
|
ok(true, "all done!\n");
|
||||||
|
SimpleTest.finish();
|
||||||
|
}
|
||||||
|
];
|
||||||
|
|
||||||
|
SpecialPowers.pushPrefEnv({
|
||||||
|
set: [
|
||||||
|
["dom.phonenumber.substringmatching.CL", 8],
|
||||||
|
["ril.lastKnownSimMcc", "730"]
|
||||||
|
]
|
||||||
|
}, start_tests);
|
||||||
|
</script>
|
||||||
|
</pre>
|
||||||
|
</body>
|
||||||
|
</html>
|
Loading…
Reference in New Issue
Block a user