Factor out LoopBack dep to removing coupling on the exact loopback instance.

Author: ritch

lib/helpers.js

@@ -56,7 +56,7 @@ _beforeEach.withArgs = function() {
 }
 
 _beforeEach.givenModel = function(modelName, attrs, optionalHandler) {
-  var modelKey = modelName
+  var modelKey = modelName;
 
   if(typeof attrs === 'funciton') {
     optionalHandler = attrs;
@@ -69,18 +69,13 @@ _beforeEach.givenModel = function(modelName, attrs, optionalHandler) {
 
   attrs = attrs || {};
 
-  var model = loopback.getModel(modelName);
-
-  assert(model, 'cannot get model of name ' + modelName);
-
   beforeEach(function(done) {
     var test = this;
-
-    if(!model.dataSource) {
-      model.attachTo(this.dataSource);
-    }
-
-    assert(model.dataSource, modelName + ' is not attached to a dataSource');
+    var app = this.app;
+    var model = app.models[modelName];
+    assert(model, 'cannot get model of name ' + modelName + ' from app.models');
+    assert(model.dataSource, 'cannot test model '+ modelName
+      + ' without attached dataSource');
     assert(
       typeof model.create === 'function',
       modelName + ' does not have a create method'

test/test.js

@@ -23,8 +23,7 @@ describe('helpers', function () {
   describe('helpers.describe', function() {
     ['staticMethod',
      'whenLoggedInAsUser',
-     'whenCalledAnonymously',
-     'model']
+     'whenCalledAnonymously']
     .forEach(function(func) {
       it('should have a method named ' + func, function () {
         assert.equal(typeof helpers.describe[func], 'function');
@@ -44,10 +43,10 @@ describe('helpers', function () {
   });
 
   describe('helpers.beforeEach.givenModel', function() {
-    helpers.beforeEach.givenModel('AccessToken');
-    it('should have an AccessToken property', function () {
-      assert(this.AccessToken);
-      assert(this.AccessToken.id);
+    helpers.beforeEach.givenModel('xxx-test-model');
+    it('should have an xxx-test-model property', function () {
+      assert(this['xxx-test-model']);
+      assert(this['xxx-test-model'].id);
     });
   });