[gentoo-commits] proj/council-webapp:master commit in: site/config/locales/, site/features/support/, site/features/step_definitions/, ...

[Petteri Räty]

commit:     f7550a6ec6ff11874fbe3730c677225a86839251
Author:     Joachim Filip Ignacy Bartosik <jbartosik <AT> gmail <DOT> com>
AuthorDate: Mon Jul 11 13:17:32 2011 +0000
Commit:     Petteri Räty <betelgeuse <AT> gentoo <DOT> org>
CommitDate: Wed Jul 13 15:39:28 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/council-webapp.git;a=commit;h=f7550a6e

Show hint on timelimits format (on AgendaItem edit page)

---
 site/config/locales/app.en.yml                     |   23 +++----------------
 site/features/agenda_items.feature                 |    9 +++++++
 .../features/step_definitions/agenda_item_steps.rb |    5 ++++
 site/features/support/paths.rb                     |    3 ++
 4 files changed, 21 insertions(+), 19 deletions(-)

diff --git a/site/config/locales/app.en.yml b/site/config/locales/app.en.yml
index 26256ec..ecf802b 100644
--- a/site/config/locales/app.en.yml
+++ b/site/config/locales/app.en.yml
@@ -4,22 +4,7 @@
 en:
   hello: "Hello world"
 
-#  attributes:
-#    created_at: Created at
-#    updated_at: Updated at
-#
-#  activerecord:
-#    models:
-#      user:
-#        one: User
-#        other: Users
-#    attributes:
-#      user:
-#        name: Name
-#        password: Password
-#        current_password: Current Password
-#        password_confirmation: Password Confirmation
-#        email_address: Email Address
-#    attribute_help:
-#      user:
-#        email_address: We will never share your address with third parties
+  activerecord:
+    attribute_help:
+      agenda_item:
+        timelimits: "Enter reminders for this item. Each line should be a separate reminder in 'mm:ss <reminder message>' format"

diff --git a/site/features/agenda_items.feature b/site/features/agenda_items.feature
index 2507e2d..5a6dad7 100644
--- a/site/features/agenda_items.feature
+++ b/site/features/agenda_items.feature
@@ -58,3 +58,12 @@ Feature: Suggest Agenda Items
   Scenario: View discussion times
     Given some agenda item with discussion times
     Then I should see discussion times when viewing agenda items
+
+  Scenario: Show view hint on timelimits format
+    Given I am logged in as a council member
+    When I follow "Suggest agenda item"
+    Then I should see hint on timelimits format
+
+    Given example agenda item
+    When I am on newest agenda item edit page
+    Then I should see hint on timelimits format

diff --git a/site/features/step_definitions/agenda_item_steps.rb b/site/features/step_definitions/agenda_item_steps.rb
index b600bad..4b18f7b 100644
--- a/site/features/step_definitions/agenda_item_steps.rb
+++ b/site/features/step_definitions/agenda_item_steps.rb
@@ -52,3 +52,8 @@ Then /^I should see discussion times when viewing agenda items$/ do
     Then "I should see \"#{item.discussion_time}\""
   end
 end
+
+Then /^I should see hint on timelimits format$/ do
+  Then 'I should see "Enter reminders for this item. Each line should be a ' +
+        'separate reminder in \'mm:ss <reminder message>\' format" within ".input-help"'
+end

diff --git a/site/features/support/paths.rb b/site/features/support/paths.rb
index 92e736e..8bd2f36 100644
--- a/site/features/support/paths.rb
+++ b/site/features/support/paths.rb
@@ -41,6 +41,9 @@ module NavigationHelpers
     when /newest agenda item page/
       agenda_item_path(AgendaItem.last)
 
+    when /newest agenda item edit page/
+      edit_agenda_item_path(AgendaItem.last)
+
     # Add more mappings here.
     # Here is an example that pulls values out of the Regexp:
     #