nocebo/diaspora
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'release/0.7.0.0' into next-minor

Browse source
This commit is contained in:
Benjamin Neff 2017-08-17 03:36:38 +02:00
commit 685135474b
No known key found for this signature in database
GPG key ID: 971464C3F1A90194
3 changed files with 11 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
app/assets/javascripts/app/views/content_view.js
View file

@ -17,15 +17,14 @@ app.views.Content = app.views.Base.extend({
largePhoto : function() { largePhoto : function() {
var photos = this.model.get("photos"); var photos = this.model.get("photos");
if(!photos || photos.length === 0) { return } if (!photos || photos.length === 0) { return false; }
return photos[0]; return photos[0];
}, },
smallPhotos : function() { smallPhotos : function() {
var photos = this.model.get("photos"); var photos = this.model.get("photos");
if(!photos || photos.length < 2) { return } if (!photos || photos.length < 2) { return false; }
photos.splice(0, 1); // remove first photo as it is already shown as largePhoto return photos.slice(1); // remove first photo as it is already shown as largePhoto
return photos;
}, },
expandPost: function(evt) { expandPost: function(evt) {

8
spec/javascripts/app/views/content_view_spec.js
View file

@ -4,11 +4,17 @@ describe("app.views.Content", function(){
this.view = new app.views.Content({model : this.post}); this.view = new app.views.Content({model : this.post});
}); });
describe("rendering", function(){ describe("smallPhotos", function() {
it("should return all but the first photo from the post", function() { it("should return all but the first photo from the post", function() {
this.post.set({photos : [1,2]}); // set 2 Photos this.post.set({photos : [1,2]}); // set 2 Photos
expect(this.view.smallPhotos().length).toEqual(1); expect(this.view.smallPhotos().length).toEqual(1);
}); });
it("shouldn't change the photos array", function() {
this.post.set({photos: [1, 2]}); // set 2 Photos
this.view.smallPhotos();
expect(this.post.get("photos").length).toEqual(2);
});
}); });
describe("presenter", function(){ describe("presenter", function(){

2
spec/models/notifications/mentioned_spec.rb
View file

@ -14,7 +14,7 @@ describe Notifications::Mentioned do
it "calls filter_mentions on self" do it "calls filter_mentions on self" do
expect(TestNotification).to receive(:filter_mentions).with( expect(TestNotification).to receive(:filter_mentions).with(
Mention.where(mentions_container: status_message, person: [alice, bob].map(&:person)), match_array(Mention.where(mentions_container: status_message, person: [alice, bob].map(&:person))),
status_message, status_message,
[alice.id, bob.id] [alice.id, bob.id]
).and_return([]) ).and_return([])