#8 #3 Add test cases for upload-from-storage API

test-server/.gitignore

@@ -1,6 +1,7 @@
 uploads/*
 public/*
 !public/github.png
+!public/github2.png
 !public/22mb-dummy
 !public/1mb-dummy
 !uploads/readme

test/test-0.1.x-0.4.x.js

@@ -93,11 +93,12 @@ describe('Compare uploaded multipart image', (report, done) => {
 
 describe('Progress report test', (report, done) => {
   let received = 0
-  RNFetchBlob.fetch('GET', `${TEST_SERVER_URL}/public/1mb-dummy`, {
+  RNFetchBlob
+    .fetch('GET', `${TEST_SERVER_URL}/public/1mb-dummy`, {
       Authorization : 'Bearer abde123eqweje'
     })
     .progress((written, total) => {
-      report(<Info key={`progress = ${written} bytes / ${total} bytes`}/>)
+      // report(<Info key={`progress = ${written} bytes / ${total} bytes`}/>)
       if(written === total)
         report(<Assert key="progress goes to 100%" expect={written} actual={total}/>)
     })
@@ -110,14 +111,14 @@ describe('Progress report test', (report, done) => {
 })
 
 // FIXME : not yet supported
-describe('Large file download test', (report, done) => {
-  let received = 0
+// describe('Large file download test', (report, done) => {
+  // let received = 0
   // RNFetchBlob.fetch('GET', `${TEST_SERVER_URL}/public/22mb-dummy`, {
   //   Authorization : 'Bearer abde123eqweje'
   // })
   // .then((resp) => {
-    report(<Assert key="not supported" expect={true} actual={false}/>)
-    done()
+    // report(<Assert key="not supported" expect={true} actual={false}/>)
+    // done()
   // })
 
-})
+// })

test/test-0.5.x.js

@@ -27,7 +27,7 @@ describe('Get storage folders', (report, done) => {
       <Assert key="check properties"
         expect={dirs}
         comparer={Comparer.hasProperties}
-        actual={['PictureDir', 'MovieDir', 'DocumentDir', 'CacheDir']}
+        actual={['PictureDir', 'MovieDir', 'DocumentDir', 'CacheDir', 'MusicDir', 'DCIMDir']}
       />,
       <Info key="System Folders">
         <Text>{`${JSON.stringify(dirs)}`}</Text>
@@ -46,7 +46,7 @@ describe('Download file to storage with custom file extension', (report, done) =
       fileCache : true,
       appendExt : 'png'
     })
-    .fetch('GET', `${TEST_SERVER_URL}/public/github.png`)
+    .fetch('GET', `${TEST_SERVER_URL}/public/github2.jpg`)
     .then((resp) => {
       tmpFilePath = resp.path()
       report(<Info key={`image from ${tmpFilePath}`}>
@@ -65,8 +65,6 @@ describe('Read cached file via file stream', (report, done) => {
     data += chunk
   })
   stream.onEnd(() => {
-    console.log(prop('image').length, data.length)
-    console.log(data)
     report(
       <Assert key="image should have value"
         expect={0}
@@ -95,33 +93,60 @@ describe('File stream reader error should be able to handled', (report, done) =>
   })
 })
 
-//
-// describe('Upload from file storage', (report, done) => {
-//   let filename = ''
-//   let filepath = ''
-//   RNFetchBlob.getSystemDirs().then((dirs) => {
-//     filename = 'ios.5.0-' + Date.now() + '-from-storage.png'
-//     filepath = dirs.DocumentDir + '/' + filename
-//     return RNFetchBlob.config({ path : filepath })
-//                       .fetch('GET', `${TEST_SERVER_URL}/public/github.png`)
-//   })
-//   .then((resp) => {
-//       let path = resp.path()
-//       return RNFetchBlob.fetch('POST', 'https://content.dropboxapi.com/2/files/upload', {
-//         Authorization : `Bearer ${DROPBOX_TOKEN}`,
-//         'Dropbox-API-Arg': '{\"path\": \"/rn-upload/'+filename+'\",\"mode\": \"add\",\"autorename\": true,\"mute\": false}',
-//         'Content-Type' : 'application/octet-stream',
-//       }, 'RNFetchBlob-file://' + path)
-//       .then((resp) => {
-//         console.log(resp.text())
-//         resp = resp.json()
-//         report(
-//           <Assert key="confirm the file has been uploaded" expect={filename} actual={resp.name}/>
-//         )
-//         done()
-//       })
-//   })
-//
-//
-//
-// })
+let localFile = null
+
+describe('Upload from file storage', (report, done) => {
+  let filename = ''
+  let filepath = ''
+  RNFetchBlob.getSystemDirs().then((dirs) => {
+    filename = Platform.OS + '0.5.0-' + Date.now() + '-from-storage.png'
+    filepath = dirs.DocumentDir + '/' + filename
+    return RNFetchBlob.config({ path : filepath })
+                      .fetch('GET', `${TEST_SERVER_URL}/public/github2.jpg`)
+  })
+  .then((resp) => {
+      let path = resp.path()
+      localFile = path
+      return RNFetchBlob.fetch('POST', 'https://content.dropboxapi.com/2/files/upload', {
+        Authorization : `Bearer ${DROPBOX_TOKEN}`,
+        'Dropbox-API-Arg': '{\"path\": \"/rn-upload/'+filename+'\",\"mode\": \"add\",\"autorename\": true,\"mute\": false}',
+        'Content-Type' : 'application/octet-stream',
+      }, 'RNFetchBlob-file://' + path)
+      .then((resp) => {
+        resp = resp.json()
+        report(
+          <Assert key="confirm the file has been uploaded" expect={filename} actual={resp.name}/>
+        )
+        done()
+      })
+  })
+})
+
+describe('Upload multipart data with file from storage', (report, done) => {
+    let filename = 'test-from-storage-img-'+Date.now()+'.png'
+    RNFetchBlob.fetch('POST', `${TEST_SERVER_URL}/upload-form`, {
+        'Content-Type' : 'multipart/form-data',
+      }, [
+        { name : 'test-img', filename : filename, data: 'RNFetchBlob-file://' + localFile},
+        { name : 'test-text', filename : 'test-text.txt', data: RNFetchBlob.base64.encode('hello.txt')},
+        { name : 'field1', data : 'hello !!'},
+        { name : 'field2', data : 'hello2 !!'}
+      ])
+    .then((resp) => {
+      resp = resp.json()
+      report(
+        <Assert key="check posted form data #1" expect="hello !!" actual={resp.fields.field1}/>,
+        <Assert key="check posted form data #2" expect="hello2 !!" actual={resp.fields.field2}/>,
+      )
+      return RNFetchBlob.fetch('GET', `${TEST_SERVER_URL}/public/${filename}`)
+    })
+    .then((resp) => {
+      report(<Info key="uploaded image">
+        <Image
+          style={styles.image}
+          source={{ uri : 'data:image/png;base64, '+ resp.base64()}}/>
+      </Info>)
+      done()
+    })
+
+})