test (acceptance) refactor tests and add few more test cases

Author: vengrov

package.json

@@ -4,6 +4,7 @@
   "description": "Backendless CodeRunner for Node.js",
   "scripts": {
     "test": "mocha",
+    "test-acceptance": "mocha test/acceptance",
     "lint": "eslint lib test examples bin"
   },
   "author": {

test/.eslintrc

@@ -1,5 +1,8 @@
 {
   "env": {
     "mocha": true
+  },
+  "rules": {
+    "no-throw-literal": 0
   }
 }

test/acceptance/cloud.js

@@ -1,8 +1,6 @@
-'use strict';
+/* global Backendless */
 
-const serverCode  = require('../support/server-code'),
-      events      = require('../../lib/server-code/events'),
-      PERSISTENCE = events.providers.PERSISTENCE;
+'use strict';
 
 require('mocha');
 
@@ -14,11 +12,10 @@ const app = {
   version: 'v1'
 };
 
-function request(method, path) {
-  return require('supertest')(app.server + '/' + app.version)[method](path)
-    .set('application-id', app.id)
-    .set('secret-key', app.restKey);
-}
+const serverCode  = require('../support/server-code'),
+      request     = require('../support/request')(app),
+      events      = require('../../lib/server-code/events'),
+      PERSISTENCE = events.providers.PERSISTENCE;
 
 describe('In CLOUD', function() {
   describe('[before] event handler', function() {
@@ -33,11 +30,9 @@ describe('In CLOUD', function() {
         .addHandler(PERSISTENCE.events.beforeCreate, handler)
         .deploy()
         .then(() => {
-          request('post', '/data/Person')
-            .send({ name: 'Foo' })
+          request('post', '/data/Person', { name: 'Foo' })
             .expect(200, /"name":"Foo Bar"/, done);
-        })
-        .catch(done);
+        }, done);
     });
 
     it('should be able to replace request', function(done) {
@@ -49,27 +44,42 @@ describe('In CLOUD', function() {
         .addHandler(PERSISTENCE.events.beforeCreate, handler)
         .deploy()
         .then(() => {
-          request('post', '/data/Person')
-            .send({ name: 'Foo' })
+          request('post', '/data/Person', { name: 'Foo' })
             .expect(200, /"Foo":"Bar"/, done);
-        })
-        .catch(done);
+        }, done);
+    });
+
+    it('should be able to prevent [default] and [after] behaviours by returning specific result', function(done) {
+      function beforeHandler() {
+        return { foo: 'bar' };
+      }
+
+      function afterHandler() {
+        throw 'Should not be called';
+      }
+
+      serverCode(app)
+        .addHandler(PERSISTENCE.events.beforeCreate, beforeHandler)
+        .addHandler(PERSISTENCE.events.afterCreate, afterHandler)
+        .deploy()
+        .then(() => {
+          request('post', '/data/Person', { name: 'Foo' })
+            .expect(200, { foo: 'bar' }, done);
+        }, done);
     });
 
     it('should be able to prevent default behavior by throwing simple Error', function(done) {
       function handler() {
-        throw new Error('You shall not pass');
+        throw 'You shall not pass';
       }
-
+      
       serverCode(app)
         .addHandler(PERSISTENCE.events.beforeCreate, handler)
         .deploy()
         .then(() => {
-          request('post', '/data/Person')
-            .send({ name: 'Foo' })
+          request('post', '/data/Person', { name: 'Foo' })
             .expect(400, { code: 0, message: 'You shall not pass' }, done);
-        })
-        .catch(done);
+        }, done);
     });
 
     it('should be able to prevent default behavior by throwing custom Error', function(done) {

test/support/request.js

@@ -0,0 +1,28 @@
+'use strict';
+
+const supertest = require('supertest');
+
+/**
+ * @param {Object} app
+ * @returns {Function.<Test>}
+ */
+module.exports = function(app) {
+
+  /**
+   * @param {String} method
+   * @param {String} path
+   * @param {Object=} body
+   * @returns {Test}
+   */
+  return function(method, path, body) {
+    const result = supertest(`${app.server}/${app.version}`)[method](path)
+      .set('application-id', app.id)
+      .set('secret-key', app.restKey);
+    
+    if (body) {
+      result.send(body);
+    }
+    
+    return result;
+  };
+};

test/support/server-code.js

@@ -33,7 +33,7 @@ class ServerCode {
   addHandler(event, handler, context) {
     const p = event.provider;
     const ctx = p.targeted ? `'${context || '*'}'` : null;
-    const handlerBody = `'use strict';` +
+    const handlerBody = `'use strict';\n` +
       `Backendless.ServerCode.${providerApi(p)}.${event.name}(${ctx ? ctx + ', ' : ''}${handler.toString()});`;
 
     this.items.push(handlerBody);