refactors filesAdapter tests in factories

spec/FilesController.spec.js

@@ -1,29 +1,33 @@
 var FilesController = require('../src/Controllers/FilesController').FilesController;
 var GridStoreAdapter = require("../src/Adapters/Files/GridStoreAdapter").GridStoreAdapter;
+var S3Adapter = require("../src/Adapters/Files/S3Adapter").S3Adapter;
 var Config = require("../src/Config");
 
+var FCTestFactory = require("./FilesControllerTestFactory");
+
+
 // Small additional tests to improve overall coverage
 describe("FilesController",()=>{
   
-  it("should properly expand objects", (done) => {
+  // Test the grid store adapter
-    var config = new Config(Parse.applicationId);
+  var gridStoreAdapter = new GridStoreAdapter();
-    var adapter = new GridStoreAdapter();
+  FCTestFactory.testAdapter("GridStoreAdapter", gridStoreAdapter);
-    var filesController = new FilesController(adapter);
+  
-    var result = filesController.expandFilesInObject(config, function(){});
+  if (process.env.S3_ACCESS_KEY && process.env.S3_SECRET_KEY) {
     
-    expect(result).toBeUndefined();
+    // Test the S3 Adapter
+    var s3Adapter = new S3Adapter(process.env.S3_ACCESS_KEY, process.env.S3_SECRET_KEY, 'parse.server.tests');
     
-    var fullFile = {
+    FCTestFactory.testAdapter("S3Adapter",s3Adapter);
-      type: '__type',
-      url: "http://an.url"
-    }
     
-    var anObject = {
+    // Test S3 with direct access
-      aFile: fullFile
+    var s3DirectAccessAdapter = new S3Adapter(process.env.S3_ACCESS_KEY, process.env.S3_SECRET_KEY, 'parse.server.tests', {
-    }
+      directAccess: true
-    filesController.expandFilesInObject(config, anObject);
+    });
-    expect(anObject.aFile.url).toEqual("http://an.url");
     
-    done();
+    FCTestFactory.testAdapter("S3AdapterDirect", s3DirectAccessAdapter);
-  }) 
+    
-})
+  } else if (!process.env.TRAVIS) {
+    console.log("set S3_ACCESS_KEY and S3_SECRET_KEY to test S3Adapter")
+  }
+});

spec/FilesControllerTestFactory.js

@@ -0,0 +1,73 @@
+
+var FilesController = require('../src/Controllers/FilesController').FilesController;
+var Config = require("../src/Config");
+
+var testAdapter = function(name, adapter) {
+  // Small additional tests to improve overall coverage
+  
+  var config = new Config(Parse.applicationId);
+  var filesController = new FilesController(adapter);
+
+  describe("FilesController with "+name,()=>{
+    
+    it("should properly expand objects", (done) => {
+      
+      var result = filesController.expandFilesInObject(config, function(){});
+      
+      expect(result).toBeUndefined();
+      
+      var fullFile = {
+        type: '__type',
+        url: "http://an.url"
+      }
+      
+      var anObject = {
+        aFile: fullFile
+      }
+      filesController.expandFilesInObject(config, anObject);
+      expect(anObject.aFile.url).toEqual("http://an.url");
+      
+      done();
+    }) 
+    
+    it("should properly create, read, delete files", (done) => {
+      var filename;
+      filesController.createFile(config, "file.txt", "hello world").then( (result) => {
+        ok(result.url);
+        ok(result.name);
+        filename = result.name;
+        expect(result.name.match(/file.txt/)).not.toBe(null);
+        return filesController.getFileData(config, filename);
+      }, (err) => {
+        fail("The adapter should create the file");
+        console.error(err);
+        done();
+      }).then((result) => {
+        expect(result instanceof Buffer).toBe(true);
+        expect(result.toString('utf-8')).toEqual("hello world");
+        return filesController.deleteFile(config, filename);
+      }, (err) => {
+        fail("The adapter should get the file");
+        console.error(err);
+        done();
+      }).then((result) => {
+        
+        filesController.getFileData(config, filename).then((res) => {
+          fail("the file should be deleted");
+          done();
+        }, (err) => {
+          done();  
+        });
+        
+      }, (err) => {
+        fail("The adapter should delete the file");
+        console.error(err);
+        done();
+      });
+    }, 5000); // longer tests
+  });
+}
+
+module.exports = {
+  testAdapter: testAdapter
+}

src/Adapters/Files/S3Adapter.js

@@ -48,6 +48,22 @@ export class S3Adapter extends FilesAdapter {
     };
     AWS.config._region = this._region;
     this._s3Client = new AWS.S3(s3Options);
+    this._hasBucket = false;
+  }
+  
+  createBucket() {
+    var promise;
+    if (this._hasBucket) {
+      promise = Promise.resolve();
+    } else {
+      promise = new Promise((resolve, reject) => {
+        this._s3Client.createBucket(() => {
+          this._hasBucket = true;
+          resolve();
+        });
+      }); 
+    }
+    return promise;
   }
 
   // For a given config object, filename, and data, store a file in S3
@@ -60,26 +76,30 @@ export class S3Adapter extends FilesAdapter {
     if (this._directAccess) {
       params.ACL = "public-read"
     }
-    return new Promise((resolve, reject) => {
+    return this.createBucket().then(() => {
-      this._s3Client.upload(params, (err, data) => {
+      return new Promise((resolve, reject) => {
-        if (err !== null) {
+        this._s3Client.upload(params, (err, data) => {
-          return reject(err);
+          if (err !== null) {
-        }
+            return reject(err);
-        resolve(data);
+          }
+          resolve(data);
+        });
       });
     });
   }
 
   deleteFile(config, filename) {
-    return new Promise((resolve, reject) => {
+    return this.createBucket().then(() => {
-      let params = {
+      return new Promise((resolve, reject) => {
-        Key: this._bucketPrefix + filename
+        let params = {
-      };
+          Key: this._bucketPrefix + filename
-      this._s3Client.deleteObject(params, (err, data) =>{
+        };
-        if(err !== null) {
+        this._s3Client.deleteObject(params, (err, data) =>{
-          return reject(err);
+          if(err !== null) {
-        }
+            return reject(err);
-        resolve(data);
+          }
+          resolve(data);
+        });
       });
     });
   }
@@ -88,12 +108,18 @@ export class S3Adapter extends FilesAdapter {
   // Returns a promise that succeeds with the buffer result from S3
   getFileData(config, filename) {
     let params = {Key: this._bucketPrefix + filename};
-    return new Promise((resolve, reject) => {
+    return this.createBucket().then(() => {
-      this._s3Client.getObject(params, (err, data) => {
+      return new Promise((resolve, reject) => {
-        if (err !== null) {
+        this._s3Client.getObject(params, (err, data) => {
-          return reject(err);
+          if (err !== null) {
-        }
+            return reject(err);
-        resolve(data.Body);
+          }
+          // Something happend here...
+          if (data && !data.Body) {
+            return reject(data);
+          }
+          resolve(data.Body);
+        });
       });
     });
   }