mirror of
https://github.com/mozilla/gecko-dev.git
synced 2024-10-16 06:45:42 +00:00
Bug 1305162: Part 1c - Fix devtools tests that expect headers in upload stream. r=ochameau
MozReview-Commit-ID: BirgY62GRn7 --HG-- extra : rebase_source : bede12f4c42cc48edbf8de2b6f5b22185bb55dd3 extra : source : d1095e03dfc600771f54c7ff2dc5fd294ca1ab28
This commit is contained in:
parent
a877454fe6
commit
48b5adb85c
@ -41,10 +41,15 @@ add_task(function* () {
|
|||||||
data = yield createCurlData(requests.multipart, gNetwork);
|
data = yield createCurlData(requests.multipart, gNetwork);
|
||||||
testIsMultipartRequest(data);
|
testIsMultipartRequest(data);
|
||||||
testGetMultipartBoundary(data);
|
testGetMultipartBoundary(data);
|
||||||
|
testMultiPartHeaders(data);
|
||||||
testRemoveBinaryDataFromMultipartText(data);
|
testRemoveBinaryDataFromMultipartText(data);
|
||||||
|
|
||||||
data = yield createCurlData(requests.multipartForm, gNetwork);
|
data = yield createCurlData(requests.multipartForm, gNetwork);
|
||||||
testGetHeadersFromMultipartText(data);
|
testMultiPartHeaders(data);
|
||||||
|
|
||||||
|
testGetHeadersFromMultipartText({
|
||||||
|
postDataText: "Content-Type: text/plain\r\n\r\n",
|
||||||
|
});
|
||||||
|
|
||||||
if (Services.appinfo.OS != "WINNT") {
|
if (Services.appinfo.OS != "WINNT") {
|
||||||
testEscapeStringPosix();
|
testEscapeStringPosix();
|
||||||
@ -79,6 +84,14 @@ function testFindHeader(data) {
|
|||||||
"Should return null when a header is not found.");
|
"Should return null when a header is not found.");
|
||||||
}
|
}
|
||||||
|
|
||||||
|
function testMultiPartHeaders(data) {
|
||||||
|
let headers = data.headers;
|
||||||
|
let contentType = CurlUtils.findHeader(headers, "Content-Type");
|
||||||
|
|
||||||
|
ok(contentType.startsWith("multipart/form-data; boundary="),
|
||||||
|
"Multi-part content type header is present in headers array");
|
||||||
|
}
|
||||||
|
|
||||||
function testWritePostDataTextParams(data) {
|
function testWritePostDataTextParams(data) {
|
||||||
let params = CurlUtils.writePostDataTextParams(data.postDataText);
|
let params = CurlUtils.writePostDataTextParams(data.postDataText);
|
||||||
is(params, "param1=value1¶m2=value2¶m3=value3",
|
is(params, "param1=value1¶m2=value2¶m3=value3",
|
||||||
|
@ -118,14 +118,19 @@ add_task(function* testFormSubmission() {
|
|||||||
|
|
||||||
let client = hud.ui.webConsoleClient;
|
let client = hud.ui.webConsoleClient;
|
||||||
const postData = yield client.getRequestPostData(request.actor);
|
const postData = yield client.getRequestPostData(request.actor);
|
||||||
|
const requestHeaders = yield client.getRequestHeaders(request.actor);
|
||||||
const responseContent = yield client.getResponseContent(request.actor);
|
const responseContent = yield client.getResponseContent(request.actor);
|
||||||
|
|
||||||
|
let getHeader = name => {
|
||||||
|
let header = requestHeaders.headers.find(h => h.name == name);
|
||||||
|
return header && header.value;
|
||||||
|
};
|
||||||
|
|
||||||
is(request.request.method, "POST", "Method is correct");
|
is(request.request.method, "POST", "Method is correct");
|
||||||
isnot(postData.postData.text
|
is(getHeader("Content-Type"), "application/x-www-form-urlencoded",
|
||||||
.indexOf("Content-Type: application/x-www-form-urlencoded"), -1,
|
"Content-Type is correct");
|
||||||
"Content-Type is correct");
|
is(getHeader("Content-Length"), "20",
|
||||||
isnot(postData.postData.text
|
"Content-length is correct");
|
||||||
.indexOf("Content-Length: 20"), -1, "Content-length is correct");
|
|
||||||
isnot(postData.postData.text
|
isnot(postData.postData.text
|
||||||
.indexOf("name=foo+bar&age=144"), -1, "Form data is correct");
|
.indexOf("name=foo+bar&age=144"), -1, "Form data is correct");
|
||||||
is(responseContent.content.text.indexOf("<!DOCTYPE HTML>"), 0,
|
is(responseContent.content.text.indexOf("<!DOCTYPE HTML>"), 0,
|
||||||
|
Loading…
Reference in New Issue
Block a user