nagai/fune
3
0
Fork 0
forked from mirrors/gecko-dev
Code Pull requests Activity

Bug 1869065 - Re-visit some of the element property names used in moz-message-bar. r=hjones,reusable-components-reviewers,omc-reviewers,aminomancer

Browse source 
Differential Revision: https://phabricator.services.mozilla.com/D207897
This commit is contained in:
gravyant 2024-04-23 21:27:46 +00:00
parent bf7d83f943
commit c7fdfabf96
7 changed files with 30 additions and 27 deletions
repo.diff.show_diff_stats Download patch file Download diff file Expand all files Collapse all files

8
browser/components/asrouter/tests/browser/browser_asrouter_infobar.js
View file

@ -107,7 +107,7 @@ add_task(async function react_to_trigger() {
"Notification has default priority" "Notification has default priority"
); );
// Dismiss the notification // Dismiss the notification
notificationStack.currentNotification.closeButtonEl.click(); notificationStack.currentNotification.closeButton.click();
}); });
add_task(async function dismiss_telemetry() { add_task(async function dismiss_telemetry() {
@ -128,7 +128,7 @@ add_task(async function dismiss_telemetry() {
// Remove any IMPRESSION pings // Remove any IMPRESSION pings
dispatchStub.reset(); dispatchStub.reset();
infobar.notification.closeButtonEl.click(); infobar.notification.closeButton.click();
await BrowserTestUtils.waitForCondition( await BrowserTestUtils.waitForCondition(
() => infobar.notification === null, () => infobar.notification === null,
@ -204,7 +204,7 @@ add_task(async function prevent_multiple_messages() {
Assert.equal(dispatchStub.callCount, 2, "Impression count did not increase"); Assert.equal(dispatchStub.callCount, 2, "Impression count did not increase");
// Dismiss the first notification // Dismiss the first notification
infobar.notification.closeButtonEl.click(); infobar.notification.closeButton.click();
Assert.equal(InfoBar._activeInfobar, null, "Cleared the active notification"); Assert.equal(InfoBar._activeInfobar, null, "Cleared the active notification");
// Reset impressions count // Reset impressions count
@ -218,6 +218,6 @@ add_task(async function prevent_multiple_messages() {
Assert.ok(InfoBar._activeInfobar, "activeInfobar is set"); Assert.ok(InfoBar._activeInfobar, "activeInfobar is set");
Assert.equal(dispatchStub.callCount, 2, "Called twice with IMPRESSION"); Assert.equal(dispatchStub.callCount, 2, "Called twice with IMPRESSION");
// Dismiss the notification again // Dismiss the notification again
infobar.notification.closeButtonEl.click(); infobar.notification.closeButton.click();
Assert.equal(InfoBar._activeInfobar, null, "Cleared the active notification"); Assert.equal(InfoBar._activeInfobar, null, "Cleared the active notification");
}); });

2
browser/modules/test/browser/browser_ProcessHangNotifications.js
View file

@ -184,7 +184,7 @@ add_task(async function waitForScriptTest() {
}); });
// Click the "Close" button this time, we shouldn't get a callback at all. // Click the "Close" button this time, we shouldn't get a callback at all.
notification.currentNotification.closeButtonEl.click(); notification.currentNotification.closeButton.click();
// send another hang pulse, we should not get a notification here // send another hang pulse, we should not get a notification here
Services.obs.notifyObservers(hangReport, "process-hang-report"); Services.obs.notifyObservers(hangReport, "process-hang-report");

6
browser/modules/test/browser/browser_UnsubmittedCrashHandler.js
View file

@ -292,7 +292,7 @@ add_task(async function test_other_ignored() {
Assert.ok(notification, "There should be a notification"); Assert.ok(notification, "There should be a notification");
// Dismiss notification, creating the .dmp.ignore file // Dismiss notification, creating the .dmp.ignore file
notification.closeButtonEl.click(); notification.closeButton.click();
gNotificationBox.removeNotification(notification, true); gNotificationBox.removeNotification(notification, true);
await waitForIgnoredReports(toIgnore); await waitForIgnoredReports(toIgnore);
@ -525,7 +525,7 @@ add_task(async function test_can_ignore() {
Assert.ok(notification, "There should be a notification"); Assert.ok(notification, "There should be a notification");
// Dismiss the notification by clicking on the "X" button. // Dismiss the notification by clicking on the "X" button.
notification.closeButtonEl.click(); notification.closeButton.click();
// We'll not wait for the notification to finish its transition - // We'll not wait for the notification to finish its transition -
// we'll just remove it right away. // we'll just remove it right away.
gNotificationBox.removeNotification(notification, true); gNotificationBox.removeNotification(notification, true);
@ -599,7 +599,7 @@ add_task(async function test_shutdown_while_not_showing() {
Assert.ok(notification, "There should be a notification"); Assert.ok(notification, "There should be a notification");
// Dismiss the notification by clicking on the "X" button. // Dismiss the notification by clicking on the "X" button.
notification.closeButtonEl.click(); notification.closeButton.click();
// We'll not wait for the notification to finish its transition - // We'll not wait for the notification to finish its transition -
// we'll just remove it right away. // we'll just remove it right away.
gNotificationBox.removeNotification(notification, true); gNotificationBox.removeNotification(notification, true);

2
testing/firefox-ui/tests/functional/safebrowsing/test_notification.py
View file

@ -123,7 +123,7 @@ class TestSafeBrowsingNotificationBar(WindowManagerMixin, MarionetteTestCase):
message = notification_box.find_element( message = notification_box.find_element(
By.CSS_SELECTOR, "notification-message[value=blocked-badware-page]" By.CSS_SELECTOR, "notification-message[value=blocked-badware-page]"
) )
button = message.get_property("closeButtonEl") button = message.get_property("closeButton")
button.click() button.click()
Wait(self.marionette, timeout=self.marionette.timeout.page_load).until( Wait(self.marionette, timeout=self.marionette.timeout.page_load).until(

27
toolkit/content/tests/widgets/test_moz_message_bar.html
View file

@ -1,23 +1,25 @@
<!DOCTYPE HTML> <!DOCTYPE HTML>
<html> <html>
<head> <head>
<meta charset="utf-8"> <meta charset="utf-8">
<title>MozMessageBar tests</title> <title>MozMessageBar tests</title>
<script src="chrome://mochikit/content/tests/SimpleTest/SimpleTest.js"></script> <script src="chrome://mochikit/content/tests/SimpleTest/SimpleTest.js"></script>
<script src="chrome://mochikit/content/tests/SimpleTest/EventUtils.js"></script> <script src="chrome://mochikit/content/tests/SimpleTest/EventUtils.js"></script>
<link rel="stylesheet" href="chrome://mochikit/content/tests/SimpleTest/test.css"/> <link rel="stylesheet" href="chrome://mochikit/content/tests/SimpleTest/test.css" />
<script type="module" src="chrome://global/content/elements/moz-message-bar.mjs"></script> <script type="module" src="chrome://global/content/elements/moz-message-bar.mjs"></script>
</head> </head>
<body> <body>
<p id="display"></p> <p id="display"></p>
<div id="content"> <div id="content">
<moz-message-bar id="infoMessage" heading="Heading" message="Test message"></moz-message-bar> <moz-message-bar id="infoMessage" heading="Heading" message="Test message"></moz-message-bar>
<moz-message-bar id="infoMessage2" dismissable message="Test message"></moz-message-bar> <moz-message-bar id="infoMessage2" dismissable message="Test message"></moz-message-bar>
<moz-message-bar id="warningMessage" type="warning" message="Test message"></moz-message-bar> <moz-message-bar id="warningMessage" type="warning" message="Test message"></moz-message-bar>
<moz-message-bar id="successMessage" type="success" message="Test message"></moz-message-bar> <moz-message-bar id="successMessage" type="success" message="Test message"></moz-message-bar>
<moz-message-bar id="errorMessage" type="error" message="Test message"></moz-message-bar> <moz-message-bar id="errorMessage" type="error" message="Test message"></moz-message-bar>
</div> </div>
<pre id="test"> <pre id="test">
<script class="testbody" type="application/javascript"> <script class="testbody" type="application/javascript">
add_task(async function test_component_declaration() { add_task(async function test_component_declaration() {
const mozMessageBar = document.querySelector("#infoMessage"); const mozMessageBar = document.querySelector("#infoMessage");
@ -48,11 +50,11 @@
add_task(async function test_close_button() { add_task(async function test_close_button() {
const notDismissableComponent = document.querySelector("#infoMessage"); const notDismissableComponent = document.querySelector("#infoMessage");
let closeButton = notDismissableComponent.closeButtonEl; let closeButton = notDismissableComponent.closeButton;
ok(!closeButton, "Close button doesn't show when the message bar isn't dismissable."); ok(!closeButton, "Close button doesn't show when the message bar isn't dismissable.");
let dismissableComponent = document.querySelector("#infoMessage2"); let dismissableComponent = document.querySelector("#infoMessage2");
closeButton = dismissableComponent.closeButtonEl; closeButton = dismissableComponent.closeButton;
ok(closeButton, "Close button is shown when the message bar is dismissable."); ok(closeButton, "Close button is shown when the message bar is dismissable.");
closeButton.click(); closeButton.click();
@ -89,4 +91,5 @@
</script> </script>
</pre> </pre>
</body> </body>
</html> </html>

10
toolkit/content/widgets/moz-message-bar/moz-message-bar.mjs
View file

@ -49,10 +49,10 @@ const messageTypeToIconData = {
export default class MozMessageBar extends MozLitElement { export default class MozMessageBar extends MozLitElement {
static queries = { static queries = {
actionsSlotEl: "slot[name=actions]", actionsSlot: "slot[name=actions]",
actionsEl: ".actions", actionsEl: ".actions",
closeButtonEl: "moz-button.close", closeButton: "moz-button.close",
supportLinkSlotEl: "slot[name=support-link]", supportLinkSlot: "slot[name=support-link]",
}; };
static properties = { static properties = {
@ -72,7 +72,7 @@ export default class MozMessageBar extends MozLitElement {
} }
onSlotchange() { onSlotchange() {
let actions = this.actionsSlotEl.assignedNodes(); let actions = this.actionsSlot.assignedNodes();
this.actionsEl.classList.toggle("active", actions.length); this.actionsEl.classList.toggle("active", actions.length);
} }
@ -87,7 +87,7 @@ export default class MozMessageBar extends MozLitElement {
} }
get supportLinkEls() { get supportLinkEls() {
return this.supportLinkSlotEl.assignedElements(); return this.supportLinkSlot.assignedElements();
} }
iconTemplate() { iconTemplate() {

2
toolkit/mozapps/extensions/test/browser/browser_html_discover_view.js
View file

@ -657,7 +657,7 @@ add_task(async function checkDiscopaneNotice() {
messageBar = win.document.querySelector("moz-message-bar.discopane-notice"); messageBar = win.document.querySelector("moz-message-bar.discopane-notice");
ok(messageBar, "Recommended notice should exist in disco view"); ok(messageBar, "Recommended notice should exist in disco view");
messageBar.closeButtonEl.click(); messageBar.closeButton.click();
messageBar = win.document.querySelector("moz-message-bar.discopane-notice"); messageBar = win.document.querySelector("moz-message-bar.discopane-notice");
ok(!messageBar, "Recommended notice should not exist in disco view"); ok(!messageBar, "Recommended notice should not exist in disco view");
await switchToNonDiscoView(win); await switchToNonDiscoView(win);