upgrade vendored rails to 2.3.14

This commit is contained in:
Reinier Balt 2011-08-17 09:55:36 +02:00
parent 2db1640695
commit fe1f67a8cf
28 changed files with 97 additions and 29 deletions

View file

@ -62,11 +62,26 @@ Feature: Manage recurring todos
Then the pattern "I'm done" should be in the state list "active"
And the state list "completed" should be empty
@selenium @wip
Scenario: Following the recurring todo link of a todo takes me to the recurring todos page
Given this is a pending scenario
When I go to the home page
Then I should see the todo "run tests"
When I follow the recurring todo link of "run tests"
Then I should be on the repeating todos page
@selenium @wip
Scenario: Deleting a recurring todo with ending pattern will show message
Given this is a pending scenario
When I go to the repeating todos page
And I mark the pattern "run tests" as complete
And I go to the home page
Then I should see "run tests"
When I delete the action "run tests"
Then I should see "@@message@@"
@selenium @wip
Scenario: Deleting a recurring todo with active pattern will show new todo
Given this is a pending scenario
When I go to the home page
Then I should see "run tests"
When I delete the action "run tests"
Then I should see "@@message@@"
And I should see "run tests" in the context container for "test context"

View file

@ -84,6 +84,14 @@ When /^I mark the pattern "([^"]*)" as active$/ do |pattern_name|
wait_for_ajax
end
When /^I follow the recurring todo link of "([^"]*)"$/ do |action_description|
todo = @current_user.todos.find_by_description(action_description)
todo.should_not be_nil
recurring_todo_link = "div.todo_#{todo.id} div a.recurring_icon"
click_link recurring_todo_link
end
Then /^the state list "([^"]*)" should be empty$/ do |state|
empty_id = "recurring-todos-empty-nd" if state.downcase == "active"
empty_id = "completed-empty-nd" if state.downcase == "completed"