Merge pull request #391 from saponifi3d/parseOptions-fix

bug fix for backbone overriding the creation of a model

Author: saponifi3d

shared/base/view.js

@@ -29,7 +29,8 @@ module.exports = BaseView = Backbone.View.extend({
 
     this.name = this.name || this.app.modelUtils.underscorize(this.constructor.id || this.constructor.name);
 
-    Backbone.View.apply(this, arguments);
+    // parseOptions deals w/ models and collections, but the BaseView will override those changes
+    Backbone.View.call(this, _.omit(options, ['model', 'collection']));
 
     if (this.postInitialize) {
       console.warn('`postInitialize` is deprecated, please use `initialize`');

test/shared/base/view.test.js

@@ -1,5 +1,6 @@
 var should = require('chai').should(),
     sinon = require('sinon'),
+    _ = require('underscore'),
     BaseModel = require('../../../shared/base/model'),
     BaseCollection = require('../../../shared/base/collection'),
     BaseView = require('../../../shared/base/view'),
@@ -37,6 +38,37 @@ describe('BaseView', function() {
     childViews.should.have.length(2);
   });
 
+  describe('constructor', function() {
+    var spy, data, view;
+
+    beforeEach(function() {
+      spy = sinon.spy(Backbone, 'View');
+      data = { app: this.app, el: '#test' };
+    });
+
+    afterEach(function() {
+      Backbone.View.restore();
+    })
+
+    it('does not pass the model if it is set', function() {
+      data.model = 'a'
+      view = new BaseView(data)
+
+      spy.should.have.been.called
+      spy.should.have.been.calledWith(_.omit(data, 'model'))
+      view.model.should.equal(data.model)
+    });
+
+    it('does not pass the collection if it is set', function() {
+      data.collection = 'a'
+      view = new BaseView(data)
+
+      spy.should.have.been.called
+      spy.should.have.been.calledWith(_.omit(data, 'collection'))
+      view.collection.should.equal(data.collection)
+    });
+  });
+
   describe('getTemplate', function() {
     beforeEach(function() {
       this.app = {