Merge branch '2.3_branch'

This brings the master branch up to date with the 2.3 release branch

features/step_definitions/context_steps.rb

@@ -54,6 +54,7 @@ When /^I edit the context name in place to be "([^\"]*)"$/ do |new_context_name|
   page.find("span#context_name").click
   fill_in "value", :with => new_context_name
   click_button "Ok"
+  wait_for_ajax
 end
 
 Then /^I should see the context name is "([^\"]*)"$/ do |context_name|

features/step_definitions/project_list_steps.rb

@@ -123,13 +123,13 @@ end
 Then /^the project "([^"]*)" should have (\d+) actions listed$/ do |project_name, count|
   project = @current_user.projects.where(:name => project_name).first
   expect(project).to_not be_nil
-  xpath = "//div[@id='list-active-projects-container']//div[@id='project_#{project.id}']//span[@class='needsreview']"
+  xpath = "//div[@id='list-active-projects-container']//div[@id='project_#{project.id}']"
   expect(page.find(:xpath, xpath).text).to eq("#{project.name} (#{count} actions)")
 end
 
 Then /^the project "([^"]*)" should have (\d+) deferred actions listed$/ do |project_name, deferred|
   project = @current_user.projects.where(:name => project_name).first
   expect(project).to_not be_nil
-  xpath = "//div[@id='list-active-projects-container']//div[@id='project_#{project.id}']//span[@class='needsreview']"
+  xpath = "//div[@id='list-active-projects-container']//div[@id='project_#{project.id}']"
   expect(page.find(:xpath, xpath).text).to eq("#{project.name} (#{deferred} deferred actions)")
 end

features/step_definitions/todo_steps.rb

@@ -119,6 +119,11 @@ Then /^the project field of the new todo form should contain "([^"]*)"$/ do |pro
   expect(page.find(:xpath, xpath).value).to eq(project_name)
 end
 
+Then /^the context field of the new todo form should contain "([^"]*)"$/ do |context_name|
+  xpath= "//form[@id='todo-form-new-action']/input[@id='todo_context_name']"
+  expect(page.find(:xpath, xpath).value).to eq(context_name)
+end
+
 Then /^the default context of the new todo form should be "([^"]*)"$/ do |context_name|
   xpath= "//form[@id='todo-form-new-action']/input[@id='todo_context_name']"
   expect(context_name).to eq(page.find(:xpath, xpath).value)