From 04e3a4923aa933e5fb7432db75cec5dbc373fdfb Mon Sep 17 00:00:00 2001
From: Dimi <dlee@mozilla.com>
Date: Wed, 3 Aug 2022 15:38:20 +0000
Subject: [PATCH] Bug 1782535 - P2. Update testcase r=sgalich, a=dsmith
Differential Revision: https://phabricator.services.mozilla.com/D153582
---
.../test/unit/test_collectFormFields.js | 41 ++++++++-----
.../test/unit/test_markAsAutofillField.js | 58 ++++++++++---------
2 files changed, 59 insertions(+), 40 deletions(-)
diff --git a/browser/extensions/formautofill/test/unit/test_collectFormFields.js b/browser/extensions/formautofill/test/unit/test_collectFormFields.js
index 1cadeb47577eb..2109940341401 100644
--- a/browser/extensions/formautofill/test/unit/test_collectFormFields.js
+++ b/browser/extensions/formautofill/test/unit/test_collectFormFields.js
@@ -4,6 +4,10 @@
"use strict";
+const { AppConstants } = ChromeUtils.import(
+ "resource://gre/modules/AppConstants.jsm"
+);
+
var FormAutofillHandler;
add_task(async function setup() {
({ FormAutofillHandler } = ChromeUtils.import(
@@ -480,20 +484,29 @@ const TESTCASES = [
document: `<form>
<input id="cc-number" name="cc-number">
</form>`,
- sections: [
- [
- {
- section: "",
- addressType: "",
- contactType: "",
- fieldName: "cc-number",
- },
- ],
- ],
- validFieldDetails: [
- { section: "", addressType: "", contactType: "", fieldName: "cc-number" },
- ],
- ids: ["cc-number"],
+ sections: AppConstants.EARLY_BETA_OR_EARLIER
+ ? [
+ [
+ {
+ section: "",
+ addressType: "",
+ contactType: "",
+ fieldName: "cc-number",
+ },
+ ],
+ ]
+ : [[]],
+ validFieldDetails: AppConstants.EARLY_BETA_OR_EARLIER
+ ? [
+ {
+ section: "",
+ addressType: "",
+ contactType: "",
+ fieldName: "cc-number",
+ },
+ ]
+ : [],
+ ids: AppConstants.EARLY_BETA_OR_EARLIER ? ["cc-number"] : [],
},
{
description: "An invalid credit card form due to omitted cc-number.",
diff --git a/browser/extensions/formautofill/test/unit/test_markAsAutofillField.js b/browser/extensions/formautofill/test/unit/test_markAsAutofillField.js
index 9f2426e25432e..eb8b4d26751f4 100644
--- a/browser/extensions/formautofill/test/unit/test_markAsAutofillField.js
+++ b/browser/extensions/formautofill/test/unit/test_markAsAutofillField.js
@@ -1,5 +1,9 @@
"use strict";
+const { AppConstants } = ChromeUtils.import(
+ "resource://gre/modules/AppConstants.jsm"
+);
+
const TESTCASES = [
{
description: "Form containing 8 fields with autocomplete attribute.",
@@ -93,7 +97,9 @@ const TESTCASES = [
<input id="cc-number3" maxlength="4">
</form>`,
targetElementId: "cc-number1",
- expectedResult: ["cc-number1", "cc-number2", "cc-number3"],
+ expectedResult: AppConstants.EARLY_BETA_OR_EARLIER
+ ? ["cc-number1", "cc-number2", "cc-number3"]
+ : [],
},
{
description:
@@ -106,13 +112,9 @@ const TESTCASES = [
<input id="cc-number5" maxlength="4">
</form>`,
targetElementId: "cc-number1",
- expectedResult: [
- "cc-number1",
- "cc-number2",
- "cc-number3",
- "cc-number4",
- "cc-number5",
- ],
+ expectedResult: AppConstants.EARLY_BETA_OR_EARLIER
+ ? ["cc-number1", "cc-number2", "cc-number3", "cc-number4", "cc-number5"]
+ : [],
},
{
description:
@@ -126,14 +128,16 @@ const TESTCASES = [
<input id="cc-exp-year">
</form>`,
targetElementId: "cc-number1",
- expectedResult: [
- "cc-number1",
- "cc-number2",
- "cc-number3",
- "cc-name",
- "cc-exp-month",
- "cc-exp-year",
- ],
+ expectedResult: AppConstants.EARLY_BETA_OR_EARLIER
+ ? [
+ "cc-number1",
+ "cc-number2",
+ "cc-number3",
+ "cc-name",
+ "cc-exp-month",
+ "cc-exp-year",
+ ]
+ : ["cc-number3", "cc-name", "cc-exp-month", "cc-exp-year"],
},
{
description:
@@ -149,16 +153,18 @@ const TESTCASES = [
<input id="cc-exp-year">
</form>`,
targetElementId: "cc-number1",
- expectedResult: [
- "cc-number1",
- "cc-number2",
- "cc-number3",
- "cc-number4",
- "cc-number5",
- "cc-name",
- "cc-exp-month",
- "cc-exp-year",
- ],
+ expectedResult: AppConstants.EARLY_BETA_OR_EARLIER
+ ? [
+ "cc-number1",
+ "cc-number2",
+ "cc-number3",
+ "cc-number4",
+ "cc-number5",
+ "cc-name",
+ "cc-exp-month",
+ "cc-exp-year",
+ ]
+ : ["cc-number5", "cc-name", "cc-exp-month", "cc-exp-year"],
},
];
--
GitLab