Lint and refactor requests

Author: STRML

.eslintrc

@@ -0,0 +1,22 @@
+{
+  "root": true,
+  "extends": "eslint:recommended",
+  "rules": {
+    "strict": 0,
+    "quotes": [0, "single"],
+    "curly": [1, "multi-line"],
+    "no-console": 0,
+    "no-use-before-define": [1, "nofunc"],
+    "no-underscore-dangle": 0,
+    "no-unused-vars": [1, {"vars": "local", "args": "none"}],
+    "new-cap": 0,
+    "consistent-return": 0,
+    "camelcase": 0,
+    "dot-notation": 0,
+    "semi": [1, "always"]
+  },
+  env: {
+    "node": true,
+    "mocha": true
+  }
+}

lib/helpers.js

@@ -1,10 +1,11 @@
 var _describe = {};
 var _it = {};
 var _beforeEach = {};
-var helpers = exports = module.exports = {
+module.exports = {
   describe: _describe,
   it: _it,
-  beforeEach: _beforeEach
+  beforeEach: _beforeEach,
+  makeRequest: _makeRequest
 };
 var assert = require('assert');
 var request = require('supertest');
@@ -24,7 +25,7 @@ _beforeEach.withApp = function(app) {
     this.put = _request.put;
     this.del = _request.del;
   });
-}
+};
 
 _beforeEach.cleanDatasource = function(dsName) {
   beforeEach(function(done) {
@@ -39,15 +40,7 @@ _beforeEach.cleanDatasource = function(dsName) {
       done();
     }
   });
-}
-
-function mixin(obj, into) {
-  Object.keys(obj).forEach(function(key) {
-    if(typeof obj[key] === 'function') {
-      into[key] = obj[key];
-    }
-  });
-}
+};
 
 _describe.staticMethod = function(methodName, cb) {
   describe('.' + methodName, function() {
@@ -57,7 +50,7 @@ _describe.staticMethod = function(methodName, cb) {
     });
     cb();
   });
-}
+};
 
 _describe.instanceMethod = function(methodName, cb) {
   describe('.prototype.' + methodName, function() {
@@ -67,14 +60,14 @@ _describe.instanceMethod = function(methodName, cb) {
     });
     cb();
   });
-}
+};
 
 _beforeEach.withArgs = function() {
   var args = Array.prototype.slice.call(arguments, 0);
   beforeEach(function() {
     this.args = args;
   });
-}
+};
 
 _beforeEach.givenModel = function(modelName, attrs, optionalHandler) {
   var modelKey = modelName;
@@ -125,7 +118,7 @@ _beforeEach.givenModel = function(modelName, attrs, optionalHandler) {
   afterEach(function(done) {
     this[modelKey].destroy(done);
   });
-}
+};
 
 _beforeEach.withUserModel = function(model) {
   beforeEach(function(done) {
@@ -136,13 +129,13 @@ _beforeEach.withUserModel = function(model) {
 
 _beforeEach.givenUser = function(attrs, optionalHandler) {
   _beforeEach.givenModel('__USERMODEL__', attrs, optionalHandler);
-}
+};
 
 _beforeEach.givenUserWithRole = function (attrs, role, optionalHandler) {
   if (typeof role === 'string') {
     role = {
       name: role
-    }
+    };
   }
   _beforeEach.givenUser(attrs, function (done) {
     var test = this;
@@ -189,7 +182,7 @@ _beforeEach.givenUserWithRole = function (attrs, role, optionalHandler) {
       });
     });
   });
-}
+};
 
 _beforeEach.givenLoggedInUser = function(credentials, optionalHandler) {
   _beforeEach.givenUser(credentials, function(done) {
@@ -212,7 +205,7 @@ _beforeEach.givenLoggedInUser = function(credentials, optionalHandler) {
       done();
     });
   });
-}
+};
 
 _beforeEach.givenLoggedInUserWithRole = function(credentials, role, optionalHandler){
   _beforeEach.givenUserWithRole(credentials, role, function(done) {
@@ -235,15 +228,15 @@ _beforeEach.givenLoggedInUserWithRole = function(credentials, role, optionalHand
       done();
     });
   });
-}
+};
 
 _beforeEach.givenAnUnauthenticatedToken = function(attrs, optionalHandler) {
   _beforeEach.givenModel('AccessToken', attrs, optionalHandler);
-}
+};
 
 _beforeEach.givenAnAnonymousToken = function(attrs, optionalHandler) {
   _beforeEach.givenModel('AccessToken', {id: '$anonymous'}, optionalHandler);
-}
+};
 
 _describe.whenCalledRemotely = function(verb, url, data, cb) {
   if (cb == undefined) {
@@ -261,89 +254,54 @@ _describe.whenCalledRemotely = function(verb, url, data, cb) {
 
   describe(verb.toUpperCase() + ' ' + urlStr, function() {
     beforeEach(function(cb) {
-      if(typeof url === 'function') {
-        this.url = url.call(this);
-      }
-      else if(typeof url === 'object' && url.hasOwnProperty('callback')){
-        this.url = url.callback.call(this);
-      }
-      this.remotely = true;
-      this.verb = verb.toUpperCase();
-      this.url = this.url || url;
-      var methodForVerb = verb.toLowerCase();
-      if(methodForVerb === 'delete') methodForVerb = 'del';
-
-      if (this.request === undefined) {
-          throw new Error('App is not specified. Please use lt.beforeEach.withApp to specify the app.');
-      }
-
-      this.http = this.request[methodForVerb](this.url);
-      delete this.url;
-      this.http.set('Accept', 'application/json');
-      if(this.loggedInAccessToken) {
-        this.http.set('authorization', this.loggedInAccessToken.id);
-      }
-      if (data) {
-        var payload = data;
-        if (typeof data === 'function')
-          payload = data.call(this);
-        this.http.send(payload);
-      }
-      this.req = this.http.req;
-      var test = this;
-      this.http.end(function(err) {
-        test.req = test.http.req;
-        test.res = test.http.res;
-        delete test.url;
-        cb();
-      });
+      _makeRequest.call(this, verb, url, data, cb);
     });
 
     cb();
   });
-}
+};
 
 _describe.whenLoggedInAsUser = function(credentials, cb) {
   describe('when logged in as user', function () {
     _beforeEach.givenLoggedInUser(credentials);
     cb();
   });
-}
+};
 
 _describe.whenLoggedInAsUserWithRole = function(credentials, role, cb) {
   describe('when logged in as user', function () {
     _beforeEach.givenLoggedInUserWithRole(credentials, role);
     cb();
   });
-}
+};
 
 _describe.whenCalledByUser = function(credentials, verb, url, data, cb) {
   describe('when called by logged in user', function () {
     _beforeEach.givenLoggedInUser(credentials);
     _describe.whenCalledRemotely(verb, url, data, cb);
   });
-}
+};
 
 _describe.whenCalledByUserWithRole = function (credentials, role, verb, url, data, cb) {
    describe('when called by logged in user with role ' + role, function () {
     _beforeEach.givenLoggedInUserWithRole(credentials, role);
     _describe.whenCalledRemotely(verb, url, data, cb);
   });
-}
+};
 
 _describe.whenCalledAnonymously = function(verb, url, data, cb) {
   describe('when called anonymously', function () {
     _beforeEach.givenAnAnonymousToken();
     _describe.whenCalledRemotely(verb, url, data, cb);
   });
-}
+};
 
 _describe.whenCalledUnauthenticated = function(verb, url, data, cb) {
   describe('when called with unauthenticated token', function () {
     _beforeEach.givenAnAnonymousToken();
     _describe.whenCalledRemotely(verb, url, data, cb);
   });
-}
+};
 
 _it.shouldBeAllowed = function() {
   it('should be allowed', function() {
@@ -352,7 +310,7 @@ _it.shouldBeAllowed = function() {
     // expect success - status 2xx or 3xx
     expect(this.res.statusCode).to.be.within(100, 399);
   });
-}
+};
 
 _it.shouldBeDenied = function() {
   it('should not be allowed', function() {
@@ -362,67 +320,107 @@ _it.shouldBeDenied = function() {
       401;
     expect(this.res.statusCode).to.equal(expectedStatus);
   });
-}
+};
 
 _it.shouldNotBeFound = function() {
   it('should not be found', function() {
     assert(this.res);
     assert.equal(this.res.statusCode, 404);
   });
-}
+};
 
 _it.shouldBeAllowedWhenCalledAnonymously =
 function(verb, url, data) {
   _describe.whenCalledAnonymously(verb, url, data, function() {
     _it.shouldBeAllowed();
   });
-}
+};
 
 _it.shouldBeDeniedWhenCalledAnonymously =
 function(verb, url) {
   _describe.whenCalledAnonymously(verb, url, function() {
     _it.shouldBeDenied();
   });
-}
+};
 
 _it.shouldBeAllowedWhenCalledUnauthenticated =
 function(verb, url, data) {
   _describe.whenCalledUnauthenticated(verb, url, data, function() {
     _it.shouldBeAllowed();
   });
-}
+};
 
 _it.shouldBeDeniedWhenCalledUnauthenticated =
 function(verb, url) {
   _describe.whenCalledUnauthenticated(verb, url, function() {
     _it.shouldBeDenied();
   });
-}
+};
 
 _it.shouldBeAllowedWhenCalledByUser =
 function(credentials, verb, url, data) {
   _describe.whenCalledByUser(credentials, verb, url, data, function() {
     _it.shouldBeAllowed();
   });
-}
+};
 
 _it.shouldBeDeniedWhenCalledByUser =
 function(credentials, verb, url) {
   _describe.whenCalledByUser(credentials, verb, url, function() {
     _it.shouldBeDenied();
   });
-}
+};
 
 _it.shouldBeAllowedWhenCalledByUserWithRole =
 function(credentials, role, verb, url, data) {
   _describe.whenCalledByUserWithRole(credentials, role, verb, url, data, function() {
     _it.shouldBeAllowed();
   });
-}
+};
 
 _it.shouldBeDeniedWhenCalledByUserWithRole =
 function(credentials, role, verb, url) {
   _describe.whenCalledByUserWithRole(credentials, role, verb, url, function() {
     _it.shouldBeDenied();
   });
+};
+
+function _makeRequest(url, verb, data, cb) {
+  if(typeof url === 'function') {
+    this.url = url.call(this);
+  }
+  else if(typeof url === 'object' && url.hasOwnProperty('callback')){
+    this.url = url.callback.call(this);
+  }
+  this.remotely = true;
+  this.verb = verb.toUpperCase();
+  this.url = this.url || url;
+  var methodForVerb = verb.toLowerCase();
+  if(methodForVerb === 'delete') methodForVerb = 'del';
+
+  if (this.request === undefined) {
+      throw new Error('App is not specified. Please use lt.beforeEach.withApp to specify the app.');
+  }
+
+  this.http = this.request[methodForVerb](this.url);
+  delete this.url;
+  this.http.set('Accept', 'application/json');
+  if(this.loggedInAccessToken) {
+    this.http.set('authorization', this.loggedInAccessToken.id);
+  }
+  if (data) {
+    var payload = data;
+    if (typeof data === 'function') {
+      payload = data.call(this);
+    }
+    this.http.send(payload);
+  }
+  this.req = this.http.req;
+  var test = this;
+  this.http.end(function(err) {
+    test.req = test.http.req;
+    test.res = test.http.res;
+    delete test.url;
+    cb();
+  });
 }