From 65b27305e02538ca6c84cda7de1592c4f979cf83 Mon Sep 17 00:00:00 2001
From: Matweb Bot <matweb@brief.li>
Date: Thu, 9 Jan 2020 04:38:29 -0800
Subject: [PATCH 1/2] Update dependency cypress-file-upload to v3.5.3
---
package.json | 2 +-
yarn.lock | 8 ++++----
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/package.json b/package.json
index 28923edf..5f70f2ed 100644
--- a/package.json
+++ b/package.json
@@ -32,7 +32,7 @@
"@quasar/quasar-app-extension-testing-security-antivuln": "1.0.0-alpha.2",
"@vue/eslint-config-standard": "5.0.1",
"babel-eslint": "10.0.3",
- "cypress-file-upload": "3.5.0",
+ "cypress-file-upload": "3.5.3",
"eslint": "6.7.2",
"eslint-loader": "3.0.2",
"eslint-plugin-import": "2.18.2",
diff --git a/yarn.lock b/yarn.lock
index 545d249b..b2362ccd 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -4178,10 +4178,10 @@ cyclist@^1.0.1:
resolved "https://registry.yarnpkg.com/cyclist/-/cyclist-1.0.1.tgz#596e9698fd0c80e12038c2b82d6eb1b35b6224d9"
integrity sha1-WW6WmP0MgOEgOMK4LW6xs1tiJNk=
-cypress-file-upload@3.5.0:
- version "3.5.0"
- resolved "https://registry.yarnpkg.com/cypress-file-upload/-/cypress-file-upload-3.5.0.tgz#7ff6294a3be68adcac72bc1fa25c75c57e0701fc"
- integrity sha512-MgrsP4C2pUMvHqixH33OtXHNKkwQZV6ny0fu+APDTEP9O/uuKFh3sYcnPNU6XGfuC85/RmqVNw21ZQyyT+S5IQ==
+cypress-file-upload@3.5.3:
+ version "3.5.3"
+ resolved "https://registry.yarnpkg.com/cypress-file-upload/-/cypress-file-upload-3.5.3.tgz#cd706485de3fb2cbd4a8c2dd90fe96d537bb4311"
+ integrity sha512-S/czzqAj1BYz6Xxnfpx2aSc6hXsj76fd8/iuycJ2RxoxCcQMliw8eQV0ugzVlkzr1GD5dKGviNFGYqv3nRJ+Tg==
cypress@^3.3.1:
version "3.5.0"
--
GitLab
From 2309be9b6c530d19a5a25f57d430af84507ad237 Mon Sep 17 00:00:00 2001
From: jf <jan.friedli@immerda.ch>
Date: Thu, 9 Jan 2020 17:32:17 +0100
Subject: [PATCH 2/2] fixed upload lib
---
.../cypress/integration/download/init.spec.js | 35 ++++++++-----------
test/cypress/integration/upload/init.spec.js | 15 +++-----
2 files changed, 19 insertions(+), 31 deletions(-)
diff --git a/test/cypress/integration/download/init.spec.js b/test/cypress/integration/download/init.spec.js
index 6db4bac0..62e7ec51 100755
--- a/test/cypress/integration/download/init.spec.js
+++ b/test/cypress/integration/download/init.spec.js
@@ -21,9 +21,8 @@ describe('Download page tests', () => {
let fileNameOne = 'test-image.png'
cy.fixture(fileNameOne).then(fileContent => {
- cy.get('.uppy-Dashboard-dropFilesTitle').upload(
- { fileContent: fileContent, fileName: fileNameOne, mimeType: 'image/png' },
- { subjectType: 'drag-n-drop' }
+ cy.get('.uppy-Dashboard-input').upload(
+ { fileContent: fileContent, fileName: fileNameOne, mimeType: 'image/png' }
)
}).then(() => {
cy.get('.uppy-Dashboard-files').contains(fileNameOne)
@@ -33,9 +32,8 @@ describe('Download page tests', () => {
let fileNameTwo = 'test-image-two.png'
cy.get('.uppy-DashboardContent-addMore').click()
cy.fixture(fileNameTwo).then(fileContent => {
- cy.get('.uppy-DashboardTabs-list').upload(
- { fileContent: fileContent, fileName: fileNameTwo, mimeType: 'image/png' },
- { subjectType: 'drag-n-drop' }
+ cy.get('.uppy-Dashboard-input').upload(
+ { fileContent: fileContent, fileName: fileNameTwo, mimeType: 'image/png' }
)
}).then(() => {
cy.get('.uppy-Dashboard-files').contains(fileNameTwo)
@@ -79,9 +77,8 @@ describe('Download page tests', () => {
let fileNameOne = 'eth_biwi_00546.pdf'
cy.fixture(fileNameOne).then(fileContent => {
- cy.get('.uppy-Dashboard-dropFilesTitle').upload(
- { fileContent: fileContent, fileName: fileNameOne, mimeType: 'application/pdf' },
- { subjectType: 'drag-n-drop' }
+ cy.get('.uppy-Dashboard-input').upload(
+ { fileContent: fileContent, fileName: fileNameOne, mimeType: 'application/pdf' }
)
}).then(() => {
cy.get('.uppy-Dashboard-files').contains(fileNameOne)
@@ -118,9 +115,8 @@ describe('Download page tests', () => {
let fileNameOne = 'a-very-long-name-for-a-very-small-text-file-to-truncate.txt'
cy.fixture(fileNameOne).then(fileContent => {
- cy.get('.uppy-Dashboard-dropFilesTitle').upload(
- { fileContent: fileContent, fileName: fileNameOne, mimeType: 'text/plain' },
- { subjectType: 'drag-n-drop' }
+ cy.get('.uppy-Dashboard-input').upload(
+ { fileContent: fileContent, fileName: fileNameOne, mimeType: 'text/plain' }
)
})
cy.get('.uppy-StatusBar-actions > button').click()
@@ -141,9 +137,8 @@ describe('Download page tests', () => {
{ fileName: 'txt2.txt', fileContent: txtFile, mimeType: 'text/plain' },
{ fileName: 'txt3.txt', fileContent: txtFile, mimeType: 'text/plain' }
]
- cy.get('.uppy-Dashboard-dropFilesTitle').upload(
- files,
- { subjectType: 'drag-n-drop' }
+ cy.get('.uppy-Dashboard-input').upload(
+ files
)
})
cy.get('.uppy-StatusBar-actions > button').click()
@@ -181,9 +176,8 @@ describe('Upload page negative tests', () => {
const fileName = 'a-very-long-name-for-a-very-small-text-file-to-truncate.txt'
cy.fixture(fileName).then(fileContent => {
- cy.get('.uppy-Dashboard-dropFilesTitle').upload(
- { fileContent: fileContent, fileName: fileName, mimeType: 'text/plain' },
- { subjectType: 'drag-n-drop' }
+ cy.get('.uppy-Dashboard-input').upload(
+ { fileContent: fileContent, fileName: fileName, mimeType: 'text/plain' }
)
})
cy.get('.uppy-StatusBar-actions > button').click()
@@ -216,9 +210,8 @@ describe('Upload page negative tests', () => {
{ fileName: 'txt2.txt', fileContent: txtFile, mimeType: 'text/plain' },
{ fileName: 'txt3.txt', fileContent: txtFile, mimeType: 'text/plain' }
]
- cy.get('.uppy-Dashboard-dropFilesTitle').upload(
- files,
- { subjectType: 'drag-n-drop' }
+ cy.get('.uppy-Dashboard-input').upload(
+ files
)
})
cy.get('.uppy-StatusBar-actions > button').click()
diff --git a/test/cypress/integration/upload/init.spec.js b/test/cypress/integration/upload/init.spec.js
index e21cc60c..973d17ee 100755
--- a/test/cypress/integration/upload/init.spec.js
+++ b/test/cypress/integration/upload/init.spec.js
@@ -45,9 +45,8 @@ describe('Upload page tests', () => {
}).as('fileUpload')
cy.fixture(fileName).then(fileContent => {
- cy.get('.uppy-Dashboard-dropFilesTitle').upload(
- { fileContent, fileName, mimeType: 'image/png' },
- { subjectType: 'drag-n-drop' }
+ cy.get('.uppy-Dashboard-input').upload(
+ { fileContent, fileName, mimeType: 'image/png' }
)
})
@@ -72,9 +71,8 @@ describe('Upload page tests', () => {
const fileName = 'not-supported.json'
cy.fixture(fileName).then(fileContent => {
- cy.get('.uppy-Dashboard-dropFilesTitle').upload(
- { fileContent, fileName, mimeType: 'application/json' },
- { subjectType: 'drag-n-drop' }
+ cy.get('.uppy-Dashboard-input').upload(
+ { fileContent, fileName, mimeType: 'application/json' }
)
})
cy.wait(300)
@@ -96,10 +94,7 @@ describe('Upload page tests', () => {
{ fileName: 'txt9.txt', fileContent: txtFile, mimeType: 'text/plain' },
{ fileName: 'txt10.txt', fileContent: txtFile, mimeType: 'text/plain' },
]
- cy.get('.uppy-Dashboard-dropFilesTitle').upload(
- files,
- { subjectType: 'drag-n-drop' }
- )
+ cy.get('.uppy-Dashboard-input').upload(files)
})
cy.wait(300)
--
GitLab