diff --git a/doc/CHANGELOG b/doc/CHANGELOG index b71ceb9c..f571653c 100644 --- a/doc/CHANGELOG +++ b/doc/CHANGELOG @@ -28,7 +28,7 @@ New features: 3. You can star an action right from the form to add a new action Under the hood: -1. Upgraded rails to 2.3.12, jquery to 1.6.1 and jquery-ui to 1.8.13 +1. Upgraded rails to 2.3.12, jquery to 1.6.2 and jquery-ui to 1.8.14 2. fixed several issues with the REST API 3. upgraded the act_as_statemachine plugin. This change requires a migration, see note above! diff --git a/features/recurring_todos.feature b/features/recurring_todos.feature index 9369510e..e541cb7f 100644 --- a/features/recurring_todos.feature +++ b/features/recurring_todos.feature @@ -62,26 +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 + @selenium Scenario: Following the recurring todo link of a todo takes me to the recurring todos page 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 + @selenium Scenario: Deleting a recurring todo with ending pattern will show message 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@@" + Then I should see "There is no next action after the recurring action you just deleted. The recurrence is completed" - @selenium @wip + @selenium Scenario: Deleting a recurring todo with active pattern will show new todo 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@@" + Then I should see "Action was deleted. Because this action is recurring, a new action was added" And I should see "run tests" in the context container for "test context" \ No newline at end of file diff --git a/features/step_definitions/recurring_todo_steps.rb b/features/step_definitions/recurring_todo_steps.rb index eb68e0c1..a4156078 100644 --- a/features/step_definitions/recurring_todo_steps.rb +++ b/features/step_definitions/recurring_todo_steps.rb @@ -88,8 +88,9 @@ 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 + recurring_todo_link = "xpath=//div[@id='todo_#{todo.id}']//a[@class='recurring_icon']/img" + selenium.click( recurring_todo_link ) + selenium.wait_for_page_to_load(5000) end Then /^the state list "([^"]*)" should be empty$/ do |state|