Andreas/tracks
1
0
Fork 0
mirror of https://github.com/TracksApp/tracks.git synced 2026-01-10 03:08:50 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

fix failing scenario for calendar

Browse source
This commit is contained in:
Reinier Balt 2011-04-01 21:50:00 +02:00
parent 83e1e36d73
commit 8efd90b93d
3 changed files with 11 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

5
app/views/contexts/_context_state_group.rhtml
View file

@ -1,5 +1,8 @@
<div class="list-stategroup-contexts-container" id="list-<%= state %>-contexts-container">
<h2><span id="<%= state %>-contexts-count" class="badge"><%= context_state_group.length %></span><%= t("states."+ state +"_plural")%> <%= t('common.contexts') %></h2>
<h2>
<span id="<%= state %>-contexts-count" class="badge"><%= context_state_group.length %></span>
<%= t("states."+ state +"_plural")%> <%= t('common.contexts') %>
</h2>
<div id="<%= state%>-contexts-empty-nd" style="<%= no_contexts ? 'display:block' : 'display:none'%>">
<div class="message"><p><%= t('contexts.no_contexts_' + state) %></p></div>
</div>

8
features/calendar.feature
View file

@ -10,7 +10,7 @@ Feature: Show all due actions in a calendar view
And I have logged in as "testuser" with password "secret"
And I have a context called "@calendar"
@selenium
@selenium
Scenario: Setting due date of a todo will show it in the calendar
When I submit a new action with description "a new next action" in the context "@calendar"
And I go to the calendar page
@ -22,7 +22,7 @@ Feature: Show all due actions in a calendar view
Then the badge should show 1
And I should see "a new next action"
@selenium
@selenium
Scenario: Clearing the due date of a todo will remove it from the calendar
When I go to the home page
And I submit a new action with description "a new next action" in the context "@calendar"
@ -32,7 +32,7 @@ Feature: Show all due actions in a calendar view
When I clear the due date of "a new next action"
Then I should not see "a new next action"
@selenium
@selenium
Scenario: Marking a todo complete will remove it from the calendar
Given I have a todo "a new next action" in the context "@calendar" which is due tomorrow
When I go to the calendar page
@ -54,4 +54,4 @@ Feature: Show all due actions in a calendar view
When I go to the calendar page
Then I should see "a new next action"
When I edit the due date of "a new next action" to next month
Then I should see "a new next action" in the due next month container
Then I should see "a new next action" in the due next month container

6
features/step_definitions/todo_steps.rb
View file

@ -294,10 +294,10 @@ Then /^I should see "([^"]*)" in the due next month container$/ do |todo_descrip
todo = @current_user.todos.find_by_description(todo_description)
todo.should_not be_nil
xpath = "xpath=//div[@id='due_after_this_month']//div[@id='line_todo_#{todo.id}']"
xpath = "//div[@id='due_after_this_month']//div[@id='line_todo_#{todo.id}']"
wait_for :timeout => 5 do
!selenium.is_element_present(xpath)
selenium.is_element_present(xpath)
end
end
@ -309,4 +309,4 @@ end
Then /^the selected context should be "([^"]*)"$/ do |content|
# Works for mobile. TODO: make it work for both mobile and non-mobile
field_labeled("Context").element.search(".//option[@selected = 'selected']").inner_html.should =~ /#{content}/
end
end