зеркало из https://github.com/mozilla/gecko-dev.git
Bug 1273871 - Split up browser_capture_doorhanger.js test for avoiding the timeout issue. r=MattN
MozReview-Commit-ID: CAd4VP53I3h --HG-- rename : toolkit/components/passwordmgr/test/browser/browser_capture_doorhanger.js => toolkit/components/passwordmgr/test/browser/browser_capture_doorhanger_httpsUpgrade.js extra : rebase_source : 3951d5b5a2ce77eb5f06bf45dfbfd894ec1a155a
This commit is contained in:
Evan Tseng
Родитель
8c67883c04
Коммит
3ceecd9dfc
|
|
@ -15,7 +15,6 @@ support-files =
|
|||
streamConverter_content.sjs
|
||||
|
||||
[browser_capture_doorhanger.js]
|
||||
skip-if = true # Bug 1273871
|
||||
support-files =
|
||||
subtst_notifications_1.html
|
||||
subtst_notifications_2.html
|
||||
|
|
@ -29,6 +28,10 @@ support-files =
|
|||
subtst_notifications_9.html
|
||||
subtst_notifications_10.html
|
||||
subtst_notifications_change_p.html
|
||||
[browser_capture_doorhanger_httpsUpgrade.js]
|
||||
support-files =
|
||||
subtst_notifications_1.html
|
||||
subtst_notifications_8.html
|
||||
[browser_capture_doorhanger_window_open.js]
|
||||
support-files =
|
||||
subtst_notifications_11.html
|
||||
|
|
|
|||
|
|
@ -9,8 +9,6 @@ let nsLoginInfo = new Components.Constructor("@mozilla.org/login-manager/loginIn
|
|||
Ci.nsILoginInfo, "init");
|
||||
let login1 = new nsLoginInfo("http://example.com", "http://example.com", null,
|
||||
"notifyu1", "notifyp1", "user", "pass");
|
||||
let login1HTTPS = new nsLoginInfo("https://example.com", "https://example.com", null,
|
||||
"notifyu1", "notifyp1", "user", "pass");
|
||||
let login2 = new nsLoginInfo("http://example.com", "http://example.com", null,
|
||||
"", "notifyp1", "", "pass");
|
||||
let login1B = new nsLoginInfo("http://example.com", "http://example.com", null,
|
||||
|
|
@ -598,119 +596,5 @@ add_task(function* test_noShowPasswordOnDismissal() {
|
|||
});
|
||||
});
|
||||
|
||||
add_task(function* test_httpsUpgradeCaptureFields_noChange() {
|
||||
info("Check that we don't prompt to remember when capturing an upgraded login with no change");
|
||||
Services.logins.addLogin(login1);
|
||||
// Sanity check the HTTP login exists.
|
||||
let logins = Services.logins.getAllLogins();
|
||||
is(logins.length, 1, "Should have the HTTP login");
|
||||
|
||||
yield testSubmittingLoginForm("subtst_notifications_1.html", function*(fieldValues) {
|
||||
is(fieldValues.username, "notifyu1", "Checking submitted username");
|
||||
is(fieldValues.password, "notifyp1", "Checking submitted password");
|
||||
let notif = getCaptureDoorhanger("password-save");
|
||||
ok(!notif, "checking for no notification popup");
|
||||
}, "https://example.com"); // This is HTTPS whereas the saved login is HTTP
|
||||
|
||||
logins = Services.logins.getAllLogins();
|
||||
is(logins.length, 1, "Should only have 1 login still");
|
||||
let login = logins[0].QueryInterface(Ci.nsILoginMetaInfo);
|
||||
is(login.hostname, "http://example.com", "Check the hostname is unchanged");
|
||||
is(login.username, "notifyu1", "Check the username is unchanged");
|
||||
is(login.password, "notifyp1", "Check the password is unchanged");
|
||||
is(login.timesUsed, 2, "Check times used increased");
|
||||
|
||||
Services.logins.removeLogin(login1);
|
||||
});
|
||||
|
||||
add_task(function* test_httpsUpgradeCaptureFields_changePW() {
|
||||
info("Check that we prompt to change when capturing an upgraded login with a new PW");
|
||||
Services.logins.addLogin(login1);
|
||||
// Sanity check the HTTP login exists.
|
||||
let logins = Services.logins.getAllLogins();
|
||||
is(logins.length, 1, "Should have the HTTP login");
|
||||
|
||||
yield testSubmittingLoginForm("subtst_notifications_8.html", function*(fieldValues) {
|
||||
is(fieldValues.username, "notifyu1", "Checking submitted username");
|
||||
is(fieldValues.password, "pass2", "Checking submitted password");
|
||||
let notif = getCaptureDoorhanger("password-change");
|
||||
ok(notif, "checking for a change popup");
|
||||
|
||||
yield* checkDoorhangerUsernamePassword("notifyu1", "pass2");
|
||||
clickDoorhangerButton(notif, CHANGE_BUTTON);
|
||||
|
||||
ok(!getCaptureDoorhanger("password-change"), "popup should be gone");
|
||||
}, "https://example.com"); // This is HTTPS whereas the saved login is HTTP
|
||||
|
||||
checkOnlyLoginWasUsedTwice({ justChanged: true });
|
||||
logins = Services.logins.getAllLogins();
|
||||
is(logins.length, 1, "Should only have 1 login still");
|
||||
let login = logins[0].QueryInterface(Ci.nsILoginMetaInfo);
|
||||
is(login.hostname, "https://example.com", "Check the hostname is upgraded");
|
||||
is(login.formSubmitURL, "https://example.com", "Check the formSubmitURL is upgraded");
|
||||
is(login.username, "notifyu1", "Check the username is unchanged");
|
||||
is(login.password, "pass2", "Check the password changed");
|
||||
is(login.timesUsed, 2, "Check times used increased");
|
||||
|
||||
Services.logins.removeAllLogins();
|
||||
});
|
||||
|
||||
add_task(function* test_httpsUpgradeCaptureFields_captureMatchingHTTP() {
|
||||
info("Capture a new HTTP login which matches a stored HTTPS one.");
|
||||
Services.logins.addLogin(login1HTTPS);
|
||||
|
||||
yield testSubmittingLoginForm("subtst_notifications_1.html", function*(fieldValues) {
|
||||
is(fieldValues.username, "notifyu1", "Checking submitted username");
|
||||
is(fieldValues.password, "notifyp1", "Checking submitted password");
|
||||
let notif = getCaptureDoorhanger("password-save");
|
||||
ok(notif, "got notification popup");
|
||||
|
||||
is(Services.logins.getAllLogins().length, 1, "Should only have the HTTPS login");
|
||||
|
||||
yield* checkDoorhangerUsernamePassword("notifyu1", "notifyp1");
|
||||
clickDoorhangerButton(notif, REMEMBER_BUTTON);
|
||||
});
|
||||
|
||||
let logins = Services.logins.getAllLogins();
|
||||
is(logins.length, 2, "Should have both HTTP and HTTPS logins");
|
||||
for (let login of logins) {
|
||||
login = login.QueryInterface(Ci.nsILoginMetaInfo);
|
||||
is(login.username, "notifyu1", "Check the username used on the new entry");
|
||||
is(login.password, "notifyp1", "Check the password used on the new entry");
|
||||
is(login.timesUsed, 1, "Check times used on entry");
|
||||
}
|
||||
|
||||
info("Make sure Remember took effect and we don't prompt for an existing HTTP login");
|
||||
yield testSubmittingLoginForm("subtst_notifications_1.html", function*(fieldValues) {
|
||||
is(fieldValues.username, "notifyu1", "Checking submitted username");
|
||||
is(fieldValues.password, "notifyp1", "Checking submitted password");
|
||||
let notif = getCaptureDoorhanger("password-save");
|
||||
ok(!notif, "checking for no notification popup");
|
||||
});
|
||||
|
||||
logins = Services.logins.getAllLogins();
|
||||
is(logins.length, 2, "Should have both HTTP and HTTPS still");
|
||||
|
||||
let httpsLogins = LoginHelper.searchLoginsWithObject({
|
||||
hostname: "https://example.com",
|
||||
});
|
||||
is(httpsLogins.length, 1, "Check https logins count");
|
||||
let httpsLogin = httpsLogins[0].QueryInterface(Ci.nsILoginMetaInfo);
|
||||
ok(httpsLogin.equals(login1HTTPS), "Check HTTPS login didn't change");
|
||||
is(httpsLogin.timesUsed, 1, "Check times used");
|
||||
|
||||
let httpLogins = LoginHelper.searchLoginsWithObject({
|
||||
hostname: "http://example.com",
|
||||
});
|
||||
is(httpLogins.length, 1, "Check http logins count");
|
||||
let httpLogin = httpLogins[0].QueryInterface(Ci.nsILoginMetaInfo);
|
||||
ok(httpLogin.equals(login1), "Check HTTP login is as expected");
|
||||
is(httpLogin.timesUsed, 2, "Check times used increased");
|
||||
|
||||
Services.logins.removeLogin(login1);
|
||||
Services.logins.removeLogin(login1HTTPS);
|
||||
});
|
||||
|
||||
|
||||
// TODO:
|
||||
// * existing login test, form has different password --> change password, no save prompt
|
||||
|
|
|
|||
|
|
@ -0,0 +1,123 @@
|
|||
/*
|
||||
* Test capture popup notifications with HTTPS upgrades
|
||||
*/
|
||||
|
||||
let nsLoginInfo = new Components.Constructor("@mozilla.org/login-manager/loginInfo;1",
|
||||
Ci.nsILoginInfo, "init");
|
||||
let login1 = new nsLoginInfo("http://example.com", "http://example.com", null,
|
||||
"notifyu1", "notifyp1", "user", "pass");
|
||||
let login1HTTPS = new nsLoginInfo("https://example.com", "https://example.com", null,
|
||||
"notifyu1", "notifyp1", "user", "pass");
|
||||
|
||||
add_task(function* test_httpsUpgradeCaptureFields_noChange() {
|
||||
info("Check that we don't prompt to remember when capturing an upgraded login with no change");
|
||||
Services.logins.addLogin(login1);
|
||||
// Sanity check the HTTP login exists.
|
||||
let logins = Services.logins.getAllLogins();
|
||||
is(logins.length, 1, "Should have the HTTP login");
|
||||
|
||||
yield testSubmittingLoginForm("subtst_notifications_1.html", function*(fieldValues) {
|
||||
is(fieldValues.username, "notifyu1", "Checking submitted username");
|
||||
is(fieldValues.password, "notifyp1", "Checking submitted password");
|
||||
let notif = getCaptureDoorhanger("password-save");
|
||||
ok(!notif, "checking for no notification popup");
|
||||
}, "https://example.com"); // This is HTTPS whereas the saved login is HTTP
|
||||
|
||||
logins = Services.logins.getAllLogins();
|
||||
is(logins.length, 1, "Should only have 1 login still");
|
||||
let login = logins[0].QueryInterface(Ci.nsILoginMetaInfo);
|
||||
is(login.hostname, "http://example.com", "Check the hostname is unchanged");
|
||||
is(login.username, "notifyu1", "Check the username is unchanged");
|
||||
is(login.password, "notifyp1", "Check the password is unchanged");
|
||||
is(login.timesUsed, 2, "Check times used increased");
|
||||
|
||||
Services.logins.removeLogin(login1);
|
||||
});
|
||||
|
||||
add_task(function* test_httpsUpgradeCaptureFields_changePW() {
|
||||
info("Check that we prompt to change when capturing an upgraded login with a new PW");
|
||||
Services.logins.addLogin(login1);
|
||||
// Sanity check the HTTP login exists.
|
||||
let logins = Services.logins.getAllLogins();
|
||||
is(logins.length, 1, "Should have the HTTP login");
|
||||
|
||||
yield testSubmittingLoginForm("subtst_notifications_8.html", function*(fieldValues) {
|
||||
is(fieldValues.username, "notifyu1", "Checking submitted username");
|
||||
is(fieldValues.password, "pass2", "Checking submitted password");
|
||||
let notif = getCaptureDoorhanger("password-change");
|
||||
ok(notif, "checking for a change popup");
|
||||
|
||||
yield* checkDoorhangerUsernamePassword("notifyu1", "pass2");
|
||||
clickDoorhangerButton(notif, CHANGE_BUTTON);
|
||||
|
||||
ok(!getCaptureDoorhanger("password-change"), "popup should be gone");
|
||||
}, "https://example.com"); // This is HTTPS whereas the saved login is HTTP
|
||||
|
||||
checkOnlyLoginWasUsedTwice({ justChanged: true });
|
||||
logins = Services.logins.getAllLogins();
|
||||
is(logins.length, 1, "Should only have 1 login still");
|
||||
let login = logins[0].QueryInterface(Ci.nsILoginMetaInfo);
|
||||
is(login.hostname, "https://example.com", "Check the hostname is upgraded");
|
||||
is(login.formSubmitURL, "https://example.com", "Check the formSubmitURL is upgraded");
|
||||
is(login.username, "notifyu1", "Check the username is unchanged");
|
||||
is(login.password, "pass2", "Check the password changed");
|
||||
is(login.timesUsed, 2, "Check times used increased");
|
||||
|
||||
Services.logins.removeAllLogins();
|
||||
});
|
||||
|
||||
add_task(function* test_httpsUpgradeCaptureFields_captureMatchingHTTP() {
|
||||
info("Capture a new HTTP login which matches a stored HTTPS one.");
|
||||
Services.logins.addLogin(login1HTTPS);
|
||||
|
||||
yield testSubmittingLoginForm("subtst_notifications_1.html", function*(fieldValues) {
|
||||
is(fieldValues.username, "notifyu1", "Checking submitted username");
|
||||
is(fieldValues.password, "notifyp1", "Checking submitted password");
|
||||
let notif = getCaptureDoorhanger("password-save");
|
||||
ok(notif, "got notification popup");
|
||||
|
||||
is(Services.logins.getAllLogins().length, 1, "Should only have the HTTPS login");
|
||||
|
||||
yield* checkDoorhangerUsernamePassword("notifyu1", "notifyp1");
|
||||
clickDoorhangerButton(notif, REMEMBER_BUTTON);
|
||||
});
|
||||
|
||||
let logins = Services.logins.getAllLogins();
|
||||
is(logins.length, 2, "Should have both HTTP and HTTPS logins");
|
||||
for (let login of logins) {
|
||||
login = login.QueryInterface(Ci.nsILoginMetaInfo);
|
||||
is(login.username, "notifyu1", "Check the username used on the new entry");
|
||||
is(login.password, "notifyp1", "Check the password used on the new entry");
|
||||
is(login.timesUsed, 1, "Check times used on entry");
|
||||
}
|
||||
|
||||
info("Make sure Remember took effect and we don't prompt for an existing HTTP login");
|
||||
yield testSubmittingLoginForm("subtst_notifications_1.html", function*(fieldValues) {
|
||||
is(fieldValues.username, "notifyu1", "Checking submitted username");
|
||||
is(fieldValues.password, "notifyp1", "Checking submitted password");
|
||||
let notif = getCaptureDoorhanger("password-save");
|
||||
ok(!notif, "checking for no notification popup");
|
||||
});
|
||||
|
||||
logins = Services.logins.getAllLogins();
|
||||
is(logins.length, 2, "Should have both HTTP and HTTPS still");
|
||||
|
||||
let httpsLogins = LoginHelper.searchLoginsWithObject({
|
||||
hostname: "https://example.com",
|
||||
});
|
||||
is(httpsLogins.length, 1, "Check https logins count");
|
||||
let httpsLogin = httpsLogins[0].QueryInterface(Ci.nsILoginMetaInfo);
|
||||
ok(httpsLogin.equals(login1HTTPS), "Check HTTPS login didn't change");
|
||||
is(httpsLogin.timesUsed, 1, "Check times used");
|
||||
|
||||
let httpLogins = LoginHelper.searchLoginsWithObject({
|
||||
hostname: "http://example.com",
|
||||
});
|
||||
is(httpLogins.length, 1, "Check http logins count");
|
||||
let httpLogin = httpLogins[0].QueryInterface(Ci.nsILoginMetaInfo);
|
||||
ok(httpLogin.equals(login1), "Check HTTP login is as expected");
|
||||
is(httpLogin.timesUsed, 2, "Check times used increased");
|
||||
|
||||
Services.logins.removeLogin(login1);
|
||||
Services.logins.removeLogin(login1HTTPS);
|
||||
});
|
||||
Загрузка…
Ссылка в новой задаче