clean up cucumber scenarios and add a few more

features/step_definitions/todo_edit_steps.rb

@@ -1,3 +1,86 @@
+####### MARK (UN)COMPLETE #######
+
+When /^I mark "([^"]*)" as complete$/ do |action_description|
+  todo = @current_user.todos.find_by_description(action_description)
+  todo.should_not be_nil
+
+  check "mark_complete_#{todo.id}"
+
+  todo_container = "fail"  # fail this test if @source_view is wrong
+  todo_container = "p#{todo.project_id}items" if @source_view=="project"
+  todo_container = "c#{todo.context_id}items" if @source_view=="context" || @source_view=="todos" || @source_view=="tag"
+
+  # container should be there
+  selenium.is_element_present("//div[@id='#{todo_container}']").should be_true
+
+  wait_for :timeout => 5 do
+    !selenium.is_element_present("//div[@id='#{todo_container}']//div[@id='line_todo_#{todo.id}']")
+  end
+end
+
+When /^I mark "([^"]*)" as uncompleted$/ do |action_description|
+  todo = @current_user.todos.find_by_description(action_description)
+  todo.should_not be_nil
+
+  check "mark_complete_#{todo.id}"
+
+  todo_container = "fail"  # fail this test if @source_view is wrong
+  todo_container = "p#{todo.project_id}items" if @source_view=="project"
+  todo_container = "c#{todo.context_id}items" if @source_view=="context" || @source_view=="todos" || @source_view=="tag"
+
+  todo_container.should_not == "fail" unless @source_view=="done"
+
+  unless @source_view=="done"
+    wait_for :timeout => 5 do
+      selenium.is_element_present("//div[@id='#{todo_container}']//div[@id='line_todo_#{todo.id}']")
+    end
+  else
+    wait_for_ajax
+  end
+end
+
+When /^I mark the complete todo "([^"]*)" active$/ do |action_description|
+  When "I mark \"#{action_description}\" as uncompleted"
+end
+
+####### (UN)STARRING #######
+
+When /^I star the action "([^"]*)"$/ do |action_description|
+  todo = @current_user.todos.find_by_description(action_description)
+  todo.should_not be_nil
+
+  xpath_unstarred = "//div[@id='line_todo_#{todo.id}']//img[@class='todo_star']"
+  xpath_starred = "//div[@id='line_todo_#{todo.id}']//img[@class='todo_star starred']"
+
+  selenium.is_element_present(xpath_unstarred).should be_true
+
+  star_img = "//img[@id='star_img_#{todo.id}']"
+  selenium.click(star_img, :wait_for => :ajax, :javascript_framework => :jquery)
+
+  wait_for :timeout => 5 do
+    selenium.is_element_present(xpath_starred)
+  end
+end
+
+When /^I unstar the action "([^"]*)"$/ do |action_description|
+  todo = @current_user.todos.find_by_description(action_description)
+  todo.should_not be_nil
+
+  xpath_unstarred = "//div[@id='line_todo_#{todo.id}']//img[@class='todo_star']"
+  xpath_starred = "//div[@id='line_todo_#{todo.id}']//img[@class='todo_star starred']"
+
+  selenium.is_element_present(xpath_starred).should be_true
+
+  star_img = "//img[@id='star_img_#{todo.id}']"
+  selenium.click(star_img, :wait_for => :ajax, :javascript_framework => :jquery)
+
+  wait_for :timeout => 5 do
+    selenium.is_element_present(xpath_unstarred)
+  end
+end
+
+####### Editing a todo using Edit Form #######
+
 When /I change the (.*) field of "([^\"]*)" to "([^\"]*)"$/ do |field_name, todo_name, new_value|
   todo = @current_user.todos.find_by_description(todo_name)
   todo.should_not be_nil
@@ -32,19 +115,29 @@ When /^I try to edit the description of "([^"]*)" to "([^"]*)"$/ do |action_desc
   # do not wait for form to disappear to be able to test failures
 end
 
-When /^I edit the due date of "([^"]*)" to tomorrow$/ do |action_description|
+When /^I edit the due date of "([^"]*)" to "([^"]*)"$/ do |action_description, date|
   todo = @current_user.todos.find_by_description(action_description)
   todo.should_not be_nil
   open_edit_form_for(todo)
-  fill_in "due_todo_#{todo.id}", :with => format_date(todo.created_at + 1.day)
+  fill_in "due_todo_#{todo.id}", :with => date
   submit_edit_todo_form(todo)
 end
 
+When /^I edit the due date of "([^"]*)" to tomorrow$/ do |action_description|
+  date = format_date(todo.created_at + 1.day)
+  When "I edit the due date of \"#{action_description}\" to \"#{date}\""
+end
+
 When /^I edit the due date of "([^"]*)" to next month$/ do  |action_description|
+  date = format_date(todo.created_at + 1.month)
+  When "I edit the due date of \"#{action_description}\" to \"#{date}\""
+end
+
+When /^I clear the due date of "([^"]*)"$/ do |action_description|
   todo = @current_user.todos.find_by_description(action_description)
   todo.should_not be_nil
   open_edit_form_for(todo)
-  fill_in "due_todo_#{todo.id}", :with => format_date(todo.created_at + 1.month)
+  selenium.click("//div[@id='edit_todo_#{todo.id}']//a[@id='due_x_todo_#{todo.id}']/img", :wait_for => :ajax, :javascript_framework => :jquery)
   submit_edit_todo_form(todo)
 end
 
@@ -56,14 +149,6 @@ When /^I edit the show from date of "([^"]*)" to next month$/ do  |action_descri
   submit_edit_todo_form(todo)
 end
 
-When /^I clear the due date of "([^"]*)"$/ do |action_description|
-  todo = @current_user.todos.find_by_description(action_description)
-  todo.should_not be_nil
-  open_edit_form_for(todo)
-  selenium.click("//div[@id='edit_todo_#{todo.id}']//a[@id='due_x_todo_#{todo.id}']/img", :wait_for => :ajax, :javascript_framework => :jquery)
-  submit_edit_todo_form(todo)
-end
-
 When /^I remove the show from date from "([^"]*)"$/ do |action_description|
   todo = @current_user.todos.find_by_description(action_description)
   todo.should_not be_nil
@@ -74,15 +159,6 @@ When /^I remove the show from date from "([^"]*)"$/ do |action_description|
   submit_edit_todo_form(todo)
 end
 
-When /^I edit the tags of "([^"]*)" to "([^"]*)"$/ do |action_description, tags|
-  todo = @current_user.todos.find_by_description(action_description)
-  todo.should_not be_nil
-
-  open_edit_form_for(todo)
-  fill_in "tag_list", :with => tags
-  submit_edit_todo_form(todo)
-end
-
 When /^I defer "([^"]*)" for 1 day$/ do |action_description|
   todo = @current_user.todos.find_by_description(action_description)
   todo.should_not be_nil
@@ -93,6 +169,15 @@ When /^I defer "([^"]*)" for 1 day$/ do |action_description|
   wait_for_ajax
 end
 
+When /^I edit the tags of "([^"]*)" to "([^"]*)"$/ do |action_description, tags|
+  todo = @current_user.todos.find_by_description(action_description)
+  todo.should_not be_nil
+
+  open_edit_form_for(todo)
+  fill_in "tag_list", :with => tags
+  submit_edit_todo_form(todo)
+end
+
 When /^I make a project of "([^"]*)"$/ do |action_description|
   todo = @current_user.todos.find_by_description(action_description)
   todo.should_not be_nil
@@ -105,9 +190,11 @@ When /^I make a project of "([^"]*)"$/ do |action_description|
   end
 end
 
+####### THEN #######
+
 Then /^I should see an error message$/ do
   error_block = "xpath=//form/div[@id='edit_error_status']"
   wait_for :timeout => 5 do
     selenium.is_element_present(error_block)
   end
-end
+end