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

Disable Mentions in trumpeter to fix cukechange assertion of mood

Browse source
This commit is contained in:
Dennis Collinson 2012-03-29 12:16:21 -07:00
parent 79a09dbea6
commit 6488cd004b
3 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
app/assets/javascripts/app/forms/post_form.js
View file

@ -9,7 +9,8 @@ app.forms.Post = app.forms.Base.extend({
}, },
formAttrs : { formAttrs : {
"textarea#text_with_markup" : "text", // "textarea#text_with_markup" : "text", //fix mentions
"textarea.text" : "text",
"input.aspect_ids" : "aspect_ids", "input.aspect_ids" : "aspect_ids",
"input.service:checked" : "services" "input.service:checked" : "services"
}, },

4
features/step_definitions/trumpeter_steps.rb
View file

@ -25,8 +25,8 @@ def finalize_frame
click_button "done" click_button "done"
end end
def assert_post_renders_with(template_name) def assert_post_renders_with(mood)
find(".post")["data-template"].should == template_name.downcase find(".post.#{mood.downcase}").should be_present
end end
def find_image_by_filename(filename) def find_image_by_filename(filename)

2
features/trumpeter.feature
View file

@ -29,7 +29,7 @@ Feature: Creating a new post
And I mention "alice@alice.alice" And I mention "alice@alice.alice"
And I go through the default composer And I go through the default composer
And I go to "/stream" And I go to "/stream"
Then I follow "Alice Smith" Then the first post should mention "Alice Smith"
Scenario: Uploading multiple photos Scenario: Uploading multiple photos
When I write "check out these pictures" When I write "check out these pictures"