aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoachim Filip Ignacy Bartosik <jbartosik@gmail.com>2011-06-29 13:50:13 +0200
committerJoachim Filip Ignacy Bartosik <jbartosik@gmail.com>2011-07-05 11:58:12 +0200
commitae943141a998fcfae527cbea977f41967be347a2 (patch)
tree0421ce3024f464d56e946fd13922677fe2b80c1b /site/features
parentShow slacking status properly when there were no meetings yet. (diff)
downloadcouncil-webapp-ae943141a998fcfae527cbea977f41967be347a2.tar.gz
council-webapp-ae943141a998fcfae527cbea977f41967be347a2.tar.bz2
council-webapp-ae943141a998fcfae527cbea977f41967be347a2.zip
Display buttons on Agenda item view page in cleaner way
Diffstat (limited to 'site/features')
-rw-r--r--site/features/agenda_items.feature10
-rw-r--r--site/features/step_definitions/agenda_item_steps.rb12
-rw-r--r--site/features/step_definitions/within_steps.rb2
3 files changed, 23 insertions, 1 deletions
diff --git a/site/features/agenda_items.feature b/site/features/agenda_items.feature
index 114b8a4..18d301f 100644
--- a/site/features/agenda_items.feature
+++ b/site/features/agenda_items.feature
@@ -44,3 +44,13 @@ Feature: Suggest Agenda Items
When I am on newest agenda item page
Then I should not see "Add to current agenda" button
And I should not see "Reject" button
+
+ Scenario: Reject and Add to current agenda buttons displayed nicely
+ Given example agenda item
+ And an agenda
+ And I am logged in as a council member
+ When I am on the first suggested agenda page
+ Then I should see "Reject" button inside content body
+ And "Reject" button should be inline
+ And I should see "Add to current agenda" button inside content body
+ And "Add to current agenda" button should be inline
diff --git a/site/features/step_definitions/agenda_item_steps.rb b/site/features/step_definitions/agenda_item_steps.rb
index 22348e8..5bf5de2 100644
--- a/site/features/step_definitions/agenda_item_steps.rb
+++ b/site/features/step_definitions/agenda_item_steps.rb
@@ -27,3 +27,15 @@ Given /^agenda item in current agenda$/ do
Agenda.create!
AgendaItem.create! :agenda => Agenda.last, :title => 'Item in current agenda'
end
+
+Then /^I should see "([^"]*)" button inside content body$/ do |arg1|
+ within('.content-body') do
+ page.all(:xpath, "//input[@type='submit'][@value='#{arg1}']").should_not be_empty
+ end
+end
+
+Then /^"([^"]*)" button should be inline$/ do |arg1|
+ within('.one-button-form') do
+ page.all(:xpath, "//input[@type='submit'][@value='#{arg1}']").should_not be_empty
+ end
+end
diff --git a/site/features/step_definitions/within_steps.rb b/site/features/step_definitions/within_steps.rb
index 821eb61..a36a4af 100644
--- a/site/features/step_definitions/within_steps.rb
+++ b/site/features/step_definitions/within_steps.rb
@@ -2,9 +2,9 @@
'as current agenda' => '.current-agenda',
'as agenda state' => '.state-tag.view.agenda-state',
'as transition' => '.transition',
+ 'inside content body' => '.content-body',
'in the notices' => '.flash.notice',
'in the errors' => '.error-messages',
- 'in the content body' => '.content-body',
'in the agenda items' => '.agenda-items',
'in the agendas collection' => '.collection.agendas',
'as empty collection message' => '.empty-collection-message',