Merge pull request #2782 from strongloop/backport/compat_flag_cleanup

Update tests to use registry for model creation [2.x]

example/colors/app.js

@@ -14,9 +14,9 @@ var schema = {
   name: String
 };
 
-var Color = app.model('color', schema);
+app.dataSource('db', { connector: 'memory' });
-
+var Color = app.registry.createModel('color', schema);
-app.dataSource('db', {adapter: 'memory'}).attach(Color);
+app.model(Color, { dataSource: 'db' });
 
 Color.create({name: 'red'});
 Color.create({name: 'green'});

example/replication/app.js

@@ -5,9 +5,11 @@
 
 var loopback = require('../../');
 var app = loopback();
-var db = app.dataSource('db', {connector: loopback.Memory});
+var db = app.dataSource('db', { connector: 'memory' });
-var Color = app.model('color', {dataSource: 'db', options: {trackChanges: true}});
+var Color = app.registry.createModel('color', {}, { trackChanges: true });
-var Color2 = app.model('color2', {dataSource: 'db', options: {trackChanges: true}});
+app.model(Color, { dataSource: 'db' });
+var Color2 = app.registry.createModel('color2', {}, { trackChanges: true });
+app.model(Color2, { dataSource: 'db' });
 var target = Color2;
 var source = Color;
 var SPEED = process.env.SPEED || 100;

test/acl.test.js

@@ -363,19 +363,17 @@ describe('security ACLs', function() {
 });
 
 describe('access check', function() {
-  var app;
-  before(function() {
-    app = loopback();
-    app.use(loopback.rest());
-    app.enableAuth();
-    app.dataSource('test', {connector: 'memory'});
-  });
-
   it('should occur before other remote hooks', function(done) {
-    var MyTestModel = app.model('MyTestModel', {base: 'PersistedModel', dataSource: 'test'});
+    var app = loopback();
+    var MyTestModel = app.registry.createModel('MyTestModel');
     var checkAccessCalled = false;
     var beforeHookCalled = false;
 
+    app.use(loopback.rest());
+    app.enableAuth();
+    app.dataSource('test', { connector: 'memory' });
+    app.model(MyTestModel, { dataSource: 'test' });
+
     // fake / spy on the checkAccess method
     MyTestModel.checkAccess = function() {
       var cb = arguments[arguments.length - 1];

test/app.test.js

@@ -617,11 +617,11 @@ describe('app', function() {
   });
 
   describe('app.model(Model)', function() {
-    var app;
+    var app, db, MyTestModel;
-    var db;
     beforeEach(function() {
       app = loopback();
-      db = loopback.createDataSource({connector: loopback.Memory});
+      db = loopback.createDataSource({ connector: loopback.Memory });
+      MyTestModel = app.registry.createModel('MyTestModel', {}, {base: 'Model'});
     });
 
     it('Expose a `Model` to remote clients', function() {
@@ -632,8 +632,8 @@ describe('app', function() {
       expect(app.models()).to.eql([Color]);
     });
 
-    it('uses singlar name as app.remoteObjects() key', function() {
+    it('uses singular name as app.remoteObjects() key', function() {
-      var Color = PersistedModel.extend('color', {name: String});
+      var Color = PersistedModel.extend('color', { name: String });
       app.model(Color);
       Color.attachTo(db);
       expect(app.remoteObjects()).to.eql({ color: Color });
@@ -695,18 +695,22 @@ describe('app', function() {
       });
     });
 
-    it('accepts null dataSource', function() {
+    it('accepts null dataSource', function(done) {
-      app.model('MyTestModel', { dataSource: null });
+      app.model(MyTestModel, { dataSource: null });
+      expect(MyTestModel.dataSource).to.eql(null);
+      done();
     });
 
-    it('accepts false dataSource', function() {
+    it('accepts false dataSource', function(done) {
-      app.model('MyTestModel', { dataSource: false });
+      app.model(MyTestModel, { dataSource: false });
+      expect(MyTestModel.getDataSource()).to.eql(null);
+      done();
     });
 
-    it('should not require dataSource', function() {
+    it('does not require dataSource', function(done) {
-      app.model('MyTestModel', {});
+      app.model(MyTestModel);
+      done();
     });
-
   });
 
   describe('app.model(name, config)', function() {
@@ -767,7 +771,6 @@ describe('app', function() {
       expect(app.models.foo.app).to.equal(app);
       expect(app.models.foo.shared).to.equal(true);
     });
-
   });
 
   describe('app.model(ModelCtor, config)', function() {
@@ -780,7 +783,8 @@ describe('app', function() {
       }
 
       assert(!previousModel || !previousModel.dataSource);
-      app.model('TestModel', { dataSource: 'db' });
+      var TestModel = app.registry.createModel('TestModel');
+      app.model(TestModel, { dataSource: 'db' });
       expect(app.models.TestModel.dataSource).to.equal(app.dataSources.db);
     });
   });
@@ -788,7 +792,8 @@ describe('app', function() {
   describe('app.models', function() {
     it('is unique per app instance', function() {
       app.dataSource('db', { connector: 'memory' });
-      var Color = app.model('Color', { dataSource: 'db' });
+      var Color = app.registry.createModel('Color');
+      app.model(Color, { dataSource: 'db' });
       expect(app.models.Color).to.equal(Color);
       var anotherApp = loopback();
       expect(anotherApp.models.Color).to.equal(undefined);

test/change-stream.test.js

@@ -7,9 +7,10 @@ describe('PersistedModel.createChangeStream()', function() {
   describe('configured to source changes locally', function() {
     before(function() {
       var test = this;
-      var app = loopback({localRegistry: true});
+      var app = loopback({ localRegistry: true });
-      var ds = app.dataSource('ds', {connector: 'memory'});
+      var ds = app.dataSource('ds', { connector: 'memory' });
-      this.Score = app.model('Score', {
+      var Score = app.registry.createModel('Score');
+      this.Score = app.model(Score, {
         dataSource: 'ds',
         changeDataSource: false // use only local observers
       });

test/integration.test.js

@@ -41,7 +41,8 @@ describe('loopback application', function() {
       loopback.ACL.attachTo(db);
       loopback.User.hasMany(loopback.AccessToken, { as: 'accessTokens' });
 
-      var Streamer = app.model('Streamer', { dataSource: 'db' });
+      var Streamer = app.registry.createModel('Streamer');
+      app.model(Streamer, { dataSource: 'db' });
       Streamer.read = function(req, res, cb) {
         var body = new Buffer(0);
         req.on('data', function(chunk) {

test/registries.test.js

@@ -16,15 +16,17 @@ describe('Registry', function() {
       var dsFoo = appFoo.dataSource('dsFoo', {connector: 'memory'});
       var dsBar = appFoo.dataSource('dsBar', {connector: 'memory'});
 
-      var FooModel = appFoo.model(modelName, settings);
+      var FooModel = appFoo.registry.createModel(modelName, {}, settings);
-      var FooSubModel = appFoo.model(subModelName, settings);
+      appFoo.model(FooModel, { dataSource: dsFoo });
-      var BarModel = appBar.model(modelName, settings);
-      var BarSubModel = appBar.model(subModelName, settings);
 
-      FooModel.attachTo(dsFoo);
+      var FooSubModel = appFoo.registry.createModel(subModelName, {}, settings);
-      FooSubModel.attachTo(dsFoo);
+      appFoo.model(FooSubModel, { dataSource: dsFoo });
-      BarModel.attachTo(dsBar);
+
-      BarSubModel.attachTo(dsBar);
+      var BarModel = appBar.registry.createModel(modelName, {}, settings);
+      appBar.model(BarModel, { dataSource: dsBar });
+
+      var BarSubModel = appBar.registry.createModel(subModelName, {}, settings);
+      appBar.model(BarSubModel, { dataSource: dsBar });
 
       FooModel.hasMany(FooSubModel);
       BarModel.hasMany(BarSubModel);

test/relations.integration.js

@@ -41,24 +41,14 @@ describe('relations - integration', function() {
   describe('polymorphicHasMany', function() {
 
     before(function defineProductAndCategoryModels() {
-      var Team = app.model(
+      var Team = app.registry.createModel('Team', { name: 'string' });
-        'Team',
+      var Reader = app.registry.createModel('Reader', { name: 'string' });
-        { properties: { name: 'string' },
+      var Picture = app.registry.createModel('Picture',
-          dataSource: 'db'
+        { name: 'string', imageableId: 'number', imageableType: 'string' });
-        }
+
-      );
+      app.model(Team, { dataSource: 'db' });
-      var Reader = app.model(
+      app.model(Reader, { dataSource: 'db' });
-        'Reader',
+      app.model(Picture, { dataSource: 'db' });
-        { properties: { name: 'string' },
-          dataSource: 'db'
-        }
-      );
-      var Picture = app.model(
-        'Picture',
-        { properties: { name: 'string', imageableId: 'number', imageableType: 'string'},
-          dataSource: 'db'
-        }
-      );
 
       Reader.hasMany(Picture, { polymorphic: { // alternative syntax
         as: 'imageable', // if not set, default to: reference
@@ -684,15 +674,17 @@ describe('relations - integration', function() {
 
   describe('hasAndBelongsToMany', function() {
     beforeEach(function defineProductAndCategoryModels() {
-      var product = app.model(
+      var product = app.registry.createModel(
          'product',
-        { properties: { id: 'string', name: 'string' }, dataSource: 'db' }
+         { id: 'string', name: 'string' }
-
       );
-      var category = app.model(
+      var category = app.registry.createModel(
         'category',
-        { properties: { id: 'string', name: 'string' }, dataSource: 'db' }
+        { id: 'string', name: 'string' }
       );
+      app.model(product, { dataSource: 'db' });
+      app.model(category, { dataSource: 'db' });
+
       product.hasAndBelongsToMany(category);
       category.hasAndBelongsToMany(product);
     });
@@ -807,17 +799,18 @@ describe('relations - integration', function() {
   describe('embedsOne', function() {
 
     before(function defineGroupAndPosterModels() {
-      var group = app.model(
+      var group = app.registry.createModel('group',
-        'group',
+        { name: 'string' },
-        { properties: { name: 'string' },
+        { plural: 'groups' }
-          dataSource: 'db',
-          plural: 'groups'
-        }
       );
-      var poster = app.model(
+      app.model(group, { dataSource: 'db' });
+
+      var poster = app.registry.createModel(
         'poster',
-        { properties: { url: 'string' }, dataSource: 'db' }
+        { url: 'string' }
       );
+      app.model(poster, { dataSource: 'db' });
+
       group.embedsOne(poster, { as: 'cover' });
     });
 
@@ -924,17 +917,18 @@ describe('relations - integration', function() {
   describe('embedsMany', function() {
 
     before(function defineProductAndCategoryModels() {
-      var todoList = app.model(
+      var todoList = app.registry.createModel(
         'todoList',
-        { properties: { name: 'string' },
+        { name: 'string' },
-          dataSource: 'db',
+        { plural: 'todo-lists' }
-          plural: 'todo-lists'
-        }
       );
-      var todoItem = app.model(
+      app.model(todoList, { dataSource: 'db' });
+
+      var todoItem = app.registry.createModel(
         'todoItem',
-        { properties: { content: 'string' }, dataSource: 'db' }
+        { content: 'string' }, { forceId: false }
       );
+      app.model(todoItem, { dataSource: 'db' });
       todoList.embedsMany(todoItem, { as: 'items' });
     });
 
@@ -1112,18 +1106,24 @@ describe('relations - integration', function() {
   describe('referencesMany', function() {
 
     before(function defineProductAndCategoryModels() {
-      var recipe = app.model(
+      var recipe = app.registry.createModel(
         'recipe',
-        { properties: { name: 'string' }, dataSource: 'db' }
+        { name: 'string' }
       );
-      var ingredient = app.model(
+      app.model(recipe, { dataSource: 'db' });
+
+      var ingredient = app.registry.createModel(
         'ingredient',
-        { properties: { name: 'string' }, dataSource: 'db' }
+       { name: 'string' }
       );
-      var photo = app.model(
+      app.model(ingredient, { dataSource: 'db' });
+
+      var photo = app.registry.createModel(
         'photo',
-        { properties: { name: 'string' }, dataSource: 'db' }
+        { name: 'string' }
       );
+      app.model(photo, { dataSource: 'db' });
+
       recipe.referencesMany(ingredient);
       // contrived example for test:
       recipe.hasOne(photo, { as: 'picture', options: {
@@ -1460,31 +1460,41 @@ describe('relations - integration', function() {
   describe('nested relations', function() {
 
     before(function defineModels() {
-      var Book = app.model(
+      var Book = app.registry.createModel(
         'Book',
-        { properties: { name: 'string' }, dataSource: 'db',
+        { name: 'string' },
-        plural: 'books' }
+        { plural: 'books' }
       );
-      var Page = app.model(
+      app.model(Book, { dataSource: 'db' });
+
+      var Page = app.registry.createModel(
         'Page',
-        { properties: { name: 'string' }, dataSource: 'db',
+        { name: 'string' },
-        plural: 'pages' }
+        { plural: 'pages' }
       );
-      var Image = app.model(
+      app.model(Page, { dataSource: 'db' });
+
+      var Image = app.registry.createModel(
         'Image',
-        { properties: { name: 'string' }, dataSource: 'db',
+        { name: 'string' },
-        plural: 'images' }
+        { plural: 'images' }
       );
-      var Note = app.model(
+      app.model(Image, { dataSource: 'db' });
+
+      var Note = app.registry.createModel(
         'Note',
-        { properties: { text: 'string' }, dataSource: 'db',
+        { text: 'string' },
-        plural: 'notes' }
+        { plural: 'notes' }
       );
-      var Chapter = app.model(
+      app.model(Note, { dataSource: 'db' });
+
+      var Chapter = app.registry.createModel(
         'Chapter',
-        { properties: { name: 'string' }, dataSource: 'db',
+        { name: 'string' },
-          plural: 'chapters' }
+        { plural: 'chapters' }
       );
+      app.model(Chapter, { dataSource: 'db' });
+
       Book.hasMany(Page);
       Book.hasMany(Chapter);
       Page.hasMany(Note);

test/remoting-coercion.test.js

@@ -12,7 +12,12 @@ describe('remoting coercion', function() {
     var app = loopback();
     app.use(loopback.rest());
 
-    var TestModel = app.model('TestModel', {base: 'Model', dataSource: null, public: true});
+    var TestModel = app.registry.createModel('TestModel',
+      {},
+      { base: 'Model' }
+    );
+    app.model(TestModel, { public: true });
+
     TestModel.test = function(inst, cb) {
       called = true;
       assert(inst instanceof TestModel);