aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPetteri Räty <petsku@petteriraty.eu>2011-07-05 13:15:05 +0300
committerPetteri Räty <petsku@petteriraty.eu>2011-07-05 13:15:05 +0300
commit2cc900875d83e616a53638dfad2a80d5565c3471 (patch)
treedfc5d8192e69c16cb1cc4e244dd4f52a6b44fb30 /site/features/step_definitions
parentApplication receives meeting log from IRC bot (diff)
parentDisplay buttons on Agenda item view page in cleaner way (diff)
downloadcouncil-webapp-2cc900875d83e616a53638dfad2a80d5565c3471.tar.gz
council-webapp-2cc900875d83e616a53638dfad2a80d5565c3471.tar.bz2
council-webapp-2cc900875d83e616a53638dfad2a80d5565c3471.zip
Merge remote-tracking branch 'github/bugfix'
Diffstat (limited to 'site/features/step_definitions')
-rw-r--r--site/features/step_definitions/agenda_item_steps.rb12
-rw-r--r--site/features/step_definitions/within_steps.rb2
2 files changed, 13 insertions, 1 deletions
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',