Skip to content

IBrowserFile.ContentType fix #25702

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Sep 9, 2020
Merged

IBrowserFile.ContentType fix #25702

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ab7352d
Fixed content type issue
MackinnonBuck Sep 8, 2020
cdabbc2
Merge branch 'release/5.0-rc2' of https://github.com/dotnet/aspnetcor…
MackinnonBuck Sep 9, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/Components/Web.JS/dist/Release/blazor.server.js
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion src/Components/Web.JS/dist/Release/blazor.webassembly.js
View file
Open in desktop

Large diffs are not rendered by default.

6 changes: 3 additions & 3 deletions src/Components/Web.JS/src/InputFile.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ interface BrowserFile {
lastModified: string;
name: string;
size: number;
type: string;
contentType: string;
readPromise: Promise<ArrayBuffer> | undefined;
arrayBuffer: ArrayBuffer | undefined;
}
Expand Down Expand Up @@ -42,7 +42,7 @@ function init(callbackWrapper: any, elem: InputElement): void {
lastModified: new Date(file.lastModified).toISOString(),
name: file.name,
size: file.size,
type: file.type,
contentType: file.type,
readPromise: undefined,
arrayBuffer: undefined,
};
Expand Down Expand Up @@ -86,7 +86,7 @@ async function toImageFile(elem: InputElement, fileId: number, format: string, m
lastModified: originalFile.lastModified,
name: originalFile.name,
size: resizedImageBlob?.size || 0,
type: format,
contentType: format,
readPromise: undefined,
arrayBuffer: undefined,
};
Expand Down
26 changes: 22 additions & 4 deletions src/Components/test/E2ETest/Tests/InputFileTest.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@
using System.Text;
using BasicTestApp;
using BasicTestApp.FormsTest;
using Microsoft.AspNetCore.Components.E2ETest;
using Microsoft.AspNetCore.Components.E2ETest.Infrastructure;
using Microsoft.AspNetCore.Components.E2ETest.Infrastructure.ServerFixtures;
using Microsoft.AspNetCore.E2ETesting;
Expand Down Expand Up @@ -50,11 +49,17 @@ public void CanUploadSingleSmallFile()
inputFile.SendKeys(file.Path);

var fileContainer = Browser.FindElement(By.Id($"file-{file.Name}"));
var fileNameElement = fileContainer.FindElement(By.Id("file-name"));
var fileLastModifiedElement = fileContainer.FindElement(By.Id("file-last-modified"));
var fileSizeElement = fileContainer.FindElement(By.Id("file-size"));
var fileContentTypeElement = fileContainer.FindElement(By.Id("file-content-type"));
var fileContentElement = fileContainer.FindElement(By.Id("file-content"));

// Validate that the file was uploaded correctly
// Validate that the file was uploaded correctly and all fields are present
Browser.False(() => string.IsNullOrWhiteSpace(fileNameElement.Text));
Browser.NotEqual(default, () => DateTimeOffset.Parse(fileLastModifiedElement.Text));
Browser.Equal(file.Contents.Length.ToString(), () => fileSizeElement.Text);
Browser.Equal("text/plain", () => fileContentTypeElement.Text);
Browser.Equal(file.Text, () => fileContentElement.Text);
}

Expand All @@ -77,11 +82,17 @@ public void CanUploadSingleLargeFile()
inputFile.SendKeys(file.Path);

var fileContainer = Browser.FindElement(By.Id($"file-{file.Name}"));
var fileNameElement = fileContainer.FindElement(By.Id("file-name"));
var fileLastModifiedElement = fileContainer.FindElement(By.Id("file-last-modified"));
var fileSizeElement = fileContainer.FindElement(By.Id("file-size"));
var fileContentTypeElement = fileContainer.FindElement(By.Id("file-content-type"));
var fileContentElement = fileContainer.FindElement(By.Id("file-content"));

// Validate that the file was uploaded correctly
// Validate that the file was uploaded correctly and all fields are present
Browser.False(() => string.IsNullOrWhiteSpace(fileNameElement.Text));
Browser.NotEqual(default, () => DateTimeOffset.Parse(fileLastModifiedElement.Text));
Browser.Equal(file.Contents.Length.ToString(), () => fileSizeElement.Text);
Browser.Equal("text/plain", () => fileContentTypeElement.Text);
Browser.Equal(file.Text, () => fileContentElement.Text);
}

Expand All @@ -97,14 +108,21 @@ public void CanUploadMultipleFiles()
var inputFile = Browser.FindElement(By.Id("input-file"));
inputFile.SendKeys(string.Join("\n", files.Select(f => f.Path)));

// VAlidate that each file was uploaded correctly
// Validate that each file was uploaded correctly
Assert.All(files, file =>
{
var fileContainer = Browser.FindElement(By.Id($"file-{file.Name}"));
var fileNameElement = fileContainer.FindElement(By.Id("file-name"));
var fileLastModifiedElement = fileContainer.FindElement(By.Id("file-last-modified"));
var fileSizeElement = fileContainer.FindElement(By.Id("file-size"));
var fileContentTypeElement = fileContainer.FindElement(By.Id("file-content-type"));
var fileContentElement = fileContainer.FindElement(By.Id("file-content"));

// Validate that the file was uploaded correctly and all fields are present
Browser.False(() => string.IsNullOrWhiteSpace(fileNameElement.Text));
Browser.NotEqual(default, () => DateTimeOffset.Parse(fileLastModifiedElement.Text));
Browser.Equal(file.Contents.Length.ToString(), () => fileSizeElement.Text);
Browser.Equal("text/plain", () => fileContentTypeElement.Text);
Browser.Equal(file.Text, () => fileContentElement.Text);
});
}
Expand Down
8 changes: 5 additions & 3 deletions src/Components/test/testassets/BasicTestApp/FormsTest/InputFileComponent.razor
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,9 +27,11 @@ Max allowed files:
@foreach (var (file, content) in loadedFiles)
{
<p id="file-@(file.Name)">
<strong>File name:</strong> @(file.Name)<br />
<strong>File size (bytes):</strong> <span id="file-size">@(file.Size)</span><br />
<strong>File content:</strong> <span id="file-content">@content</span><br />
<strong>Name:</strong> <span id="file-name">@(file.Name)</span><br />
<strong>Last modified:</strong> <span id="file-last-modified">@(file.LastModified.ToString())</span><br />
<strong>Size (bytes):</strong> <span id="file-size">@(file.Size)</span><br />
<strong>Content type:</strong> <span id="file-content-type">@(file.ContentType)</span><br />
<strong>Content:</strong> <span id="file-content">@content</span><br />
</p>
}

Expand Down