mirror of
https://github.com/servo/servo.git
synced 2025-08-16 19:05:33 +01:00
Refactor FormData code to match updated spec
Use Atoms instead of Strings as keys
This commit is contained in:
Keith Yeung
parent
61314f5253
commit
7001583047
14 changed files with 469 additions and 89 deletions
|
|
@ -1,28 +1,94 @@
|
|||
<!doctype html>
|
||||
<meta charset=utf-8>
|
||||
<meta charset="utf-8">
|
||||
<title>FormData.append</title>
|
||||
<link rel=help href=https://xhr.spec.whatwg.org/#dom-formdata-append>
|
||||
<script src=/resources/testharness.js></script>
|
||||
<script src=/resources/testharnessreport.js></script>
|
||||
<div id=log></div>
|
||||
<link rel="help" href="https://xhr.spec.whatwg.org/#dom-formdata-append">
|
||||
<script src="/resources/testharness.js"></script>
|
||||
<script src="/resources/testharnessreport.js"></script>
|
||||
<div id="log"></div>
|
||||
<form id="form" />
|
||||
<script>
|
||||
function test_formdata(creator, verifier, description) {
|
||||
async_test(description).step(function() {
|
||||
var fd = creator();
|
||||
var xhr = new XMLHttpRequest();
|
||||
xhr.onload = this.step_func(function() {
|
||||
verifier(xhr.responseText);
|
||||
this.done();
|
||||
});
|
||||
xhr.open("POST", "resources/upload.py");
|
||||
xhr.send(fd);
|
||||
})
|
||||
}
|
||||
test_formdata(function() {
|
||||
var fd = new FormData();
|
||||
fd.append("name", new String("value"));
|
||||
return fd;
|
||||
}, function(data) {
|
||||
assert_equals(data, "name=value,\n");
|
||||
}, "Passing a String object to FormData.append should work.");
|
||||
function test_formdata(creator, verifier, description) {
|
||||
async_test(description).step(function() {
|
||||
var fd = creator();
|
||||
var xhr = new XMLHttpRequest();
|
||||
xhr.onload = this.step_func(function() {
|
||||
verifier(xhr.responseText);
|
||||
this.done();
|
||||
});
|
||||
xhr.open("POST", "resources/upload.py");
|
||||
xhr.send(fd);
|
||||
});
|
||||
}
|
||||
|
||||
test_formdata(function() {
|
||||
var fd = new FormData();
|
||||
fd.append("name", new String("value"));
|
||||
return fd;
|
||||
}, function(data) {
|
||||
assert_equals(data, "name=value,\n");
|
||||
}, "Passing a String object to FormData.append should work.");
|
||||
|
||||
test(function() {
|
||||
assert_equals(create_formdata(['key', 'value1']).get('key'), "value1");
|
||||
}, 'testFormDataAppend1');
|
||||
test(function() {
|
||||
assert_equals(create_formdata(['key', 'value2'], ['key', 'value1']).get('key'), "value2");
|
||||
}, 'testFormDataAppend2');
|
||||
test(function() {
|
||||
assert_equals(create_formdata(['key', undefined]).get('key'), "undefined");
|
||||
}, 'testFormDataAppendUndefined1');
|
||||
test(function() {
|
||||
assert_equals(create_formdata(['key', undefined], ['key', 'value1']).get('key'), "undefined");
|
||||
}, 'testFormDataAppendUndefined2');
|
||||
test(function() {
|
||||
assert_equals(create_formdata(['key', null]).get('key'), "null");
|
||||
}, 'testFormDataAppendNull1');
|
||||
test(function() {
|
||||
assert_equals(create_formdata(['key', null], ['key', 'value1']).get('key'), "null");
|
||||
}, 'testFormDataAppendNull2');
|
||||
test(function() {
|
||||
var fd = new FormData(document.getElementById("form"));
|
||||
fd.append('key', 'value1');
|
||||
assert_equals(fd.get('key'), "value1");
|
||||
}, 'testFormDataAppendToForm1');
|
||||
test(function() {
|
||||
var fd = new FormData(document.getElementById("form"));
|
||||
fd.append('key', 'value2');
|
||||
fd.append('key', 'value1');
|
||||
assert_equals(fd.get('key'), "value2");
|
||||
}, 'testFormDataAppendToForm2');
|
||||
test(function() {
|
||||
var fd = new FormData(document.getElementById("form"));
|
||||
fd.append('key', undefined);
|
||||
assert_equals(fd.get('key'), "undefined");
|
||||
}, 'testFormDataAppendToFormUndefined1');
|
||||
test(function() {
|
||||
var fd = new FormData(document.getElementById("form"));
|
||||
fd.append('key', undefined);
|
||||
fd.append('key', 'value1');
|
||||
assert_equals(fd.get('key'), "undefined");
|
||||
}, 'testFormDataAppendToFormUndefined2');
|
||||
test(function() {
|
||||
var fd = new FormData(document.getElementById("form"));
|
||||
fd.append('key', null);
|
||||
assert_equals(fd.get('key'), "null");
|
||||
}, 'testFormDataAppendToFormNull1');
|
||||
test(function() {
|
||||
var fd = new FormData(document.getElementById("form"));
|
||||
fd.append('key', null);
|
||||
fd.append('key', 'value1');
|
||||
assert_equals(fd.get('key'), "null");
|
||||
}, 'testFormDataAppendToFormNull2');
|
||||
test(function() {
|
||||
assert_object_equals(create_formdata(['key', new Blob(), 'blank.txt']).get('key'),
|
||||
new File(new Blob(), 'blank.txt'));
|
||||
}, 'testFormDataAppendEmptyBlob');
|
||||
|
||||
function create_formdata() {
|
||||
var fd = new FormData();
|
||||
for (var i = 0; i < arguments.length; i++) {
|
||||
fd.append.apply(fd, arguments[i]);
|
||||
};
|
||||
return fd;
|
||||
}
|
||||
</script>
|
||||
|
|
|
|||
|
|
@ -0,0 +1,65 @@
|
|||
<!doctype html>
|
||||
<html lang=en>
|
||||
<meta charset=utf-8>
|
||||
<title>FormData: delete</title>
|
||||
<script src="/resources/testharness.js"></script>
|
||||
<script src="/resources/testharnessreport.js"></script>
|
||||
<link rel="help" href="https://xhr.spec.whatwg.org/#dom-formdata-get" />
|
||||
<link rel="help" href="https://xhr.spec.whatwg.org/#dom-formdata-getall" />
|
||||
<div id="log"></div>
|
||||
<form id="form1">
|
||||
<input type="hidden" name="key" value="value1">
|
||||
<input type="hidden" name="key" value="value2">
|
||||
</form>
|
||||
<form id="form2">
|
||||
<input type="hidden" name="key1" value="value1">
|
||||
<input type="hidden" name="key2" value="value2">
|
||||
</form>
|
||||
<form id="empty-form" />
|
||||
<script>
|
||||
test(function() {
|
||||
var fd = create_formdata(['key', 'value1'], ['key', 'value2']);
|
||||
fd.delete('key');
|
||||
assert_equals(fd.get('key'), null);
|
||||
}, 'testFormDataDelete');
|
||||
test(function() {
|
||||
var fd = new FormData(document.getElementById('form1'));
|
||||
fd.delete('key');
|
||||
assert_equals(fd.get('key'), null);
|
||||
}, 'testFormDataDeleteFromForm');
|
||||
test(function() {
|
||||
var fd = new FormData(document.getElementById('form1'));
|
||||
fd.delete('nil');
|
||||
assert_equals(fd.get('key'), 'value1');
|
||||
}, 'testFormDataDeleteFromFormNonExistentKey');
|
||||
test(function() {
|
||||
var fd = new FormData(document.getElementById('form2'));
|
||||
fd.delete('key1');
|
||||
assert_equals(fd.get('key1'), null);
|
||||
assert_equals(fd.get('key2'), 'value2');
|
||||
}, 'testFormDataDeleteFromFormOtherKey');
|
||||
test(function() {
|
||||
var fd = new FormData(document.getElementById('empty-form'));
|
||||
fd.delete('key');
|
||||
assert_equals(fd.get('key'), null);
|
||||
}, 'testFormDataDeleteFromEmptyForm');
|
||||
test(function() {
|
||||
var fd = create_formdata(['key', 'value1'], ['key', 'value2']);
|
||||
fd.delete('nil');
|
||||
assert_equals(fd.get('key'), 'value1');
|
||||
}, 'testFormDataDeleteNonExistentKey');
|
||||
test(function() {
|
||||
var fd = create_formdata(['key1', 'value1'], ['key2', 'value2']);
|
||||
fd.delete('key1');
|
||||
assert_equals(fd.get('key1'), null);
|
||||
assert_equals(fd.get('key2'), 'value2');
|
||||
}, 'testFormDataDeleteOtherKey');
|
||||
|
||||
function create_formdata() {
|
||||
var fd = new FormData();
|
||||
for (var i = 0; i < arguments.length; i++) {
|
||||
fd.append.apply(fd, arguments[i]);
|
||||
};
|
||||
return fd;
|
||||
}
|
||||
</script>
|
||||
60
tests/wpt/web-platform-tests/XMLHttpRequest/formdata-get.htm
Normal file
60
tests/wpt/web-platform-tests/XMLHttpRequest/formdata-get.htm
Normal file
|
|
@ -0,0 +1,60 @@
|
|||
<!doctype html>
|
||||
<html lang=en>
|
||||
<meta charset=utf-8>
|
||||
<title>FormData: get and getAll</title>
|
||||
<script src="/resources/testharness.js"></script>
|
||||
<script src="/resources/testharnessreport.js"></script>
|
||||
<link rel="help" href="https://xhr.spec.whatwg.org/#dom-formdata-get" />
|
||||
<link rel="help" href="https://xhr.spec.whatwg.org/#dom-formdata-getall" />
|
||||
<div id="log"></div>
|
||||
<form id="form">
|
||||
<input type="hidden" name="key" value="value1">
|
||||
<input type="hidden" name="key" value="value2">
|
||||
</form>
|
||||
<form id="empty-form" />
|
||||
<script>
|
||||
test(function() {
|
||||
assert_equals(create_formdata(['key', 'value1'], ['key', 'value2']).get('key'), "value1");
|
||||
}, 'testFormDataGet');
|
||||
test(function() {
|
||||
assert_equals(new FormData(document.getElementById('form')).get('key'), "value1");
|
||||
}, 'testFormDataGetFromForm');
|
||||
test(function() {
|
||||
assert_equals(new FormData(document.getElementById('form')).get('nil'), null);
|
||||
}, 'testFormDataGetFromFormNull');
|
||||
test(function() {
|
||||
assert_equals(new FormData(document.getElementById('empty-form')).get('key'), null);
|
||||
}, 'testFormDataGetFromEmptyForm');
|
||||
test(function() {
|
||||
assert_equals(create_formdata(['key', 'value1'], ['key', 'value2']).get('nil'), null);
|
||||
}, 'testFormDataGetNull1');
|
||||
test(function() {
|
||||
assert_equals(create_formdata().get('key'), null);
|
||||
}, 'testFormDataGetNull2');
|
||||
test(function() {
|
||||
assert_array_equals(create_formdata(['key', 'value1'], ['key', 'value2']).getAll('key'), ["value1", "value2"]);
|
||||
}, 'testFormDataGetAll');
|
||||
test(function() {
|
||||
assert_array_equals(create_formdata(['key', 'value1'], ['key', 'value2']).getAll('nil'), []);
|
||||
}, 'testFormDataGetAllEmpty1');
|
||||
test(function() {
|
||||
assert_array_equals(create_formdata().getAll('key'), []);
|
||||
}, 'testFormDataGetAllEmpty2');
|
||||
test(function() {
|
||||
assert_array_equals(new FormData(document.getElementById('form')).getAll('key'), ["value1", "value2"]);
|
||||
}, 'testFormDataGetAllFromForm');
|
||||
test(function() {
|
||||
assert_array_equals(new FormData(document.getElementById('form')).getAll('nil'), []);
|
||||
}, 'testFormDataGetAllFromFormNull');
|
||||
test(function() {
|
||||
assert_array_equals(new FormData(document.getElementById('empty-form')).getAll('key'), []);
|
||||
}, 'testFormDataGetAllFromEmptyForm');
|
||||
|
||||
function create_formdata() {
|
||||
var fd = new FormData();
|
||||
for (var i = 0; i < arguments.length; i++) {
|
||||
fd.append.apply(fd, arguments[i]);
|
||||
};
|
||||
return fd;
|
||||
}
|
||||
</script>
|
||||
42
tests/wpt/web-platform-tests/XMLHttpRequest/formdata-has.htm
Normal file
42
tests/wpt/web-platform-tests/XMLHttpRequest/formdata-has.htm
Normal file
|
|
@ -0,0 +1,42 @@
|
|||
<!doctype html>
|
||||
<html lang=en>
|
||||
<meta charset=utf-8>
|
||||
<title>FormData: has</title>
|
||||
<script src="/resources/testharness.js"></script>
|
||||
<script src="/resources/testharnessreport.js"></script>
|
||||
<link rel="help" href="https://xhr.spec.whatwg.org/#dom-formdata-get" />
|
||||
<link rel="help" href="https://xhr.spec.whatwg.org/#dom-formdata-getall" />
|
||||
<div id="log"></div>
|
||||
<form id="form">
|
||||
<input type="hidden" name="key" value="value1">
|
||||
<input type="hidden" name="key" value="value2">
|
||||
</form>
|
||||
<form id="empty-form" />
|
||||
<script>
|
||||
test(function() {
|
||||
assert_equals(create_formdata(['key', 'value1'], ['key', 'value2']).has('key'), true);
|
||||
}, 'testFormDataHas');
|
||||
test(function() {
|
||||
assert_equals(new FormData(document.getElementById('form')).has('key'), true);
|
||||
}, 'testFormDataHasFromForm');
|
||||
test(function() {
|
||||
assert_equals(new FormData(document.getElementById('form')).has('nil'), false);
|
||||
}, 'testFormDataHasFromFormNull');
|
||||
test(function() {
|
||||
assert_equals(new FormData(document.getElementById('empty-form')).has('key'), false);
|
||||
}, 'testFormDataHasFromEmptyForm');
|
||||
test(function() {
|
||||
assert_equals(create_formdata(['key', 'value1'], ['key', 'value2']).has('nil'), false);
|
||||
}, 'testFormDataHasEmpty1');
|
||||
test(function() {
|
||||
assert_equals(create_formdata().has('key'), false);
|
||||
}, 'testFormDataHasEmpty2');
|
||||
|
||||
function create_formdata() {
|
||||
var fd = new FormData();
|
||||
for (var i = 0; i < arguments.length; i++) {
|
||||
fd.append.apply(fd, arguments[i]);
|
||||
};
|
||||
return fd;
|
||||
}
|
||||
</script>
|
||||
94
tests/wpt/web-platform-tests/XMLHttpRequest/formdata-set.htm
Normal file
94
tests/wpt/web-platform-tests/XMLHttpRequest/formdata-set.htm
Normal file
|
|
@ -0,0 +1,94 @@
|
|||
<!doctype html>
|
||||
<meta charset="utf-8">
|
||||
<title>FormData: set</title>
|
||||
<link rel="help" href="https://xhr.spec.whatwg.org/#dom-formdata-set">
|
||||
<script src="/resources/testharness.js"></script>
|
||||
<script src="/resources/testharnessreport.js"></script>
|
||||
<div id="log"></div>
|
||||
<form id="form" />
|
||||
<script>
|
||||
function test_formdata(creator, verifier, description) {
|
||||
async_test(description).step(function() {
|
||||
var fd = creator();
|
||||
var xhr = new XMLHttpRequest();
|
||||
xhr.onload = this.step_func(function() {
|
||||
verifier(xhr.responseText);
|
||||
this.done();
|
||||
});
|
||||
xhr.open("POST", "resources/upload.py");
|
||||
xhr.send(fd);
|
||||
});
|
||||
}
|
||||
|
||||
test_formdata(function() {
|
||||
var fd = new FormData();
|
||||
fd.set("name", new String("value"));
|
||||
return fd;
|
||||
}, function(data) {
|
||||
assert_equals(data, "name=value,\n");
|
||||
}, "Passing a String object to FormData.set should work");
|
||||
|
||||
test(function() {
|
||||
assert_equals(create_formdata(['key', 'value1']).get('key'), "value1");
|
||||
}, 'testFormDataSet1');
|
||||
test(function() {
|
||||
assert_equals(create_formdata(['key', 'value2'], ['key', 'value1']).get('key'), "value1");
|
||||
}, 'testFormDataSet2');
|
||||
test(function() {
|
||||
assert_equals(create_formdata(['key', undefined]).get('key'), "undefined");
|
||||
}, 'testFormDataSetUndefined1');
|
||||
test(function() {
|
||||
assert_equals(create_formdata(['key', undefined], ['key', 'value1']).get('key'), "value1");
|
||||
}, 'testFormDataSetUndefined2');
|
||||
test(function() {
|
||||
assert_equals(create_formdata(['key', null]).get('key'), "null");
|
||||
}, 'testFormDataSetNull1');
|
||||
test(function() {
|
||||
assert_equals(create_formdata(['key', null], ['key', 'value1']).get('key'), "value1");
|
||||
}, 'testFormDataSetNull2');
|
||||
test(function() {
|
||||
var fd = new FormData(document.getElementById("form"));
|
||||
fd.set('key', 'value1');
|
||||
assert_equals(fd.get('key'), "value1");
|
||||
}, 'testFormDataSetToForm1');
|
||||
test(function() {
|
||||
var fd = new FormData(document.getElementById("form"));
|
||||
fd.set('key', 'value2');
|
||||
fd.set('key', 'value1');
|
||||
assert_equals(fd.get('key'), "value1");
|
||||
}, 'testFormDataSetToForm2');
|
||||
test(function() {
|
||||
var fd = new FormData(document.getElementById("form"));
|
||||
fd.set('key', undefined);
|
||||
assert_equals(fd.get('key'), "undefined");
|
||||
}, 'testFormDataSetToFormUndefined1');
|
||||
test(function() {
|
||||
var fd = new FormData(document.getElementById("form"));
|
||||
fd.set('key', undefined);
|
||||
fd.set('key', 'value1');
|
||||
assert_equals(fd.get('key'), "value1");
|
||||
}, 'testFormDataSetToFormUndefined2');
|
||||
test(function() {
|
||||
var fd = new FormData(document.getElementById("form"));
|
||||
fd.set('key', null);
|
||||
assert_equals(fd.get('key'), "null");
|
||||
}, 'testFormDataSetToFormNull1');
|
||||
test(function() {
|
||||
var fd = new FormData(document.getElementById("form"));
|
||||
fd.set('key', null);
|
||||
fd.set('key', 'value1');
|
||||
assert_equals(fd.get('key'), "value1");
|
||||
}, 'testFormDataSetToFormNull2');
|
||||
test(function() {
|
||||
assert_object_equals(create_formdata(['key', new Blob(), 'blank.txt']).get('key'),
|
||||
new File(new Blob(), 'blank.txt'));
|
||||
}, 'testFormDataSetEmptyBlob');
|
||||
|
||||
function create_formdata() {
|
||||
var fd = new FormData();
|
||||
for (var i = 0; i < arguments.length; i++) {
|
||||
fd.set.apply(fd, arguments[i]);
|
||||
};
|
||||
return fd;
|
||||
}
|
||||
</script>
|
||||
Loading…
Add table
Add a link
Reference in a new issue