Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-14 05:45:37 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1476204 - Replace duplicate #error-text with .page-error. r=jaws

Browse Source 
MozReview-Commit-ID: 2FOx9dpTpAs

--HG--
extra : rebase_source : 07cc1137c4f925a4f5554c2680c624d59da5fcd8
This commit is contained in:
Matthew Noorenberghe 2018-07-23 20:34:40 -07:00
parent 07463fbd62
commit 84558567ed
4 changed files with 6 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
browser/components/payments/res/containers/payment-dialog.js
View File

@ -53,7 +53,7 @@ export default class PaymentDialog extends PaymentStateSubscriberMixin(HTMLEleme
this._header = contents.querySelector("header");
this._errorText = contents.querySelector("#error-text");
this._errorText = contents.querySelector("#payment-summary .page-error");
this._disabledOverlay = contents.getElementById("disabled-overlay");

4
browser/components/payments/res/paymentRequest.css
View File

@ -91,10 +91,6 @@ payment-dialog > header {
padding-bottom: 18px;
}
#error-text {
text-align: center;
}
#order-details-overlay {
background-color: var(--in-content-page-background);
overflow: auto;

3
browser/components/payments/res/paymentRequest.xhtml
View File

@ -106,7 +106,7 @@
<div id="main-container">
<payment-request-page id="payment-summary">
<div class="page-body">
<div id="error-text"></div>
<div class="page-error" aria-live="polite"></div>
<address-picker class="shipping-related"
data-add-link-label="&address.addLink.label;"
data-edit-link-label="&address.editLink.label;"
@ -128,7 +128,6 @@
data-add-link-label="&payer.addLink.label;"
data-edit-link-label="&payer.editLink.label;"
selected-state-key="selectedPayerAddress"></address-picker>
<div id="error-text"></div>
</div>
<footer>

8
browser/components/payments/test/browser/browser_shippingaddresschange_error.js
View File

@ -37,7 +37,7 @@ add_task(async function test_show_error_on_addresschange() {
}, PTU.ContentTasks.awaitPaymentRequestEventPromise);
await spawnPaymentDialogTask(frame, expectedText => {
let errorText = content.document.querySelector("#error-text");
let errorText = content.document.querySelector("#payment-summary .page-error");
is(errorText.textContent, expectedText, "Error text should be on dialog");
ok(content.isVisible(errorText), "Error text should be visible");
}, PTU.Details.genericShippingError.error);
@ -59,7 +59,7 @@ add_task(async function test_show_error_on_addresschange() {
}, PTU.ContentTasks.awaitPaymentRequestEventPromise);
await spawnPaymentDialogTask(frame, () => {
let errorText = content.document.querySelector("#error-text");
let errorText = content.document.querySelector("#payment-summary .page-error");
is(errorText.textContent, "", "Error text should not be on dialog");
ok(content.isHidden(errorText), "Error text should not be visible");
});
@ -112,7 +112,7 @@ add_task(async function test_show_field_specific_error_on_addresschange() {
return Object.keys(state.request.paymentDetails.shippingAddressErrors).length;
}, "Check that there are shippingAddressErrors");
is(content.document.querySelector("#error-text").textContent,
is(content.document.querySelector("#payment-summary .page-error").textContent,
PTU.Details.fieldSpecificErrors.error,
"Error text should be present on dialog");
@ -165,7 +165,7 @@ add_task(async function test_show_field_specific_error_on_addresschange() {
return !Object.keys(state.request.paymentDetails.shippingAddressErrors).length;
}, "Check that there are no more shippingAddressErrors");
is(content.document.querySelector("#error-text").textContent,
is(content.document.querySelector("#payment-summary .page-error").textContent,
"", "Error text should not be present on dialog");
info("click the Edit link again");