Merge branch 'master' of git://github.com/bsag/tracks

test/fixtures/recurring_todos.yml

@@ -1,3 +1,27 @@
+<%
+
+def today
+  Time.zone.now.beginning_of_day.to_s(:db)
+end
+
+def next_week
+  1.week.from_now.beginning_of_day.to_s(:db)
+end
+
+def last_week
+  1.week.ago.beginning_of_day.to_s(:db)
+end
+
+def two_weeks_ago
+  2.weeks.ago.beginning_of_day.to_s(:db)
+end
+
+def two_weeks_hence
+  2.weeks.from_now.beginning_of_day.to_s(:db)
+end
+
+%>
+
 1:
   id: 1
   user_id: 1

test/functional/data_controller_test.rb

@@ -18,4 +18,9 @@ class DataControllerTest < Test::Rails::TestCase
     login_as :admin_user
     get :csv_notes
   end
+
+  def test_yml_export_comleted_without_error
+    login_as :admin_user
+    get :yaml_export
+  end
 end

test/selenium/home/create_first_todo.rsel

@@ -5,4 +5,5 @@ assert_context_count_incremented do
   type "todo_description", "a new action"
   type "todo_context_name", "Brand new context"
   click "css=#todo-form-new-action .submit_box button"
-end
+  assert_confirmation "New context \"Brand new context\" will be also created. Are you sure?"
+end

test/selenium/home/create_new_todo_with_new_action_and_new_context.rsel

@@ -6,4 +6,5 @@ assert_context_count_incremented do
   type "todo_project_name", "pppp"
   type "todo_context_name", "cccc"
   click "css=#todo-form-new-action .submit_box button"
-end
+  assert_confirmation "New context \"cccc\" will be also created. Are you sure?"
+end

test/selenium/home/create_new_todo_with_new_context.rsel

@@ -5,4 +5,5 @@ assert_context_count_incremented do
   type "todo_description", "a new action"
   type "todo_context_name", "Brand new context"
   click "css=#todo-form-new-action .submit_box button"
-end
+  assert_confirmation "New context \"Brand new context\" will be also created. Are you sure?"
+end

test/selenium/tickler/create_deferred_todo_with_existing_context.rsel

@@ -7,6 +7,7 @@ assert_context_count_incremented do
   type "todo_project_name", "None"
   type "todo_show_from", "1/1/2030"
   click "css=#todo-form-new-action .submit_box button"
+  assert_confirmation "New context \"errands\" will be also created. Are you sure?"
 end
 wait_for_not_visible "tickler-empty-nd"
 wait_for_element_present "xpath=//div[@class='item-container'] //a[@title='01/01/2030']"

test/selenium/tickler/create_deferred_todo_with_new_context.rsel

@@ -6,4 +6,5 @@ assert_context_count_incremented do
   type "todo_context_name", "Brand new context"
   type "todo_show_from", "1/1/2030"
   click "css=#todo-form-new-action .submit_box button"
+  assert_confirmation "New context \"Brand new context\" will be also created. Are you sure?"
 end