Bläddra i källkod

Improve acceptance tests — adding files

Artur Paikin 8 år sedan
förälder
incheckning
c15decc204
3 ändrade filer med 17 tillägg och 11 borttagningar
  1. 2 2
      src/core/Core.js
  2. 6 2
      test/acceptance/Driver.js
  3. 9 7
      test/acceptance/multipart.spec.js

+ 2 - 2
src/core/Core.js

@@ -113,7 +113,7 @@ export default class Core {
     const fileID = Utils.generateFileID(file.name)
 
     updatedFiles[fileID] = {
-      source: file.source,
+      source: file.source || '',
       id: fileID,
       name: file.name,
       type: {
@@ -122,7 +122,7 @@ export default class Core {
       },
       data: file.data,
       progress: 0,
-      isRemote: file.isRemote,
+      isRemote: file.isRemote || false,
       remote: file.remote
     }
 

+ 6 - 2
test/acceptance/Driver.js

@@ -9,8 +9,12 @@ function uppySelectFakeFile () {
     ['data:image/svg+xml;base64,PHN2ZyB2aWV3Qm94PSIwIDAgMTIwIDEyMCI+CiAgPGNpcmNsZSBjeD0iNjAiIGN5PSI2MCIgcj0iNTAiLz4KPC9zdmc+Cg=='],
     {type: 'image/svg+xml'}
   )
-  blob['name'] = 'myDumbSVG'
-  window.UppyAddFile([blob], 'smth')
+  window.UppyAddFile({
+    source: 'acceptance-test',
+    name: 'test-file',
+    type: 'image/svg+xml',
+    data: blob
+  })
 }
 
 // https://wiki.saucelabs.com/display/DOCS/Annotating+Tests+with+Selenium's+JavaScript+Executor

+ 9 - 7
test/acceptance/multipart.spec.js

@@ -1,5 +1,4 @@
 var test = require('tape')
-var path = require('path')
 var chalk = require('chalk')
 var Driver = require('./Driver')
 
@@ -29,13 +28,16 @@ module.exports = function (driver, platform, host) {
       driver.executeScript(Driver.uppySelectFakeFile)
       driver.findElement({css: '.UppyForm-uploadBtn'}).click()
     } else {
+      console.log('fake-selecting a fake file')
+      driver.executeScript(Driver.uppySelectFakeFile)
+      driver.findElement({css: '.UppyForm-uploadBtn'}).click()
       // Find input by css selector & pass absolute image path to it
-      console.log('selecting a real file')
-      driver.findElement({css: '.UppyFormContainer .UppyForm-input'}).then(function (el) {
-        el.sendKeys(path.join(__dirname, 'image.jpg'))
-        el.sendKeys(path.join(__dirname, 'image2.jpg'))
-        driver.findElement({css: '.UppyForm-uploadBtn'}).click()
-      })
+      // console.log('selecting a real file')
+      // driver.findElement({css: '.UppyFormContainer .UppyForm-input'}).then(function (el) {
+      //   el.sendKeys(path.join(__dirname, 'image.jpg'))
+      //   el.sendKeys(path.join(__dirname, 'image2.jpg'))
+      //   driver.findElement({css: '.UppyForm-uploadBtn'}).click()
+      // })
     }
 
     function isUploaded () {