wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Bug 487797 - Don't rely on button names in <passwordmgr/test/*>. r=dolske

Browse Source
This commit is contained in:
Matt Noorenberghe 2009-05-06 12:55:25 -07:00
parent 39be6cc0a9
commit 7bf8bb64d3
3 changed files with 28 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
toolkit/components/passwordmgr/test/notification_common.js
View File

@ -36,19 +36,18 @@ function getNotificationBar(aBox, aKind) {
*
* Clicks the specified notification button.
*/
function clickNotificationButton(aBar, aButtonName) {
function clickNotificationButton(aBar, aButtonIndex) {
// This is a bit of a hack. The notification doesn't have an API to
// trigger buttons, so we dive down into the implementation and twiddle
// the buttons directly.
var buttons = aBar.getElementsByTagName("button");
var clicked = false;
for (var i = 0; i < buttons.length; i++) {
if (buttons[i].label == aButtonName) {
buttons[i].click();
clicked = true;
break;
}
}
ok(clicked, "Clicked \"" + aButtonName + "\" button");
var button = aBar.getElementsByTagName("button").item(aButtonIndex);
ok(button, "Got button " + aButtonIndex);
button.doCommand();
}
const kRememberButton = 0;
const kNeverButton = 1;
const kNotNowButton = 2;
const kChangeButton = 0;
const kDontChangeButton = 1;

28
toolkit/components/passwordmgr/test/test_notifications.html
View File

@ -103,7 +103,7 @@ function checkTest() {
is(gotPass, "notifyp1", "Checking submitted password");
bar = getNotificationBar(notifyBox, "password-save");
ok(bar, "got notification bar");
clickNotificationButton(bar, "Not Now");
clickNotificationButton(bar, kNotNowButton);
break;
case 2:
@ -114,7 +114,7 @@ function checkTest() {
ok(bar, "got notification bar");
is(true, pwmgr.getLoginSavingEnabled("http://localhost:8888"),
"Checking for login saving enabled");
clickNotificationButton(bar, "Never for This Site");
clickNotificationButton(bar, kNeverButton);
break;
case 3:
@ -135,7 +135,7 @@ function checkTest() {
is(gotPass, "notifyp1", "Checking submitted password");
bar = getNotificationBar(notifyBox, "password-save");
ok(bar, "got notification bar");
clickNotificationButton(bar, "Remember");
clickNotificationButton(bar, kRememberButton);
break;
case 5:
@ -156,7 +156,7 @@ function checkTest() {
is(gotPass, "notifyp1", "Checking submitted password");
bar = getNotificationBar(notifyBox, "password-save");
ok(bar, "got notification bar");
clickNotificationButton(bar, "Not Now");
clickNotificationButton(bar, kNotNowButton);
// Change prefs to no longer remember signons
prefs.setBoolPref("rememberSignons", false);
break;
@ -177,7 +177,7 @@ function checkTest() {
is(gotPass, "notifyp1", "Checking submitted password");
bar = getNotificationBar(notifyBox, "password-save");
ok(bar, "got notification bar");
clickNotificationButton(bar, "Not Now");
clickNotificationButton(bar, kNotNowButton);
break;
/* autocomplete=off tests... */
@ -249,7 +249,7 @@ function checkTest() {
is(gotPass, "notifyp1", "Checking submitted password");
bar = getNotificationBar(notifyBox, "password-save");
ok(bar, "got notification bar");
clickNotificationButton(bar, "Not Now");
clickNotificationButton(bar, kNotNowButton);
pwmgr.removeLogin(login2B);
// Add login for the next test
@ -262,7 +262,7 @@ function checkTest() {
is(gotPass, "notifyp1", "Checking submitted password");
bar = getNotificationBar(notifyBox, "password-save");
ok(bar, "got notification bar");
clickNotificationButton(bar, "Not Now");
clickNotificationButton(bar, kNotNowButton);
pwmgr.removeLogin(login1B);
// Add login for the next tests
@ -275,7 +275,7 @@ function checkTest() {
is(gotPass, "pass2", "Checking submitted password");
bar = getNotificationBar(notifyBox, "password-change");
ok(bar, "got notification bar");
clickNotificationButton(bar, "Don't Change");
clickNotificationButton(bar, kDontChangeButton);
break;
case 18:
@ -284,7 +284,7 @@ function checkTest() {
is(gotPass, "pass2", "Checking submitted password");
bar = getNotificationBar(notifyBox, "password-change");
ok(bar, "got notification bar");
clickNotificationButton(bar, "Change");
clickNotificationButton(bar, kChangeButton);
// cleanup
login1.password = "pass2";
@ -305,7 +305,7 @@ function checkTest() {
is(gotPass, "pass2", "Checking submitted password");
bar = getNotificationBar(notifyBox, "password-change");
ok(bar, "got notification bar");
clickNotificationButton(bar, "Change");
clickNotificationButton(bar, kChangeButton);
break;
case 20:
@ -314,7 +314,7 @@ function checkTest() {
is(gotPass, "notifyp1", "Checking submitted password");
bar = getNotificationBar(notifyBox, "password-change");
ok(bar, "got notification bar");
clickNotificationButton(bar, "Change");
clickNotificationButton(bar, kChangeButton);
pwmgr.removeLogin(login2);
break;
@ -329,7 +329,7 @@ function checkTest() {
notificationText = bar.getAttribute("label");
expectedText = /^Do you want .+ to remember the password for \"notifyu1\" on example.org\?$/;
ok(expectedText.test(notificationText), "Checking text: " + notificationText);
clickNotificationButton(bar, "Not Now");
clickNotificationButton(bar, kNotNowButton);
break;
case 22:
@ -342,7 +342,7 @@ function checkTest() {
notificationText = bar.getAttribute("label");
expectedText = /^Do you want .+ to remember the password for \"nowisthetimeforallgoodmentocom[^e]\" on example.org\?$/;
ok(expectedText.test(notificationText), "Checking text: " + notificationText);
clickNotificationButton(bar, "Not Now");
clickNotificationButton(bar, kNotNowButton);
break;
case 23:
@ -355,7 +355,7 @@ function checkTest() {
notificationText = bar.getAttribute("label");
expectedText = /^Do you want .+ to remember this password on example.org\?$/;
ok(expectedText.test(notificationText), "Checking text: " + notificationText);
clickNotificationButton(bar, "Not Now");
clickNotificationButton(bar, kNotNowButton);
break;
default:

6
toolkit/components/passwordmgr/test/test_prompt.html
View File

@ -372,7 +372,7 @@ function handleLoad() {
// Check for the notification bar, and change the password.
bar = getNotificationBar(notifyBox, "password-change");
ok(bar, "got notification bar");
clickNotificationButton(bar, "Change");
clickNotificationButton(bar, kChangeButton);
// Housekeeping: change it back
tmpLogin.init("http://localhost:8888", null, "mochitest",
@ -395,7 +395,7 @@ function handleLoad() {
// Check for the notification bar, and change the password.
bar = getNotificationBar(notifyBox, "password-change");
ok(bar, "got notification bar");
clickNotificationButton(bar, "Change");
clickNotificationButton(bar, kChangeButton);
// Housekeeping: change it back to the original login4. Actually,
// just delete it and we'll re-add it as the next test.
@ -421,7 +421,7 @@ function handleLoad() {
// Check for the notification bar, and change the password.
bar = getNotificationBar(notifyBox, "password-save");
ok(bar, "got notification bar");
clickNotificationButton(bar, "Remember");
clickNotificationButton(bar, kRememberButton);
finishTest();
break;