Merge branch 'release/0.2.1' into production

Author: Miroslav Bajtoš

lib/helpers.js

@@ -156,7 +156,7 @@ _describe.whenCalledRemotely = function(verb, url, data, cb) {
   describe(verb.toUpperCase() + ' ' + urlStr, function() {
     beforeEach(function(cb) {
       if(typeof url === 'function') {
-        url = url.call(this);
+        this.url = url.call(this);
       }
       this.remotely = true;
       this.verb = verb.toUpperCase();

package.json

@@ -1,6 +1,6 @@
 {
   "name": "loopback-testing",
-  "version": "0.2.0",
+  "version": "0.2.1",
   "description": "Utilities for testing LoopBack applications",
   "main": "index.js",
   "scripts": {
@@ -17,6 +17,10 @@
     "chai": "~1.9.0",
     "loopback": "^1.6.1"
   },
+  "repository": {
+    "type": "git",
+    "url": "https://github.com/strongloop/loopback-testing"
+  },
   "license": {
     "name": "Dual MIT/StrongLoop",
     "url": "https://github.com/strongloop/loopback-testing/blob/master/LICENSE"

test/test.js

@@ -12,7 +12,14 @@ describe('helpers', function () {
 
   describe('helpers.it', function() {
     ['shouldBeAllowed',
-     'shouldBeDenied']
+     'shouldBeDenied',
+     'shouldNotBeFound',
+     'shouldBeAllowedWhenCalledAnonymously',
+     'shouldBeDeniedWhenCalledAnonymously',
+     'shouldBeAllowedWhenCalledUnauthenticated',
+     'shouldBeDeniedWhenCalledUnauthenticated',
+     'shouldBeAllowedWhenCalledByUser',
+     'shouldBeDeniedWhenCalledByUser']
     .forEach(function(func) {
       it('should have a method named ' + func, function () {
         assert.equal(typeof helpers.it[func], 'function');
@@ -22,8 +29,11 @@ describe('helpers', function () {
 
   describe('helpers.describe', function() {
     ['staticMethod',
+     'instanceMethod',
      'whenLoggedInAsUser',
-     'whenCalledAnonymously']
+     'whenCalledByUser',
+     'whenCalledAnonymously',
+     'whenCalledUnauthenticated']
     .forEach(function(func) {
       it('should have a method named ' + func, function () {
         assert.equal(typeof helpers.describe[func], 'function');
@@ -34,7 +44,10 @@ describe('helpers', function () {
   describe('helpers.beforeEach', function() {
     ['withArgs',
      'givenModel',
-     'givenUser']
+     'givenUser',
+     'givenLoggedInUser',
+     'givenAnUnauthenticatedToken',
+     'givenAnAnonymousToken']
     .forEach(function(func) {
       it('should have a helper method named ' + func, function () {
         assert.equal(typeof helpers.beforeEach[func], 'function');
@@ -59,5 +72,18 @@ describe('helpers', function () {
         });
       });
     });
+    helpers.describe.staticMethod('findById', function() {
+      helpers.beforeEach.givenModel('xxx-test-model', {foo: 'bar'});
+      helpers.describe.whenCalledRemotely('GET', function () {
+        return '/xxx-test-models/' + this['xxx-test-model'].id;
+      }, function() {
+        it('should retrieve the expected model in the first test', function () {
+          assert.equal(this.res.body.id, this['xxx-test-model'].id);
+        });
+        it('should retrieve the expected model in subsequent tests', function () {
+          assert.equal(this.res.body.id, this['xxx-test-model'].id);
+        });
+      });
+    });
   });
 });