Merge pull request #1234 from ParsePlatform/flovilmart.winston

Better logging with winston

spec/FileLoggerAdapter.spec.js

@@ -1,35 +1,10 @@
 var FileLoggerAdapter = require('../src/Adapters/Logger/FileLoggerAdapter').FileLoggerAdapter;
 var Parse = require('parse/node').Parse;
-var request = require('request');
-var fs = require('fs');
-
-var LOGS_FOLDER = './test_logs/';
-
-var deleteFolderRecursive = function(path) {
-  if( fs.existsSync(path) ) {
-    fs.readdirSync(path).forEach(function(file,index){
-      var curPath = path + "/" + file;
-      if(fs.lstatSync(curPath).isDirectory()) { // recurse
-        deleteFolderRecursive(curPath);
-      } else { // delete file
-        fs.unlinkSync(curPath);
-      }
-    });
-    fs.rmdirSync(path);
-  }
-};
 
 describe('info logs', () => {
 
-  afterEach((done) => {
-    deleteFolderRecursive(LOGS_FOLDER);
-    done();
-  });
-
   it("Verify INFO logs", (done) => {
-    var fileLoggerAdapter = new FileLoggerAdapter({
-      logsFolder: LOGS_FOLDER
-    });
+    var fileLoggerAdapter = new FileLoggerAdapter();
     fileLoggerAdapter.info('testing info logs', () => {
       fileLoggerAdapter.query({
         size: 1,
@@ -49,11 +24,6 @@ describe('info logs', () => {
 
 describe('error logs', () => {
 
-  afterEach((done) => {
-    deleteFolderRecursive(LOGS_FOLDER);
-    done();
-  });
-
   it("Verify ERROR logs", (done) => {
     var fileLoggerAdapter = new FileLoggerAdapter();
     fileLoggerAdapter.error('testing error logs', () => {

spec/LoggerController.spec.js

@@ -10,12 +10,16 @@ describe('LoggerController', () => {
 
     expect(() => {
       loggerController.getLogs(query).then(function(res) {
-        expect(res.length).toBe(0);
+        expect(res.length).not.toBe(0);
+        done();
+      }).catch((err) => {
+        console.error(err);
+        fail("should not fail");
         done();
       })
     }).not.toThrow();
   });
-  
+
   it('properly validates dateTimes', (done) => {
     expect(LoggerController.validDateTime()).toBe(null);
     expect(LoggerController.validDateTime("String")).toBe(null);
@@ -23,23 +27,23 @@ describe('LoggerController', () => {
     expect(LoggerController.validDateTime("2016-01-01Z00:00:00").getTime()).toBe(1451606400000);
     done();
   });
-  
+
   it('can set the proper default values', (done) => {
     // Make mock request
     var result = LoggerController.parseOptions();
     expect(result.size).toEqual(10);
     expect(result.order).toEqual('desc');
     expect(result.level).toEqual('info');
-   
+
     done();
   });
-  
+
   it('can process a query witout throwing', (done) => {
     // Make mock request
     var query = {
       from: "2016-01-01Z00:00:00",
       until: "2016-01-01Z00:00:00",
-      size: 5, 
+      size: 5,
       order: 'asc',
       level: 'error'
     };
@@ -51,16 +55,16 @@ describe('LoggerController', () => {
     expect(result.size).toEqual(5);
     expect(result.order).toEqual('asc');
     expect(result.level).toEqual('error');
-   
+
     done();
   });
-  
+
   it('can check process a query witout throwing', (done) => {
     // Make mock request
     var query = {
-      from: "2015-01-01",
-      until: "2016-01-01",
-      size: 5, 
+      from: "2016-01-01",
+      until: "2016-01-30",
+      size: 5,
       order: 'desc',
       level: 'error'
     };
@@ -71,13 +75,15 @@ describe('LoggerController', () => {
       loggerController.getLogs(query).then(function(res) {
         expect(res.length).toBe(0);
         done();
+      }).catch((err) => {
+        console.error(err);
+        fail("should not fail");
+        done();
       })
     }).not.toThrow();
   });
-  
-  it('should throw without an adapter', (done) => {
-    
 
+  it('should throw without an adapter', (done) => {
     expect(() => {
       var loggerController = new LoggerController();
     }).toThrow();