migrate preferences, project_* and recurring todo features

features/step_definitions/recurring_todo_steps.rb

@@ -22,19 +22,19 @@ Given /^I have a repeat pattern called "([^"]*)"$/ do |pattern_name|
 end
 
 Given /^I have a completed repeat pattern "([^"]*)"$/ do |pattern_name|
-  Given "I have a repeat pattern called \"#{pattern_name}\""
+  step "I have a repeat pattern called \"#{pattern_name}\""
   @recurring_todo.toggle_completion!
   @recurring_todo.completed?.should be_true
 end
 
 Given /^I have (\d+) completed repeat patterns$/ do |number_of_patterns|
   1.upto number_of_patterns.to_i do |i|
-    Given "I have a completed repeat pattern \"Repeating Todo #{i}\""
+    step "I have a completed repeat pattern \"Repeating Todo #{i}\""
   end
 end
 
 When /^I select "([^\"]*)" recurrence pattern$/ do |recurrence_period|
-  selenium.click("recurring_todo_recurring_period_#{recurrence_period.downcase}")
+  page.find("#recurring_todo_recurring_period_#{recurrence_period.downcase}").click
 end
 
 When /^I edit the name of the pattern "([^\"]*)" to "([^\"]*)"$/ do |pattern_name, new_name|
@@ -45,75 +45,69 @@ When /^I edit the name of the pattern "([^\"]*)" to "([^\"]*)"$/ do |pattern_nam
   wait_for_ajax
 
   fill_in "edit_recurring_todo_description", :with => new_name
-  selenium.click "recurring_todo_edit_update_button"
+  page.find("button#recurring_todo_edit_update_button").click
 
-  wait_for do
-    !selenium.is_visible("edit-recurring-todo")
-  end
+  page.should_not have_css("div#edit-recurring-todo", :visible => true)
 end
 
 When /^I star the pattern "([^\"]*)"$/ do |pattern_name|
   pattern = @current_user.recurring_todos.find_by_description(pattern_name)
   pattern.should_not be_nil
   click_link "star_icon_#{pattern.id}"
-  wait_for_ajax
 end
 
 When /^I delete the pattern "([^"]*)"$/ do |pattern_name|
   pattern = @current_user.recurring_todos.find_by_description(pattern_name)
   pattern.should_not be_nil
-  click_link "delete_icon_#{pattern.id}"
-  selenium.get_confirmation.should == "Are you sure that you want to delete the recurring action '#{pattern_name}'?"
-  wait_for do
-    !selenium.is_element_present("delete_icon_#{pattern.id}")
+  
+  handle_js_confirm do
+    click_link "delete_icon_#{pattern.id}"
   end
+  get_confirm_text.should == "Are you sure that you want to delete the recurring action '#{pattern_name}'?"
+  
+  page.should_not have_css("#delete_icon_#{pattern.id}")
 end
 
 When /^I mark the pattern "([^"]*)" as complete$/ do |pattern_name|
   pattern = @current_user.recurring_todos.find_by_description(pattern_name)
   pattern.should_not be_nil
   pattern.completed?.should be_false
-  selenium.click "check_#{pattern.id}"
-  wait_for_ajax
+  page.find("#check_#{pattern.id}").click
 end
 
 When /^I mark the pattern "([^"]*)" as active$/ do |pattern_name|
   pattern = @current_user.recurring_todos.find_by_description(pattern_name)
   pattern.should_not be_nil
   pattern.completed?.should be_true
-  selenium.click "check_#{pattern.id}"
-  wait_for_ajax
+  page.find("#check_#{pattern.id}").click
 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 = "xpath=//div[@id='todo_#{todo.id}']//a[@class='recurring_icon']/img"
-  selenium.click( recurring_todo_link )
-  selenium.wait_for_page_to_load(5000)
+  page.find(:xpath, "//div[@id='todo_#{todo.id}']//a[@class='recurring_icon']/img").click
 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"
-  selenium.is_visible( empty_id )
+  empty_msg = page.find("div##{empty_id}")
+  empty_msg.visible?.should be_true
 end
 
 Then /^the pattern "([^\"]*)" should be starred$/ do |pattern_name|
   pattern = @current_user.recurring_todos.find_by_description(pattern_name)
   pattern.should_not be_nil
-  xpath = "//div[@id='recurring_todo_#{pattern.id}']//img[@class='todo_star starred']"
-  response.should have_xpath(xpath)
+  page.should have_xpath("//div[@id='recurring_todo_#{pattern.id}']//img[@class='todo_star starred']")
 end
 
 Then /^I should see the form for "([^\"]*)" recurrence pattern$/ do |recurrence_period|
-  selenium.is_visible("recurring_#{recurrence_period.downcase}")
+  page.should have_css("#recurring_#{recurrence_period.downcase}", :visible => true)
 end
 
 Then /^the pattern "([^"]*)" should be in the state list "([^"]*)"$/ do |pattern_name, state_name|
   pattern = @current_user.recurring_todos.find_by_description(pattern_name)
   pattern.should_not be_nil
-  xpath = "//div[@id='#{state_name}_recurring_todos_container']//div[@id='recurring_todo_#{pattern.id}']"
-  response.should have_xpath(xpath)
+  page.should have_xpath("//div[@id='#{state_name}_recurring_todos_container']//div[@id='recurring_todo_#{pattern.id}']")
 end