Skip to content
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.

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

fix(FileUploaderDropContainer): fix NPE selecting file #4936

Merged
Merged
Show file tree
Hide file tree
Changes from 2 commits
Commits
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
22 changes: 21 additions & 1 deletion packages/react/src/components/FileUploader/FileUploader-test.js
Original file line number Diff line number Diff line change
Expand Up @@ -255,7 +255,13 @@ describe('FileUploader', () => {
});

describe('FileUploaderDropContainer', () => {
const dropContainer = <FileUploaderDropContainer className="extra-class" />;
const onAddFiles = jest.fn();
const dropContainer = (
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We should move blocks where we create components into beforeEach or a similar generator function to prevent test flakiness

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@joshblack Agreed on beforAll()/beforeEach() making tests more stable, but it's orthogonal to this PR. Do you want to enter an issue for that?

<FileUploaderDropContainer
className="extra-class"
onAddFiles={onAddFiles}
/>
);
const mountWrapper = mount(dropContainer);

describe('Renders as expected with default props', () => {
Expand Down Expand Up @@ -293,6 +299,20 @@ describe('FileUploaderDropContainer', () => {

expect(evt.target.value).toEqual(null);
});

it('Fires onAddFiles upon selecting a file', () => {
asudoh marked this conversation as resolved.
Show resolved Hide resolved
const fileFoo = new File(['foo'], 'foo.txt', { type: 'text/plain' });
const fileBar = new File(['bar'], 'bar.txt', { type: 'text/plain' });
const mockFiles = [fileFoo, fileBar];
const input = mountWrapper.find(`.${prefix}--file-input`);
const evt = { target: { files: mockFiles } };
input.simulate('change', evt);
expect(onAddFiles).toHaveBeenCalledTimes(1);
expect(onAddFiles.mock.calls[0][0].target.files).toEqual([
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Maybe expect(onAddFiles).toHaveBeenCalledWith might be relevant here? Something like:

expect(onAddFiles).toHaveBeenCalledWith(expect.objectContaining({
  target: {
    files: [fileFoo, fileBar],
  },
}));

fileFoo,
fileBar,
]);
});
});

describe('Unique id props', () => {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -43,8 +43,8 @@ export default function FileUploaderDropContainer(props) {
* @param {Event} evt - Event object, used to get the list of files added
*/
const validateFiles = evt => {
const transferredFiles = [...evt.dataTransfer.files];
if (evt.type === 'drop') {
const transferredFiles = [...evt.dataTransfer.files];
if (!accept.length) {
return transferredFiles;
}
Expand Down