huahaofeng
/
aspnetcore
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #3690 from khellang/form-file-changes 

React to changes to FormFile
This commit is contained in:
David Fowler 2015-12-04 12:05:10 -08:00
parent aa48f79816 e1bfc6b48e
commit 80e25344f6
3 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
test/Microsoft.AspNet.Mvc.IntegrationTests/FormCollectionModelBindingIntegrationTest.cs
View File

@ -161,14 +161,15 @@ namespace Microsoft.AspNet.Mvc.IntegrationTests
private void UpdateRequest(HttpRequest request, string data, string name)
{
const string fileName = "text.txt";
var fileCollection = new FormFileCollection();
var formCollection = new FormCollection(new Dictionary<string, StringValues>(), fileCollection);
var memoryStream = new MemoryStream(Encoding.UTF8.GetBytes(data));
request.Form = formCollection;
request.ContentType = "multipart/form-data; boundary=----WebKitFormBoundarymx2fSWqWSd0OxQqq";
request.Headers["Content-Disposition"] = "form-data; name=" + name + "; filename=text.txt";
fileCollection.Add(new FormFile(memoryStream, 0, data.Length)
request.Headers["Content-Disposition"] = $"form-data; name={name}; filename={fileName}";
fileCollection.Add(new FormFile(memoryStream, 0, data.Length, name, fileName)
{
Headers = request.Headers
});

5
test/Microsoft.AspNet.Mvc.IntegrationTests/FormFileModelBindingIntegrationTest.cs
View File

@ -161,6 +161,7 @@ namespace Microsoft.AspNet.Mvc.IntegrationTests
private void UpdateRequest(HttpRequest request, string data, string name)
{
const string fileName = "text.txt";
var fileCollection = new FormFileCollection();
var formCollection = new FormCollection(new Dictionary<string, StringValues>(), fileCollection);
@ -173,10 +174,10 @@ namespace Microsoft.AspNet.Mvc.IntegrationTests
return;
}
request.Headers["Content-Disposition"] = "form-data; name=" + name + "; filename=text.txt";
request.Headers["Content-Disposition"] = $"form-data; name={name}; filename={fileName}";
var memoryStream = new MemoryStream(Encoding.UTF8.GetBytes(data));
fileCollection.Add(new FormFile(memoryStream, 0, data.Length)
fileCollection.Add(new FormFile(memoryStream, 0, data.Length, name, fileName)
{
Headers = request.Headers
});

5
test/Microsoft.AspNet.Mvc.IntegrationTests/MutableObjectModelBinderIntegrationTest.cs
View File

@ -1954,15 +1954,16 @@ namespace Microsoft.AspNet.Mvc.IntegrationTests
private static void SetFormFileBodyContent(HttpRequest request, string content, string name)
{
const string fileName = "text.txt";
var fileCollection = new FormFileCollection();
var formCollection = new FormCollection(new Dictionary<string, StringValues>(), fileCollection);
var memoryStream = new MemoryStream(Encoding.UTF8.GetBytes(content));
request.Form = formCollection;
request.ContentType = "multipart/form-data; boundary=----WebKitFormBoundarymx2fSWqWSd0OxQqq";
request.Headers["Content-Disposition"] = "form-data; name=" + name + "; filename=text.txt";
request.Headers["Content-Disposition"] = $"form-data; name={name}; filename={fileName}";
fileCollection.Add(new FormFile(memoryStream, 0, memoryStream.Length)
fileCollection.Add(new FormFile(memoryStream, 0, memoryStream.Length, name, fileName)
{
Headers = request.Headers
});