github/diaspora
1
1
Fork 0
mirror of https://github.com/diaspora/diaspora.git synced 2026-04-29 03:01:03 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #4916 from hpetru/validate-poll-answer

Browse Source 
I added the validation to poll question and poll answer

Conflicts:
	app/assets/javascripts/app/views/publisher_view.js
This commit is contained in:
Jonne Haß
2014-05-24 17:42:18 +02:00
parent cbd9c56a7a 57de031f6b
commit 9537c45d2a
11 changed files with 118 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
features/desktop/post_preview.feature
View File

@@ -73,7 +73,6 @@ Feature: preview posts in the stream
When I fill in the following:
| status_message_fake_text | I am eating yogurt |
And I press the element "#poll_creator"
And I press the element ".add-answer .button.creation"
When I fill in the following:
| status_message_fake_text | I am eating yogurt |
| poll_question | What kind of yogurt do you like? |

21
features/desktop/post_with_a_poll.feature
View File

@@ -24,7 +24,7 @@ Feature: posting with a poll
When I expand the publisher
And I press the element "#poll_creator"
And I press the element ".add-answer .button.creation"
Then I should see 2 options
Then I should see 3 options
Scenario: delete an option
Given "#publisher-poll-creator" is hidden
@@ -32,7 +32,7 @@ Feature: posting with a poll
And I press the element "#poll_creator"
And I press the element ".add-answer .button.creation"
And I delete the last option
Then I should see 1 option
Then I should see 2 option
And I should not see a remove icon
Scenario: post with an attached poll
@@ -41,7 +41,6 @@ Feature: posting with a poll
When I fill in the following:
| status_message_fake_text | I am eating yogurt |
| poll_question | What kind of yogurt do you like? |
And I press the element ".add-answer .button.creation"
And I fill in the following for the options:
| normal |
| not normal |
@@ -52,7 +51,6 @@ Feature: posting with a poll
Scenario: vote for an option
Given I expand the publisher
And I press the element "#poll_creator"
And I press the element ".add-answer .button.creation"
When I fill in the following:
| status_message_fake_text | I am eating yogurt |
| poll_question | What kind of yogurt do you like? |
@@ -70,7 +68,6 @@ Feature: posting with a poll
Scenario: click to show result
Given I expand the publisher
And I press the element "#poll_creator"
And I press the element ".add-answer .button.creation"
When I fill in the following:
| status_message_fake_text | I am eating yogurt |
| poll_question | What kind of yogurt do you like? |
@@ -78,6 +75,18 @@ Feature: posting with a poll
| normal |
| not normal |
And I press "Share"
And I press the element ".toggle_result"
Then I should see an element ".percentage"
Scenario: validate answer input
Given I expand the publisher
And I press the element "#poll_creator"
When I fill in the following:
| status_message_fake_text | I am eating yogurt |
| poll_question | What kind of yogurt do you like? |
And I fill in the following for the options:
| normal |
| |
And I press the element "#publisher-poll-creator"
And I press the element "input[type=submit]"
Then I should see an element ".poll-answer.error"