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

fix all but 2 jasmine specs

Browse source
This commit is contained in:
danielgrippi 2012-02-21 11:46:04 -08:00
parent ebcde41e69
commit b1cbd0f4a9
3 changed files with 6 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -15,6 +15,8 @@
{{/if}} {{/if}}
<div class="collapsible"> <div class="collapsible">
{{{text}}} <p>
{{{text}}}
</p>
{{{o_embed_html}}} {{{o_embed_html}}}
</div> </div>

4
public/javascripts/app/views/feedback_view.js
View file

@ -14,10 +14,6 @@ app.views.Feedback = app.views.Base.extend({
this.model.bind('feedback', this.render, this); this.model.bind('feedback', this.render, this);
}, },
postRenderTemplate : function(){
console.log('fuck')
},
presenter : function() { presenter : function() {
return _.extend(this.defaultPresenter(), { return _.extend(this.defaultPresenter(), {
userCanReshare : this.userCanReshare() userCanReshare : this.userCanReshare()

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

@ -29,9 +29,7 @@ describe("app.views.Stream", function() {
describe("#render", function() { describe("#render", function() {
beforeEach(function() { beforeEach(function() {
this.statusMessage = this.stream.posts.models[0]; this.statusMessage = this.stream.posts.models[0];
this.reshare = this.stream.posts.models[1]; this.statusElement = $(this.view.$(".stream_element")[0]);
this.statusElement = $(this.view.$("#" + this.statusMessage.get("guid")));
this.reshareElement = $(this.view.$("#" + this.reshare.get("guid")));
}); });
context("when rendering a status message", function() { context("when rendering a status message", function() {
@ -46,7 +44,7 @@ describe("app.views.Stream", function() {
beforeEach(function() { beforeEach(function() {
this.statusMessage = this.stream.posts.models[0]; this.statusMessage = this.stream.posts.models[0];
this.statusElement = $(this.view.$("#" + this.statusMessage.get("guid"))); this.statusElement = $(this.view.$(".stream_element")[0]);
readMoreLink = this.statusElement.find('.read-more a'); readMoreLink = this.statusElement.find('.read-more a');
readMoreLink.text("read more"); readMoreLink.text("read more");
}); });
@ -91,7 +89,7 @@ describe("app.views.Stream", function() {
it('collapses li elements on webkit/IE but leaves them alone on firefox', function() { it('collapses li elements on webkit/IE but leaves them alone on firefox', function() {
this.statusMessage = this.stream.posts.models[3]; this.statusMessage = this.stream.posts.models[3];
this.statusElement = $(this.view.$("#" + this.statusMessage.get("guid"))); this.statusElement = $(this.view.$(".stream_element")[3]);
readMoreLink = this.statusElement.find('.read-more a'); readMoreLink = this.statusElement.find('.read-more a');
readMoreLink.text("read more"); readMoreLink.text("read more");