mozilla
/
gecko-dev
зеркало из https://github.com/mozilla/gecko-dev.git
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

Bug 588309 - Convert change password to a doorhanger panel. (a=tests)

This commit is contained in:
Margaret Leibovic 2010-09-09 19:08:26 -07:00
Родитель 9ec275a85b
Коммит 96d29768e7
4 изменённых файлов: 164 добавлений и 179 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

61
toolkit/components/passwordmgr/test/notification_common.js
Просмотреть файл

@ -1,53 +1,54 @@
/*
* getNotificationBox
* getPopupNotifications
*
* Fetches the notification box for the specified window.
* Fetches the popup notification for the specified window.
*/
function getNotificationBox(aWindow) {
var chromeWin = aWindow
.QueryInterface(Ci.nsIInterfaceRequestor)
.getInterface(Ci.nsIWebNavigation)
.QueryInterface(Ci.nsIDocShellTreeItem)
.rootTreeItem
.QueryInterface(Ci.nsIInterfaceRequestor)
.getInterface(Ci.nsIDOMWindow)
.QueryInterface(Ci.nsIDOMChromeWindow);
function getPopupNotifications(aWindow) {
var chromeWin = aWindow.QueryInterface(Ci.nsIInterfaceRequestor)
.getInterface(Ci.nsIWebNavigation)
.QueryInterface(Ci.nsIDocShell)
.chromeEventHandler.ownerDocument.defaultView;
// Don't need .wrappedJSObject here, unlike when chrome does this.
var notifyBox = chromeWin.getNotificationBox(aWindow);
return notifyBox;
var popupNotifications = chromeWin.PopupNotifications;
return popupNotifications;
}
/*
* getNotificationBar
* getPopup
*
*/
function getNotificationBar(aBox, aKind) {
ok(true, "Looking for " + aKind + " notification bar");
// Sometimes callers wants a bar, sometimes not. Allow 0 or 1, but not 2+.
ok(aBox.allNotifications.length <= 1, "Checking for multiple notifications");
return aBox.getNotificationWithValue(aKind);
function getPopup(aPopupNote, aKind) {
ok(true, "Looking for " + aKind + " popup notification");
return aPopupNote.getNotification(aKind);
}
/*
* clickNotificationButton
* clickPopupButton
*
* Clicks the specified notification button.
* Clicks the specified popup notification button.
*/
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 button = aBar.getElementsByTagName("button").item(aButtonIndex);
ok(button, "Got button " + aButtonIndex);
button.doCommand();
function clickPopupButton(aPopup, aButtonIndex) {
ok(true, "Looking for action at index " + aButtonIndex);
var notifications = aPopup.owner.panel.childNodes;
ok(notifications.length > 0, "at least one notification displayed");
ok(true, notifications.length + " notifications");
var notification = notifications[0];
if (aButtonIndex == 0) {
ok(true, "Triggering main action");
notification.button.doCommand();
} else if (aButtonIndex <= aPopup.secondaryActions.length) {
var index = aButtonIndex - 1;
ok(true, "Triggering secondary action " + index);
notification.childNodes[index].doCommand();
}
}
const kRememberButton = 0;
const kNeverButton = 1;
const kNotNowButton = 2;
const kChangeButton = 0;
const kDontChangeButton = 1;

175
toolkit/components/passwordmgr/test/test_notifications.html
Просмотреть файл

@ -70,10 +70,6 @@ function handleLoad(aEvent) {
testNum++;
// Remove any notification bar that might be lingering from a failed test.
notifyBox.removeAllNotifications(true);
if (testNum <= subtests.length) {
ok(true, "Starting test #" + testNum);
iframe.src = subtests[testNum-1];
@ -86,7 +82,7 @@ function handleLoad(aEvent) {
// Remember, Never for This Site, Not Now
function checkTest() {
var bar, notificationText, expectedText;
var popup, notificationText, expectedText;
// The document generated from formsubmit.sjs contains the user/pass it
// received inside <span id="blah">value</span>
@ -101,28 +97,28 @@ function checkTest() {
case 1:
is(gotUser, "notifyu1", "Checking submitted username");
is(gotPass, "notifyp1", "Checking submitted password");
bar = getNotificationBar(notifyBox, "password-save");
ok(bar, "got notification bar");
clickNotificationButton(bar, kNotNowButton);
popup = getPopup(popupNotifications, "password-save");
ok(popup, "got notification popup");
popup.remove();
break;
case 2:
// Same subtest, this time click Never
is(gotUser, "notifyu1", "Checking submitted username");
is(gotPass, "notifyp1", "Checking submitted password");
bar = getNotificationBar(notifyBox, "password-save");
ok(bar, "got notification bar");
popup = getPopup(popupNotifications, "password-save");
ok(popup, "got notification popup");
is(true, pwmgr.getLoginSavingEnabled("http://mochi.test:8888"),
"Checking for login saving enabled");
clickNotificationButton(bar, kNeverButton);
clickPopupButton(popup, kNeverButton);
break;
case 3:
// Same subtest, make sure Never took effect
is(gotUser, "notifyu1", "Checking submitted username");
is(gotPass, "notifyp1", "Checking submitted password");
bar = getNotificationBar(notifyBox, "password-save");
ok(!bar, "checking for no notification bar");
popup = getPopup(popupNotifications, "password-save");
ok(!popup, "checking for no notification popup");
is(false, pwmgr.getLoginSavingEnabled("http://mochi.test:8888"),
"Checking for login saving disabled");
// reenable login saving.
@ -133,22 +129,22 @@ function checkTest() {
// Same subtest, this time click Remember
is(gotUser, "notifyu1", "Checking submitted username");
is(gotPass, "notifyp1", "Checking submitted password");
bar = getNotificationBar(notifyBox, "password-save");
ok(bar, "got notification bar");
popup = getPopup(popupNotifications, "password-save");
ok(popup, "got notification popup");
// Sanity check, no logins should exist yet.
var logins = pwmgr.getAllLogins();
is(logins.length, 0, "Should not have any logins yet");
clickNotificationButton(bar, kRememberButton);
clickPopupButton(popup, kRememberButton);
break;
case 5:
// Same subtest, make sure we didn't prompt for an existing login.
is(gotUser, "notifyu1", "Checking submitted username");
is(gotPass, "notifyp1", "Checking submitted password");
bar = getNotificationBar(notifyBox, "password-save");
ok(!bar, "checking for no notification bar");
popup = getPopup(popupNotifications, "password-save");
ok(!popup, "checking for no notification popup");
// Check to make sure we updated the timestamps and use count on the
// existing loging that was submitted for this form.
@ -166,12 +162,12 @@ function checkTest() {
/* signons.rememberSignons pref tests... */
case 6:
// Same subtest, make sure we're getting the bar again.
// Same subtest, make sure we're getting the popup again.
is(gotUser, "notifyu1", "Checking submitted username");
is(gotPass, "notifyp1", "Checking submitted password");
bar = getNotificationBar(notifyBox, "password-save");
ok(bar, "got notification bar");
clickNotificationButton(bar, kNotNowButton);
popup = getPopup(popupNotifications, "password-save");
ok(popup, "got notification popup");
popup.remove();
// Change prefs to no longer remember signons
prefs.setBoolPref("rememberSignons", false);
break;
@ -180,66 +176,66 @@ function checkTest() {
// Same subtest, make sure we're not prompting.
is(gotUser, "notifyu1", "Checking submitted username");
is(gotPass, "notifyp1", "Checking submitted password");
bar = getNotificationBar(notifyBox, "password-save");
ok(!bar, "checking for no notification bar");
popup = getPopup(popupNotifications, "password-save");
ok(!popup, "checking for no notification popup");
// Change prefs to remember signons again
prefs.setBoolPref("rememberSignons", true);
break;
case 8:
// Same subtest, make sure we're getting the bar again.
// Same subtest, make sure we're getting the popup again.
is(gotUser, "notifyu1", "Checking submitted username");
is(gotPass, "notifyp1", "Checking submitted password");
bar = getNotificationBar(notifyBox, "password-save");
ok(bar, "got notification bar");
clickNotificationButton(bar, kNotNowButton);
popup = getPopup(popupNotifications, "password-save");
ok(popup, "got notification popup");
popup.remove();
break;
/* autocomplete=off tests... */
case 9:
// Check for no notification bar when autocomplete=off present
// Check for no notification popup when autocomplete=off present
is(gotUser, "notifyu1", "Checking submitted username");
is(gotPass, "notifyp1", "Checking submitted password");
bar = getNotificationBar(notifyBox, "password-save");
ok(!bar, "checking for no notification bar");
popup = getPopup(popupNotifications, "password-save");
ok(!popup, "checking for no notification popup");
break;
case 10:
// Check for no notification bar when autocomplete=off present
// Check for no notification popup when autocomplete=off present
is(gotUser, "notifyu1", "Checking submitted username");
is(gotPass, "notifyp1", "Checking submitted password");
bar = getNotificationBar(notifyBox, "password-save");
ok(!bar, "checking for no notification bar");
popup = getPopup(popupNotifications, "password-save");
ok(!popup, "checking for no notification popup");
break;
case 11:
// Check for no notification bar when autocomplete=off present
// Check for no notification popup when autocomplete=off present
is(gotUser, "notifyu1", "Checking submitted username");
is(gotPass, "notifyp1", "Checking submitted password");
bar = getNotificationBar(notifyBox, "password-save");
ok(!bar, "checking for no notification bar");
popup = getPopup(popupNotifications, "password-save");
ok(!popup, "checking for no notification popup");
break;
/* no password field test... */
case 12:
// Check for no notification bar when no password field present
// Check for no notification popup when no password field present
is(gotUser, "notifyu1", "Checking submitted username");
is(gotPass, "null", "Checking submitted password");
bar = getNotificationBar(notifyBox, "password-save");
ok(!bar, "checking for no notification bar");
popup = getPopup(popupNotifications, "password-save");
ok(!popup, "checking for no notification popup");
// Add login for the next test.
pwmgr.addLogin(login2);
break;
case 13:
// Check for no notification bar when existing pw-only login matches form.
// Check for no notification popup when existing pw-only login matches form.
is(gotUser, "notifyu1", "Checking submitted username");
is(gotPass, "notifyp1", "Checking submitted password");
bar = getNotificationBar(notifyBox, "password-save");
ok(!bar, "checking for no notification bar");
popup = getPopup(popupNotifications, "password-save");
ok(!popup, "checking for no notification popup");
pwmgr.removeLogin(login2);
// Add login for the next test
@ -247,11 +243,11 @@ function checkTest() {
break;
case 14:
// Check for no notification bar when pw-only form matches existing login.
// Check for no notification popup when pw-only form matches existing login.
is(gotUser, "null", "Checking submitted username");
is(gotPass, "notifyp1", "Checking submitted password");
bar = getNotificationBar(notifyBox, "password-save");
ok(!bar, "checking for no notification bar");
popup = getPopup(popupNotifications, "password-save");
ok(!popup, "checking for no notification popup");
pwmgr.removeLogin(login1);
// Add login for the next test
@ -259,47 +255,47 @@ function checkTest() {
break;
case 15:
// Check for notification bar when existing pw-only login doesn't match form.
// Check for notification popup when existing pw-only login doesn't match form.
is(gotUser, "notifyu1", "Checking submitted username");
is(gotPass, "notifyp1", "Checking submitted password");
bar = getNotificationBar(notifyBox, "password-save");
ok(bar, "got notification bar");
clickNotificationButton(bar, kNotNowButton);
popup = getPopup(popupNotifications, "password-save");
ok(popup, "got notification popup");
pwmgr.removeLogin(login2B);
popup.remove();
// Add login for the next test
pwmgr.addLogin(login1B);
break;
case 16:
// Check for notification bar when pw-only form doesn't match existing login.
// Check for notification popup when pw-only form doesn't match existing login.
is(gotUser, "null", "Checking submitted username");
is(gotPass, "notifyp1", "Checking submitted password");
bar = getNotificationBar(notifyBox, "password-save");
ok(bar, "got notification bar");
clickNotificationButton(bar, kNotNowButton);
popup = getPopup(popupNotifications, "password-save");
ok(popup, "got notification popup");
pwmgr.removeLogin(login1B);
popup.remove();
// Add login for the next tests
pwmgr.addLogin(login1);
break;
case 17:
// Check for change-password bar, u+p login on u+p form. (not changed)
// Check for change-password popup, u+p login on u+p form. (not changed)
is(gotUser, "notifyu1", "Checking submitted username");
is(gotPass, "pass2", "Checking submitted password");
bar = getNotificationBar(notifyBox, "password-change");
ok(bar, "got notification bar");
clickNotificationButton(bar, kDontChangeButton);
popup = getPopup(popupNotifications, "password-change");
ok(popup, "got notification popup");
clickPopupButton(popup, kDontChangeButton);
break;
case 18:
// Check for change-password bar, u+p login on u+p form.
// Check for change-password popup, u+p login on u+p form.
is(gotUser, "notifyu1", "Checking submitted username");
is(gotPass, "pass2", "Checking submitted password");
bar = getNotificationBar(notifyBox, "password-change");
ok(bar, "got notification bar");
clickNotificationButton(bar, kChangeButton);
popup = getPopup(popupNotifications, "password-change");
ok(popup, "got notification popup");
clickPopupButton(popup, kChangeButton);
// Check to make sure we updated the timestamps and use count for
// the login being changed with this form.
@ -322,64 +318,64 @@ function checkTest() {
// ...can't change a u+p login on a p-only form...
case 19:
// Check for change-password bar, p-only login on u+p form.
// Check for change-password popup, p-only login on u+p form.
// (needed a different subtest for this because the login created in
// test_0init was interfering)
is(gotUser, "", "Checking submitted username");
is(gotPass, "pass2", "Checking submitted password");
bar = getNotificationBar(notifyBox, "password-change");
ok(bar, "got notification bar");
clickNotificationButton(bar, kChangeButton);
popup = getPopup(popupNotifications, "password-change");
ok(popup, "got notification popup");
clickPopupButton(popup, kChangeButton);
break;
case 20:
// Check for change-password bar, p-only login on p-only form.
// Check for change-password popup, p-only login on p-only form.
is(gotUser, "null", "Checking submitted username");
is(gotPass, "notifyp1", "Checking submitted password");
bar = getNotificationBar(notifyBox, "password-change");
ok(bar, "got notification bar");
clickNotificationButton(bar, kChangeButton);
popup = getPopup(popupNotifications, "password-change");
ok(popup, "got notification popup");
clickPopupButton(popup, kChangeButton);
pwmgr.removeLogin(login2);
break;
case 21:
// Check text on a user+pass notification bar
// Check text on a user+pass notification popup
is(gotUser, "notifyu1", "Checking submitted username");
is(gotPass, "notifyp1", "Checking submitted password");
bar = getNotificationBar(notifyBox, "password-save");
ok(bar, "got notification bar");
popup = getPopup(popupNotifications, "password-save");
ok(popup, "got notification popup");
// Check the text, which comes from the localized saveLoginText string.
notificationText = bar.getAttribute("label");
notificationText = popup.message;
expectedText = /^Do you want .+ to remember the password for \"notifyu1\" on example.org\?$/;
ok(expectedText.test(notificationText), "Checking text: " + notificationText);
clickNotificationButton(bar, kNotNowButton);
popup.remove();
break;
case 22:
// Check text on a user+pass notification bar, username is really long
// Check text on a user+pass notification popup, username is really long
is(gotUser, "nowisthetimeforallgoodmentocometotheaidoftheircountry", "Checking submitted username");
is(gotPass, "notifyp1", "Checking submitted password");
bar = getNotificationBar(notifyBox, "password-save");
ok(bar, "got notification bar");
popup = getPopup(popupNotifications, "password-save");
ok(popup, "got notification popup");
// Check the text, which comes from the localized saveLoginText string.
notificationText = bar.getAttribute("label");
notificationText = popup.message;
expectedText = /^Do you want .+ to remember the password for \"nowisthetimeforallgoodmentocom[^e]\" on example.org\?$/;
ok(expectedText.test(notificationText), "Checking text: " + notificationText);
clickNotificationButton(bar, kNotNowButton);
popup.remove();
break;
case 23:
// Check text on a pass-only notification bar
// Check text on a pass-only notification popup
is(gotUser, "null", "Checking submitted username");
is(gotPass, "notifyp1", "Checking submitted password");
bar = getNotificationBar(notifyBox, "password-save");
ok(bar, "got notification bar");
popup = getPopup(popupNotifications, "password-save");
ok(popup, "got notification popup");
// Check the text, which comes from the localized saveLoginTextNoUser string.
notificationText = bar.getAttribute("label");
notificationText = popup.message;
expectedText = /^Do you want .+ to remember this password on example.org\?$/;
ok(expectedText.test(notificationText), "Checking text: " + notificationText);
clickNotificationButton(bar, kNotNowButton);
popup.remove();
break;
default:
@ -425,13 +421,10 @@ var login2B = new nsLoginInfo("http://mochi.test:8888", "http://mochi.test:8888"
var iframe = document.getElementById("iframe");
iframe.onload = handleLoad;
// The notification box (not *bar*) is a constant, per-tab container. So, we
// popupNotifications (not *popup*) is a constant, per-tab container. So, we
// only need to fetch it once.
var notifyBox = getNotificationBox(window.top);
ok(notifyBox, "Got notification box");
// Remove any notification bars that might be left over from other tests.
notifyBox.removeAllNotifications(true);
var popupNotifications = getPopupNotifications(window.top);
ok(popupNotifications, "Got popupNotifications");
var testNum = 1;
ok(true, "Starting test #" + testNum);

60
toolkit/components/passwordmgr/test/test_privbrowsing.html
Просмотреть файл

@ -103,49 +103,47 @@ function loadNextTest() {
function checkTest() {
var bar;
var popup;
switch (testNum) {
case 1:
// run outside of private mode, notification bar should appear
bar = getNotificationBar(notifyBox, "password-save");
ok(bar, "got notification bar");
notifyBox.removeAllNotifications(true);
// run outside of private mode, popup notification should appear
popup = getPopup(popupNotifications, "password-save");
ok(popup, "got popup notification");
popup.remove();
break;
case 2:
// run inside of private mode, notification bar should not appear
bar = getNotificationBar(notifyBox, "password-save");
ok(!bar, "checking for no notification bar");
notifyBox.removeAllNotifications(true);
// run inside of private mode, popup notification should not appear
popup = getPopup(popupNotifications, "password-save");
ok(!popup, "checking for no popup notification");
break;
case 3:
// run outside of private mode, notification bar should appear
bar = getNotificationBar(notifyBox, "password-save");
ok(bar, "got notification bar");
notifyBox.removeAllNotifications(true);
// run outside of private mode, popup notification should appear
popup = getPopup(popupNotifications, "password-save");
ok(popup, "got popup notification");
popup.remove();
break;
case 4:
// run outside of private mode, notification bar should appear
bar = getNotificationBar(notifyBox, "password-change");
ok(bar, "got notification bar");
notifyBox.removeAllNotifications(true);
// run outside of private mode, popup notification should appear
popup = getPopup(popupNotifications, "password-change");
ok(popup, "got popup notification");
popup.remove();
break;
case 5:
// run inside of private mode, notification bar should not appear
bar = getNotificationBar(notifyBox, "password-change");
ok(!bar, "checking for no notification bar");
notifyBox.removeAllNotifications(true);
// run inside of private mode, popup notification should not appear
popup = getPopup(popupNotifications, "password-change");
ok(!popup, "checking for no popup notification");
break;
case 6:
// run outside of private mode, notification bar should appear
bar = getNotificationBar(notifyBox, "password-change");
ok(bar, "got notification bar");
notifyBox.removeAllNotifications(true);
// run outside of private mode, popup notification should appear
popup = getPopup(popupNotifications, "password-change");
ok(popup, "got popup notification");
popup.remove();
pwmgr.removeLogin(login);
break;
@ -220,9 +218,6 @@ function handleLoad(aEvent) {
checkTest();
// Remove any notification bar that might be lingering from a failed test.
notifyBox.removeAllNotifications(true);
if (testNum < subtests.length) {
loadNextTest();
} else {
@ -264,13 +259,10 @@ if (!pb) { // Private Browsing might not be available
var iframe = document.getElementById("iframe");
iframe.onload = handleLoad;
// The notification box (not *bar*) is a constant, per-tab container. So, we
// popupNotifications (not *popup*) is a constant, per-tab container. So, we
// only need to fetch it once.
var notifyBox = getNotificationBox(window.top);
ok(notifyBox, "Got notification box");
// Remove any notification bars that might be left over from other tests.
notifyBox.removeAllNotifications(true);
var popupNotifications = getPopupNotifications(window.top);
ok(popupNotifications, "Got popupNotifications");
SimpleTest.waitForExplicitFinish();

47
toolkit/components/passwordmgr/test/test_prompt.html
Просмотреть файл

@ -395,7 +395,7 @@ function handleLoad() {
// Same realm we've already authenticated to, but with a different
// expected password (to trigger an auth prompt, and change-password
// notification bar).
// popup notification).
startCallbackTimer();
iframe.src = "authenticate.sjs?user=mochiuser1&pass=mochipass1-new";
break;
@ -406,11 +406,12 @@ function handleLoad() {
is(username, "mochiuser1", "Checking for echoed username");
is(password, "mochipass1-new", "Checking for echoed password");
// Check for the notification bar, and change the password.
bar = getNotificationBar(notifyBox, "password-change");
ok(bar, "got notification bar");
clickNotificationButton(bar, kChangeButton);
// Check for the popup notification, and change the password.
popup = getPopup(popupNotifications, "password-change");
ok(popup, "got popup notification");
clickPopupButton(popup, kChangeButton);
popup.remove();
// Housekeeping: change it back
tmpLogin.init("http://mochi.test:8888", null, "mochitest",
"mochiuser1", "mochipass1-new", "", "");
@ -418,7 +419,7 @@ function handleLoad() {
// Same as last test, but for a realm we haven't already authenticated
// to (but have an existing saved login for, so that we'll trigger
// a change-password notification bar.
// a change-password popup notification.
startCallbackTimer();
iframe.src = "authenticate.sjs?user=mochiuser3&pass=mochipass3-new&realm=mochitest3";
break;
@ -429,10 +430,11 @@ function handleLoad() {
is(username, "mochiuser3", "Checking for echoed username");
is(password, "mochipass3-new", "Checking for echoed password");
// Check for the notification bar, and change the password.
bar = getNotificationBar(notifyBox, "password-change");
ok(bar, "got notification bar");
clickNotificationButton(bar, kChangeButton);
// Check for the popup notification, and change the password.
popup = getPopup(popupNotifications, "password-change");
ok(popup, "got popup notification");
clickPopupButton(popup, kChangeButton);
popup.remove();
// Housekeeping: change it back to the original login4. Actually,
// just delete it and we'll re-add it as the next test.
@ -455,11 +457,12 @@ function handleLoad() {
is(username, "mochiuser3", "Checking for echoed username");
is(password, "mochipass3-old", "Checking for echoed password");
// Check for the notification bar, and change the password.
bar = getNotificationBar(notifyBox, "password-save");
ok(bar, "got notification bar");
clickNotificationButton(bar, kRememberButton);
// Check for the popup notification, and change the password.
popup = getPopup(popupNotifications, "password-save");
ok(popup, "got popup notification");
clickPopupButton(popup, kRememberButton);
popup.remove();
finishTest();
break;
@ -519,14 +522,10 @@ var pword = { value : null };
var result = { value : null };
var isOk;
// The notification box (not *bar*) is a constant, per-tab container. So, we
// popupNotifications (not *popup*) is a constant, per-tab container. So, we
// only need to fetch it once.
var notifyBox = getNotificationBox(window.top);
ok(notifyBox, "Got notification box");
// Remove any notification bars that might be left over from other tests.
notifyBox.removeAllNotifications(true);
var popupNotifications = getPopupNotifications(window.top);
ok(popupNotifications, "Got popupNotifications");
// ===== test 1 =====
var testNum = 1;
@ -1016,7 +1015,7 @@ if (pb) {
prefs.clearUserPref("signon.autologin.proxy");
// XXX check for and kill notification bar??
// XXX check for and kill popup notification??
// XXX check for checkbox / checkstate on old prompts?
// XXX check NTLM domain stuff