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

Bug 1261251 - [e10s] Make toolkit/components/passwordmgr/test/test_bug_627616.html work under e10s. r=MattN 

MozReview-Commit-ID: wKbB1APWZf

--HG--
rename : toolkit/components/passwordmgr/test/test_bug_627616.html => toolkit/components/passwordmgr/test/mochitest/test_bug_627616.html
This commit is contained in:
Drew Willcoxon 2016-04-04 17:49:31 -07:00
Родитель 92e3b4d357
Коммит dd079472df
4 изменённых файлов: 153 добавлений и 143 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

2
toolkit/components/passwordmgr/test/mochitest.ini
Просмотреть файл

@ -20,8 +20,6 @@ support-files =
[test_basic_form_2pw_2.html]
[test_basic_form_autocomplete.html]
skip-if = toolkit == 'android' # Bug 1258975 on android.
[test_bug_627616.html]
skip-if = toolkit == 'android' # Bug 1258975 on android.
[test_master_password.html]
skip-if = toolkit == 'android' # Bug 1258975 on android.
[test_master_password_cleanup.html]

2
toolkit/components/passwordmgr/test/mochitest/mochitest.ini
Просмотреть файл

@ -17,6 +17,8 @@ support-files =
[test_basic_form_html5.html]
[test_basic_form_pwevent.html]
[test_basic_form_pwonly.html]
[test_bug_627616.html]
skip-if = toolkit == 'android' # Bug 1258975 on android.
[test_bug_776171.html]
[test_case_differences.html]
skip-if = toolkit == 'android' # autocomplete

151
toolkit/components/passwordmgr/test/mochitest/test_bug_627616.html Normal file
Просмотреть файл

@ -0,0 +1,151 @@
<!DOCTYPE HTML>
<html>
<head>
<meta charset="utf-8">
<title>Test bug 627616 related to proxy authentication</title>
<script type="text/javascript" src="/tests/SimpleTest/SimpleTest.js"></script>
<script type="text/javascript" src="pwmgr_common.js"></script>
<link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css" />
</head>
<body>
<script class="testbody" type="text/javascript">
SimpleTest.waitForExplicitFinish();
var Ci = SpecialPowers.Ci;
function makeXHR(expectedStatus, expectedText, extra) {
var xhr = new XMLHttpRequest();
xhr.open("GET", "authenticate.sjs?" +
"proxy_user=proxy_user&" +
"proxy_pass=proxy_pass&" +
"proxy_realm=proxy_realm&" +
"user=user1name&" +
"pass=user1pass&" +
"realm=mochirealm&" +
extra || "");
xhr.onloadend = function() {
is(xhr.status, expectedStatus, "xhr.status");
is(xhr.statusText, expectedText, "xhr.statusText");
runNextTest();
}
return xhr;
}
function testNonAnonymousCredentials() {
var xhr = makeXHR(200, "OK");
xhr.send();
}
function testAnonymousCredentials() {
// Test that an anonymous request correctly performs proxy authentication
var xhr = makeXHR(401, "Authentication required");
SpecialPowers.wrap(xhr).channel.loadFlags |= Ci.nsIChannel.LOAD_ANONYMOUS;
xhr.send();
}
function testAnonymousNoAuth() {
// Next, test that an anonymous request still does not include any non-proxy
// authentication headers.
var xhr = makeXHR(200, "Authorization header not found", "anonymous=1");
SpecialPowers.wrap(xhr).channel.loadFlags |= Ci.nsIChannel.LOAD_ANONYMOUS;
xhr.send();
}
var gExpectedDialogs = 0;
var gCurrentTest;
function runNextTest() {
is(gExpectedDialogs, 0, "received expected number of auth dialogs");
mm.sendAsyncMessage("prepareForNextTest");
mm.addMessageListener("prepareForNextTestDone", function prepared(msg) {
mm.removeMessageListener("prepareForNextTestDone", prepared);
if (pendingTests.length > 0) {
({expectedDialogs: gExpectedDialogs,
test: gCurrentTest} = pendingTests.shift());
gCurrentTest.call(this);
} else {
mm.sendAsyncMessage("cleanup");
mm.addMessageListener("cleanupDone", msg => {
// mm.destroy() is called as a cleanup function by runInParent(), no
// need to do it here.
SimpleTest.finish();
});
}
});
}
var pendingTests = [{expectedDialogs: 2, test: testNonAnonymousCredentials},
{expectedDialogs: 1, test: testAnonymousCredentials},
{expectedDialogs: 0, test: testAnonymousNoAuth}];
let mm = runInParent(() => {
const { classes: Cc, interfaces: Ci, utils: Cu } = Components;
Cu.import("resource://gre/modules/Services.jsm");
Cu.import("resource://gre/modules/Timer.jsm");
Cu.import("resource://gre/modules/XPCOMUtils.jsm");
let channel = Services.io.newChannel2(
"http://example.com",
null,
null,
null, // aLoadingNode
Services.scriptSecurityManager.getSystemPrincipal(),
null, // aTriggeringPrincipal
Ci.nsILoadInfo.SEC_NORMAL,
Ci.nsIContentPolicy.TYPE_OTHER
);
let pps = Cc["@mozilla.org/network/protocol-proxy-service;1"].
getService(Ci.nsIProtocolProxyService);
pps.asyncResolve(channel, 0, {
onProxyAvailable(req, uri, pi, status) {
let mozproxy = "moz-proxy://" + pi.host + ":" + pi.port;
let login = Cc["@mozilla.org/login-manager/loginInfo;1"].
createInstance(Ci.nsILoginInfo);
login.init(mozproxy, null, "proxy_realm", "proxy_user", "proxy_pass",
"", "");
Services.logins.addLogin(login);
let login2 = Cc["@mozilla.org/login-manager/loginInfo;1"].
createInstance(Ci.nsILoginInfo);
login2.init("http://mochi.test:8888", null, "mochirealm", "user1name",
"user1pass", "", "");
Services.logins.addLogin(login2);
//startWatchingForPrompts();
sendAsyncMessage("setupDone");
},
QueryInterface: XPCOMUtils.generateQI([Ci.nsIProtocolProxyCallback]),
});
addMessageListener("prepareForNextTest", message => {
Cc["@mozilla.org/network/http-auth-manager;1"].
getService(Ci.nsIHttpAuthManager).
clearAll();
sendAsyncMessage("prepareForNextTestDone");
});
let dialogObserverTopic = "common-dialog-loaded";
function dialogObserver(subj, topic, data) {
subj.Dialog.ui.prompt.document.documentElement.acceptDialog();
sendAsyncMessage("promptAccepted");
}
Services.obs.addObserver(dialogObserver, dialogObserverTopic, false);
addMessageListener("cleanup", message => {
Services.obs.removeObserver(dialogObserver, dialogObserverTopic);
sendAsyncMessage("cleanupDone");
});
});
mm.addMessageListener("promptAccepted", msg => {
gExpectedDialogs--;
});
mm.addMessageListener("setupDone", msg => {
runNextTest();
});
</script>
</body>
</html>

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

@ -1,141 +0,0 @@
<!DOCTYPE HTML>
<html>
<head>
<meta charset="utf-8">
<title>Test bug 627616 related to proxy authentication</title>
<script type="text/javascript" src="/tests/SimpleTest/SimpleTest.js"></script>
<script type="text/javascript" src="prompt_common.js"></script>
<link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css" />
</head>
<body>
<script class="testbody" type="text/javascript">
SimpleTest.waitForExplicitFinish();
var Cc = SpecialPowers.Cc;
var Ci = SpecialPowers.Ci;
var systemPrincipal = SpecialPowers.Services.scriptSecurityManager.getSystemPrincipal();
testNum = 1;
var login, login2;
var resolveCallback = SpecialPowers.wrapCallbackObject({
QueryInterface : function (iid) {
const interfaces = [Ci.nsIProtocolProxyCallback, Ci.nsISupports];
if (!interfaces.some( function(v) { return iid.equals(v) } ))
throw SpecialPowers.Cr.NS_ERROR_NO_INTERFACE;
return this;
},
onProxyAvailable : function (req, uri, pi, status) {
init2(SpecialPowers.wrap(pi).host, SpecialPowers.wrap(pi).port);
}
});
function init1() {
var ios = Cc["@mozilla.org/network/io-service;1"].getService(Ci.nsIIOService);
var pps = Cc["@mozilla.org/network/protocol-proxy-service;1"].getService();
var channel = ios.newChannel2("http://example.com",
null,
null,
null, // aLoadingNode
systemPrincipal,
null, // aTriggeringPrincipal
Ci.nsILoadInfo.SEC_NORMAL,
Ci.nsIContentPolicy.TYPE_OTHER);
pps.asyncResolve(channel, 0, resolveCallback);
}
function init2(proxyHost, proxyPort) {
var mozproxy = "moz-proxy://" + proxyHost + ":" + proxyPort;
var pwmgr = Cc["@mozilla.org/login-manager;1"].getService(Ci.nsILoginManager);
login = Cc["@mozilla.org/login-manager/loginInfo;1"].createInstance(Ci.nsILoginInfo);
login.init(mozproxy, null, "proxy_realm", "proxy_user", "proxy_pass", "", "");
pwmgr.addLogin(login);
login2 = Cc["@mozilla.org/login-manager/loginInfo;1"].createInstance(Ci.nsILoginInfo);
login2.init("http://mochi.test:8888", null, "mochirealm", "user1name", "user1pass", "", "");
pwmgr.addLogin(login2);
startCallbackTimer();
}
function cleanup() {
var pwmgr = Cc["@mozilla.org/login-manager;1"].getService(Ci.nsILoginManager);
pwmgr.removeLogin(login);
pwmgr.removeLogin(login2);
timer.cancel();
}
function makeXHR(expectedStatus, expectedText, extra) {
var xhr = new XMLHttpRequest();
xhr.open("GET", "authenticate.sjs?" +
"proxy_user=proxy_user&" +
"proxy_pass=proxy_pass&" +
"proxy_realm=proxy_realm&" +
"user=user1name&" +
"pass=user1pass&" +
"realm=mochirealm&" +
extra || "");
xhr.onloadend = function() {
is(xhr.status, expectedStatus, "xhr.status");
is(xhr.statusText, expectedText, "xhr.statusText");
runNextTest();
}
return xhr;
}
function testNonAnonymousCredentials() {
var xhr = makeXHR(200, "OK");
xhr.send();
}
function testAnonymousCredentials() {
// Test that an anonymous request correctly performs proxy authentication
var xhr = makeXHR(401, "Authentication required");
SpecialPowers.wrap(xhr).channel.loadFlags |= Ci.nsIChannel.LOAD_ANONYMOUS;
xhr.send();
}
function testAnonymousNoAuth() {
// Next, test that an anonymous request still does not include any non-proxy
// authentication headers.
var xhr = makeXHR(200, "Authorization header not found", "anonymous=1");
SpecialPowers.wrap(xhr).channel.loadFlags |= Ci.nsIChannel.LOAD_ANONYMOUS;
xhr.send();
}
var gExpectedDialogs = 0;
var gCurrentTest;
function runNextTest() {
is(gExpectedDialogs, 0, "received expected number of auth dialogs");
Cc["@mozilla.org/network/http-auth-manager;1"].getService(SpecialPowers.Ci.nsIHttpAuthManager).clearAll();
if (pendingTests.length > 0) {
({expectedDialogs: gExpectedDialogs,
test: gCurrentTest} = pendingTests.shift());
gCurrentTest.call(this);
} else {
cleanup();
SimpleTest.finish();
}
}
var pendingTests = [{expectedDialogs: 2, test: testNonAnonymousCredentials},
{expectedDialogs: 1, test: testAnonymousCredentials},
{expectedDialogs: 0, test: testAnonymousNoAuth}];
init1();
runNextTest();
function handleDialog(doc, testNum)
{
var dialog = doc.getElementById("commonDialog");
dialog.acceptDialog();
gExpectedDialogs--;
startCallbackTimer();
}
</script>
</body>
</html>