From f1dceb9829df2142c4c96183bfa0c29a401b497b Mon Sep 17 00:00:00 2001 From: --list <--list> Date: Fri, 14 May 2021 15:14:05 +0100 Subject: [PATCH 1/7] add deps --- packages/files-ui/package.json | 1 + yarn.lock | 5 +++++ 2 files changed, 6 insertions(+) diff --git a/packages/files-ui/package.json b/packages/files-ui/package.json index 74413f7d1d..b5bef797f6 100644 --- a/packages/files-ui/package.json +++ b/packages/files-ui/package.json @@ -64,6 +64,7 @@ "@types/zxcvbn": "^4.4.0", "babel-plugin-macros": "^2.8.0", "cypress": "^7.2.0", + "cypress-file-upload": "^5.0.7", "eslint-plugin-cypress": "^2.11.2" }, "scripts": { diff --git a/yarn.lock b/yarn.lock index 7cb9a92c00..6c5f9f4af9 100644 --- a/yarn.lock +++ b/yarn.lock @@ -9123,6 +9123,11 @@ cyclist@^1.0.1: resolved "https://registry.yarnpkg.com/cyclist/-/cyclist-1.0.1.tgz#596e9698fd0c80e12038c2b82d6eb1b35b6224d9" integrity sha1-WW6WmP0MgOEgOMK4LW6xs1tiJNk= +cypress-file-upload@^5.0.7: + version "5.0.7" + resolved "https://registry.yarnpkg.com/cypress-file-upload/-/cypress-file-upload-5.0.7.tgz#acf24fe08a92b2d0c892a58b56811fb933d34ea9" + integrity sha512-cgWsWx7igxjyyVm9/VJ9ukdy69jL00I7z0lrwUWtXXLPvX4neO+8JAZ054Ax8Xf+mdV9OerenXzb9nqRoafjHA== + cypress@^7.2.0: version "7.2.0" resolved "https://registry.yarnpkg.com/cypress/-/cypress-7.2.0.tgz#6a3364e18972f898fff1fb12c1ff747939e45ddc" From cd46189673b02acf0ca6644514a6120ccc0e7d5c Mon Sep 17 00:00:00 2001 From: Thibaut Sardan Date: Mon, 17 May 2021 16:28:27 +0200 Subject: [PATCH 2/7] test upload modal, cancel and upload --- .../src/FileInput/FileInput.tsx | 2 +- packages/files-ui/cypress/fixtures/types.d.ts | 14 +++++++++ .../cypress/fixtures/uploadedFiles/logo.png | Bin 0 -> 180586 bytes .../fixtures/uploadedFiles/text-file.txt | 1 + .../cypress/integration/file-management.ts | 28 ++++++++++++++++++ packages/files-ui/cypress/support/commands.ts | 1 + packages/files-ui/cypress/support/index.ts | 11 +++++++ packages/files-ui/cypress/tsconfig.json | 2 +- packages/files-ui/package.json | 4 +-- .../FileSystemItem/FileSystemTableItem.tsx | 1 + .../FileBrowsers/views/FilesTable.view.tsx | 2 ++ .../Components/Modules/UploadFileModule.tsx | 7 ++++- yarn.lock | 16 +++++----- 13 files changed, 76 insertions(+), 13 deletions(-) create mode 100644 packages/files-ui/cypress/fixtures/types.d.ts create mode 100644 packages/files-ui/cypress/fixtures/uploadedFiles/logo.png create mode 100644 packages/files-ui/cypress/fixtures/uploadedFiles/text-file.txt create mode 100644 packages/files-ui/cypress/integration/file-management.ts diff --git a/packages/common-components/src/FileInput/FileInput.tsx b/packages/common-components/src/FileInput/FileInput.tsx index d83a672131..f812aa3d6a 100644 --- a/packages/common-components/src/FileInput/FileInput.tsx +++ b/packages/common-components/src/FileInput/FileInput.tsx @@ -223,7 +223,7 @@ const FileInput: React.FC = ({ > {file.name}