Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-12-02 01:48:05 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1340104 - Hide the result without primary label in ProfileAutoCompleteResult.; r=MattN

Browse Source 
MozReview-Commit-ID: FSqU2fnKjeB

--HG--
extra : rebase_source : e96941b752c9c101ad6b90db0ef944c488d155d0
This commit is contained in:
Sean Lee 2017-02-16 23:05:35 +08:00
parent 13bc7a75b4
commit 795cdad162
2 changed files with 42 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
browser/extensions/formautofill/ProfileAutoCompleteResult.jsm
View File

@ -69,11 +69,11 @@ ProfileAutoCompleteResult.prototype = {
* @returns {number} The number of results
*/
get matchCount() {
return this._matchingProfiles.length;
return this._popupLabels.length;
},
_checkIndexBounds(index) {
if (index < 0 || index >= this._matchingProfiles.length) {
if (index < 0 || index >= this._popupLabels.length) {
throw Components.Exception("Index out of range.", Cr.NS_ERROR_ILLEGAL_VALUE);
}
},
@ -123,7 +123,10 @@ ProfileAutoCompleteResult.prototype = {
},
_generateLabels(focusedFieldName, allFieldNames, profiles) {
return profiles.map(profile => {
// Skip results without a primary label.
return profiles.filter(profile => {
return !!profile[focusedFieldName];
}).map(profile => {
return {
primary: profile[focusedFieldName],
secondary: this._getSecondaryLabel(focusedFieldName,

43
browser/extensions/formautofill/test/unit/test_profileAutocompleteResult.js
View File

@ -12,11 +12,17 @@ let matchingProfiles = [{
organization: "Mozilla",
"street-address": "331 E. Evelyn Avenue",
tel: "1-650-903-0800",
}, {
guid: "test-guid-3",
organization: "",
"street-address": "321, No Name St.",
tel: "1-000-000-0000",
}];
let allFieldNames = ["street-address", "organization", "tel"];
let testCases = [{
description: "Focus on an `organization` field",
options: {},
matchingProfiles,
allFieldNames,
@ -46,6 +52,7 @@ let testCases = [{
}],
},
}, {
description: "Focus on an `tel` field",
options: {},
matchingProfiles,
allFieldNames,
@ -72,9 +79,19 @@ let testCases = [{
secondary: "331 E. Evelyn Avenue",
}),
image: "",
}, {
value: "1-000-000-0000",
style: "autofill-profile",
comment: JSON.stringify(matchingProfiles[2]),
label: JSON.stringify({
primary: "1-000-000-0000",
secondary: "321, No Name St.",
}),
image: "",
}],
},
}, {
description: "Focus on an `street-address` field",
options: {},
matchingProfiles,
allFieldNames,
@ -101,9 +118,19 @@ let testCases = [{
secondary: "Mozilla",
}),
image: "",
}, {
value: "321, No Name St.",
style: "autofill-profile",
comment: JSON.stringify(matchingProfiles[2]),
label: JSON.stringify({
primary: "321, No Name St.",
secondary: "1-000-000-0000",
}),
image: "",
}],
},
}, {
description: "No matching profiles",
options: {},
matchingProfiles: [],
allFieldNames,
@ -115,6 +142,7 @@ let testCases = [{
items: [],
},
}, {
description: "Search with failure",
options: {resultCode: Ci.nsIAutoCompleteResult.RESULT_FAILURE},
matchingProfiles: [],
allFieldNames,
@ -128,13 +156,14 @@ let testCases = [{
}];
add_task(function* test_all_patterns() {
testCases.forEach(pattern => {
let actual = new ProfileAutoCompleteResult(pattern.searchString,
pattern.fieldName,
pattern.allFieldNames,
pattern.matchingProfiles,
pattern.options);
let expectedValue = pattern.expected;
testCases.forEach(testCase => {
do_print("Starting testcase: " + testCase.description);
let actual = new ProfileAutoCompleteResult(testCase.searchString,
testCase.fieldName,
testCase.allFieldNames,
testCase.matchingProfiles,
testCase.options);
let expectedValue = testCase.expected;
equal(actual.searchResult, expectedValue.searchResult);
equal(actual.defaultIndex, expectedValue.defaultIndex);
equal(actual.matchCount, expectedValue.items.length);