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

fix posting with services, fix cuke

Browse source
This commit is contained in:
Dennis Collinson 2012-05-17 15:32:20 -07:00
parent 00f1adc8b2
commit c66bd9d6d8
2 changed files with 3 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
app/assets/javascripts/app/models/status_message.js
View file

@ -11,14 +11,9 @@ app.models.StatusMessage = app.models.Post.extend({
toJSON : function(){ toJSON : function(){
return { return {
status_message : _.clone(this.attributes), status_message : _.clone(this.attributes),
aspect_ids : this.get("aspect_ids") && this.get("aspect_ids").split(","), aspect_ids : this.get("aspect_ids"),
photos : this.photos && this.photos.pluck("id"), photos : this.photos && this.photos.pluck("id"),
services : mungeServices(this.get("services")) services : this.get("services")
}
function mungeServices (values) {
if(!values) { return; }
return values.length > 1 ? values : [values]
} }
} }
}); });

2
features/step_definitions/trumpeter_steps.rb
View file

@ -22,7 +22,7 @@ end
def select_from_dropdown(option_text, dropdown) def select_from_dropdown(option_text, dropdown)
dropdown.click dropdown.click
within ".dropdown-menu" do within ".dropdown-menu" do
link = find("a:contains('#{option_text}')") link = find("input[value=['#{option_text}']")
link.should be_visible link.should be_visible
link.click link.click
end end