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

fix jasmine

Browse source
This commit is contained in:
danielgrippi 2012-02-09 18:21:51 -08:00 committed by Maxwell Salzberg
parent 89938bac6e
commit a1df9fe8db
6 changed files with 12 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
public/javascripts/app/templates/likes-info.handlebars
View file

@ -1,4 +1,4 @@
{{#if hasLikes}} {{#if likes_count}}
<div class="comment"> <div class="comment">
<div class="media"> <div class="media">
<span class="img"> <span class="img">
@ -7,7 +7,7 @@
<div class="bd"> <div class="bd">
{{#unless likes.length}} {{#unless likes.length}}
<a href="#" class="expand_likes"> <a href="#" class="expand_likes grey">
{{t "stream.likes" count=likes_count}} {{t "stream.likes" count=likes_count}}
</a> </a>

6
public/javascripts/app/templates/status-message.handlebars
View file

@ -14,5 +14,7 @@
{{/each}} {{/each}}
{{/if}} {{/if}}
{{{text}}} <div class="collapsible">
{{{o_embed_html}}} {{{text}}}
{{{o_embed_html}}}
</div>

2
public/javascripts/app/templates/stream-element.handlebars
View file

@ -54,7 +54,7 @@
</div> </div>
{{/if}} {{/if}}
<div class="post-content collapsible"> </div> <div class="post-content"> </div>
{{#if nsfw}} {{#if nsfw}}
</div> </div>

7
public/javascripts/app/views/likes_info_view.js
View file

@ -10,15 +10,10 @@ app.views.LikesInfo = app.views.StreamObject.extend({
presenter : function() { presenter : function() {
return _.extend(this.defaultPresenter(), { return _.extend(this.defaultPresenter(), {
likes : this.model.likes.models, likes : this.model.likes.models
hasLikes : this.hasLikes()
}) })
}, },
hasLikes : function() {
return this.model.likes.models.length > 0
},
showAvatars : function(evt){ showAvatars : function(evt){
if(evt) { evt.preventDefault() } if(evt) { evt.preventDefault() }
var self = this; var self = this;

5
spec/javascripts/app/views/likes_info_view_spec.js
View file

@ -17,10 +17,9 @@ describe("app.views.LikesInfo", function(){
describe(".render", function(){ describe(".render", function(){
it("displays a the like count if it is above zero", function() { it("displays a the like count if it is above zero", function() {
this.view.render(); this.view.render();
this.view.model.set({"likes_count" : 1})
console.log($(this.view.el)) expect($(this.view.el).find(".expand_likes").length).toBe(1)
expect($(this.view.el).text()).toContain(Diaspora.I18n.t('stream.pins', {count : this.view.model.get("likes_count")}))
}) })
it("does not display the like count if it is zero", function() { it("does not display the like count if it is zero", function() {

4
spec/javascripts/app/views/post_view_spec.js
View file

@ -22,14 +22,14 @@ describe("app.views.Post", function(){
this.statusMessage.set({reshares_count : 2}) this.statusMessage.set({reshares_count : 2})
var view = new app.views.Post({model : this.statusMessage}).render(); var view = new app.views.Post({model : this.statusMessage}).render();
expect(view.$(".post_initial_info").html()).toContain(Diaspora.I18n.t('stream.reshares', {count: 2})) expect($(view.el).html()).toContain(Diaspora.I18n.t('stream.reshares', {count: 2}))
}) })
it("does not display a reshare count for 'zero'", function(){ it("does not display a reshare count for 'zero'", function(){
this.statusMessage.set({reshares_count : 0}) this.statusMessage.set({reshares_count : 0})
var view = new app.views.Post({model : this.statusMessage}).render(); var view = new app.views.Post({model : this.statusMessage}).render();
expect(view.$(".post_initial_info").html()).not.toContain("0 Reshares") expect($(view.el).html()).not.toContain("0 Reshares")
}) })