From c66bd9d6d8de7999a4e393fb2fca4c0bd222e97e Mon Sep 17 00:00:00 2001 From: Dennis Collinson Date: Thu, 17 May 2012 15:32:20 -0700 Subject: [PATCH] fix posting with services, fix cuke --- app/assets/javascripts/app/models/status_message.js | 9 ++------- features/step_definitions/trumpeter_steps.rb | 2 +- 2 files changed, 3 insertions(+), 8 deletions(-) diff --git a/app/assets/javascripts/app/models/status_message.js b/app/assets/javascripts/app/models/status_message.js index d1af3f03e..07f8f2f53 100644 --- a/app/assets/javascripts/app/models/status_message.js +++ b/app/assets/javascripts/app/models/status_message.js @@ -11,14 +11,9 @@ app.models.StatusMessage = app.models.Post.extend({ toJSON : function(){ return { 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"), - services : mungeServices(this.get("services")) - } - - function mungeServices (values) { - if(!values) { return; } - return values.length > 1 ? values : [values] + services : this.get("services") } } }); diff --git a/features/step_definitions/trumpeter_steps.rb b/features/step_definitions/trumpeter_steps.rb index badebb462..f981e91ec 100644 --- a/features/step_definitions/trumpeter_steps.rb +++ b/features/step_definitions/trumpeter_steps.rb @@ -22,7 +22,7 @@ end def select_from_dropdown(option_text, dropdown) dropdown.click within ".dropdown-menu" do - link = find("a:contains('#{option_text}')") + link = find("input[value=['#{option_text}']") link.should be_visible link.click end