Fix #1567 and add tests to cover getChildView taking a model #1619
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| @@ -231,6 +231,9 @@ Marionette.CollectionView = Marionette.View.extend({ | |||
| // Retrieve the childView class, either from `this.options.childView` | |||
| // or from the `childView` in the object definition. The "options" | |||
| // takes precedence. | |||
| // This method receives the model that will be passed to the instance | |||
There was a problem hiding this comment.
need to wrap childView in for docco
cmaher
changed the title
| @@ -141,6 +142,12 @@ describe('collection view', function() { | |||
| it('should trigger "childview:render" for each item in the collection', function() { | |||
| expect(this.childViewRender.callCount).to.equal(2); | |||
| }); | |||
|
|
|||
| it('should call "getChildView" for each item in the collection', function() { | |||
| expect(this.collectionView.getChildView).to.have.been.calledTwice; | |||
There was a problem hiding this comment.
+ expect(this.collectionView.getChildView).to.have.been.calledTwice.and.calledWith(this.collection.models[0], this.collection.models[1])
- expect(this.collectionView.getChildView).to.have.been.calledTwice;
- expect(this.collectionView.getChildView).to.have.been.calledWith(this.collection.models[0]);
- expect(this.collectionView.getChildView).to.have.been.calledWith(this.collection.models[1]);There was a problem hiding this comment.
the docs are a bit vague but this might work...
There was a problem hiding this comment.
Nope, but this does
expect(this.collectionView.getChildView).to.have.been.calledTwice.
and.calledWith(this.collection.models[0]).
and.calledWith(this.collection.models[1]);
| @@ -1024,10 +1031,12 @@ describe('collection view', function() { | |||
|
|
|||
| describe('when returning the view from addChild', function() { | |||
| beforeEach(function() { | |||
| this.model = new Backbone.Model({foo: 'bar'}); | |||
| this.model = new Backbone.Model({foo: 'bar', view: this.ChildView }); | |||
There was a problem hiding this comment.
instead of changing the existing test we should add another one.
There was a problem hiding this comment.
since getChildView is going to be called either way, should I just write an assertion for that instead?
Nevermind, ignore me.
There was a problem hiding this comment.
This seems weird to add it to the model though. Would this not be better:
- function(model) {
- return model.get('view');
- }
+ sinon.stub().returns(this.view);
There was a problem hiding this comment.
yeah, not sure I like adding the view to the model
|
👍 |
samccone
added a commit
that referenced
this pull request
Jul 14, 2014
Fix #1567 and add tests to cover getChildView taking a model
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
fixes #1567