start modifying done view and do some refactoring

test/functional/projects_controller_test.rb

@@ -24,7 +24,7 @@ class ProjectsControllerTest < TodoContainerControllerTestBase
     assert_not_nil assigns['deferred']
     assert_equal 1, assigns['deferred'].size
 
-    t = p.not_done_todos[0]
+    t = p.todos.not_completed[0]
     t.show_from = 1.days.from_now.utc
     t.save!
     

test/unit/context_test.rb

@@ -99,14 +99,6 @@ class ContextTest < ActiveSupport::TestCase
     assert_equal true, @agenda.hidden?
   end
 
-  def test_summary
-    undone_todo_count = '5 actions'
-    assert_equal "<p>#{undone_todo_count}. Context is Active.</p>", @agenda.summary(undone_todo_count)
-    @agenda.hide = true
-    @agenda.save!
-    assert_equal "<p>#{undone_todo_count}. Context is Hidden.</p>", @agenda.summary(undone_todo_count)
-  end
-
   def test_null_object
     c = Context.null_object
     assert c.nil?

test/unit/project_test.rb

@@ -100,27 +100,27 @@ class ProjectTest < ActiveSupport::TestCase
   end
   
   def test_not_done_todos
-    assert_equal 2, @timemachine.not_done_todos.size
-    t = @timemachine.not_done_todos[0]
+    assert_equal 3, @timemachine.todos.not_completed.size
+    t = @timemachine.todos.not_completed[0]
     t.complete!
     t.save!
-    assert_equal 1, Project.find(@timemachine.id).not_done_todos.size
+    assert_equal 2, Project.find(@timemachine.id).todos.not_completed.size
   end
   
   def test_done_todos
-    assert_equal 0, @timemachine.done_todos.size
-    t = @timemachine.not_done_todos[0]
+    assert_equal 0, @timemachine.todos.completed.size
+    t = @timemachine.todos.not_completed[0]
     t.complete!
     t.save!
-    assert_equal 1, Project.find(@timemachine.id).done_todos.size
+    assert_equal 1, Project.find(@timemachine.id).todos.completed.size
   end
   
   def test_deferred_todos
-    assert_equal 1, @timemachine.deferred_todos.size
-    t = @timemachine.not_done_todos[0]
+    assert_equal 1, @timemachine.todos.deferred.size
+    t = @timemachine.todos.not_completed[0]
     t.show_from = 1.days.from_now.utc
     t.save!
-    assert_equal 2, Project.find(@timemachine.id).deferred_todos.size
+    assert_equal 2, Project.find(@timemachine.id).todos.deferred.size
   end
     
   def test_to_param_returns_id
@@ -157,25 +157,28 @@ class ProjectTest < ActiveSupport::TestCase
   end
 
   def test_deferred_todo_count
-    assert_equal 1, @timemachine.deferred_todos.count
-    assert_equal 0, @moremoney.deferred_todos.count
-    @moremoney.todos[0].show_from = next_week
+    assert_equal 1, @timemachine.todos.deferred.count
+    assert_equal 0, @moremoney.todos.deferred.count
+    
+    first_todo = @moremoney.todos[0]
+    first_todo.show_from = next_week
     assert_equal :deferred, @moremoney.todos[0].aasm_current_state
-    assert_equal 1, @moremoney.deferred_todos.count
+    
+    assert_equal 1, @moremoney.todos.deferred.count
   end
 
   def test_done_todo_count
-    assert_equal 0, @timemachine.done_todos.count
-    assert_equal 0, @moremoney.done_todos.count
+    assert_equal 0, @timemachine.todos.completed.count
+    assert_equal 0, @moremoney.todos.completed.count
     @moremoney.todos[0].complete!
-    assert_equal 1, @moremoney.done_todos.count
+    assert_equal 1, @moremoney.todos.completed.count
   end
 
   def test_not_done_todo_count
-    assert_equal 2, @timemachine.not_done_todos.count
-    assert_equal 4, @moremoney.not_done_todos.count
+    assert_equal 3, @timemachine.todos.not_completed.count
+    assert_equal 4, @moremoney.todos.not_completed.count
     @moremoney.todos[0].complete!
-    assert_equal 3, @moremoney.not_done_todos.count
+    assert_equal 3, @moremoney.todos.not_completed.count
   end
   
   def test_default_context_name

test/views/context_helper_test.rb

@@ -0,0 +1,7 @@
+  def test_summary
+    undone_todo_count = '5 actions'
+    assert_equal "<p>#{undone_todo_count}. Context is Active.</p>", @agenda.summary(undone_todo_count)
+    @agenda.hide = true
+    @agenda.save!
+    assert_equal "<p>#{undone_todo_count}. Context is Hidden.</p>", @agenda.summary(undone_todo_count)
+  end

test/views/todos_helper_test.rb

@@ -1,6 +1,6 @@
 require File.dirname(__FILE__) + '/../test_helper'
 
-class TodosHelperTest < Test::Rails::HelperTestCase
+class TodosHelperTest < ActiveSupport::HelperTestCase
   fixtures :users
 
   def setup