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

MS; Fix fake following, as we took it out so I nuked the tests

Browse source
This commit is contained in:
danielgrippi 2012-05-22 19:04:04 -07:00
parent c6b8d75313
commit 120c6b46e0
2 changed files with 1 additions and 55 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
app/assets/javascripts/app/pages/profile.js
View file

@ -51,9 +51,7 @@ app.pages.Profile = app.views.Base.extend({
var bio = this.model.get("bio") || '' var bio = this.model.get("bio") || ''
return _.extend(this.defaultPresenter(), return _.extend(this.defaultPresenter(),
{text : this.model && app.helpers.textFormatter(bio, this.model), {text : this.model && app.helpers.textFormatter(bio, this.model) })
showFollowButton : this.showFollowButton()
})
}, },
pulsateNewPostControl : function() { pulsateNewPostControl : function() {
@ -115,13 +113,4 @@ app.pages.Profile = app.views.Base.extend({
if(!confirm("Are you sure you want to log out?")) if(!confirm("Are you sure you want to log out?"))
evt.preventDefault(); evt.preventDefault();
}, },
followingEnabled : function() {
var user = app.currentUser
return user.get("following_count") != 0 && user.get("diaspora_id") !== undefined
},
showFollowButton : function() {
return this.followingEnabled() && !this.model.get("is_own_profile")
}
}); });

43
spec/javascripts/app/pages/profile_spec.js
View file

@ -63,18 +63,6 @@ describe("app.pages.Profile", function(){
this.page.render() this.page.render()
expect(this.page.$("#profile-controls .control").length).toBe(2) expect(this.page.$("#profile-controls .control").length).toBe(2)
}) })
it("shows a follow button if showFollowButton returns true", function() {
spyOn(this.page, "showFollowButton").andReturn(true)
this.page.render()
expect(this.page.$("#follow-button").length).toBe(1)
})
it("doesn't show a follow button if showFollowButton returns false", function() {
spyOn(this.page, "showFollowButton").andReturn(false)
this.page.render()
expect(this.page.$("#follow-button").length).toBe(0)
})
}) })
context("clicking fav", function(){ context("clicking fav", function(){
@ -170,35 +158,4 @@ describe("app.pages.Profile", function(){
}) })
}) })
}); });
describe("followingEnabled", function(){
/* for legacy beta testers */
it("returns false if following_count is zero", function(){
loginAs({following_count : 0})
expect(this.page.followingEnabled()).toBeFalsy()
})
it("returns false if the user is not signed in", function(){
logout()
expect(this.page.followingEnabled()).toBeFalsy()
})
it("returns false if following_count is zero", function(){
loginAs({following_count : 1})
expect(this.page.followingEnabled()).toBeTruthy()
})
})
describe("followingEnabled", function(){
/* for legacy beta testers */
it("returns false if following_count is zero", function(){
app.currentUser.set({following_count : 0})
expect(this.page.followingEnabled()).toBeFalsy()
})
it("returns false if following_count is zero", function(){
app.currentUser.set({following_count : 1})
expect(this.page.followingEnabled()).toBeTruthy()
})
})
}); });