From 2f8b454ac0222c321b8f6774ba927fede84ad60d Mon Sep 17 00:00:00 2001
From: Reinier Balt <lrbalt@gmail.com>
Date: Sun, 19 Apr 2009 00:18:12 +0200
Subject: [PATCH] fix some failing tests

---
 app/controllers/todos_controller.rb |  6 +++---
 app/models/project.rb               | 12 +++++++++++-
 app/views/contexts/index.text.erb   |  4 ++--
 test/unit/project_test.rb           | 18 +++++++++---------
 4 files changed, 25 insertions(+), 15 deletions(-)

diff --git a/app/controllers/todos_controller.rb b/app/controllers/todos_controller.rb
index f4a6e527..bf4eb9b6 100644
--- a/app/controllers/todos_controller.rb
+++ b/app/controllers/todos_controller.rb
@@ -269,7 +269,7 @@ class TodosController < ApplicationController
     if (@project_changed && !@original_item_project_id.nil?) then
       @todo.update_state_from_project
       @todo.save!
-      @remaining_undone_in_project = current_user.projects.find(@original_item_project_id).not_done_todo_count
+      @remaining_undone_in_project = current_user.projects.find(@original_item_project_id).not_done_todos.count
     end
     determine_down_count
     determine_deferred_tag_count(params['_tag_name']) if @source_view == 'tag'
@@ -699,11 +699,11 @@ class TodosController < ApplicationController
         @completed_count = Todo.count_by_sql(['SELECT COUNT(*) FROM todos, contexts WHERE todos.context_id = contexts.id and todos.user_id = ? and todos.state = ? and contexts.hide = ?', current_user.id, 'completed', false])
       end
       from.context do
-        @completed_count = current_user.contexts.find(@todo.context_id).done_todo_count
+        @completed_count = current_user.contexts.find(@todo.context_id).done_todos.count
       end
       from.project do
         unless @todo.project_id == nil
-          @completed_count = current_user.projects.find(@todo.project_id).done_todo_count
+          @completed_count = current_user.projects.find(@todo.project_id).done_todos.count
         end
       end
     end
diff --git a/app/models/project.rb b/app/models/project.rb
index 6458c7b3..b5dbd3c1 100644
--- a/app/models/project.rb
+++ b/app/models/project.rb
@@ -1,10 +1,20 @@
 class Project < ActiveRecord::Base
   has_many :todos, :dependent => :delete_all, :include => [:context,:tags]
+  has_many :not_done_todos,
+    :include => [:context,:tags,:project],
+    :class_name => 'Todo',
+    :order => "todos.due IS NULL, todos.due ASC, todos.created_at ASC",
+    :conditions => ["todos.state = ?", 'active']
   has_many :not_done_todos_including_hidden,
     :include => [:context,:tags,:project],
     :class_name => 'Todo',
     :order => "todos.due IS NULL, todos.due ASC, todos.created_at ASC",
     :conditions => ["(todos.state = ? OR todos.state = ?)", 'active', 'project_hidden']
+  has_many :done_todos,
+    :include => [:context,:tags,:project],
+    :class_name => 'Todo',
+    :order => "todos.due IS NULL, todos.due ASC, todos.created_at ASC",
+    :conditions => ["todos.state = ?", 'completed']
   has_many :deferred_todos,
     :include => [:context,:tags,:project],
     :class_name => 'Todo',
@@ -127,4 +137,4 @@ class NullProject
     nil
   end
     
-end
\ No newline at end of file
+end
diff --git a/app/views/contexts/index.text.erb b/app/views/contexts/index.text.erb
index b976258a..a88d10ac 100644
--- a/app/views/contexts/index.text.erb
+++ b/app/views/contexts/index.text.erb
@@ -1,5 +1,5 @@
-<% @contexts.each do |c| -%>
+<% current_user.contexts.each do |c| -%>
 
 <%= c.name.upcase %>
 <%= count_undone_todos_phrase_text(c)%>. Context is <%= c.hidden? ? "Hidden" : "Active" %>.
-<% end -%>
\ No newline at end of file
+<% end -%>
diff --git a/test/unit/project_test.rb b/test/unit/project_test.rb
index b654a96d..0e7ddde2 100644
--- a/test/unit/project_test.rb
+++ b/test/unit/project_test.rb
@@ -157,24 +157,24 @@ class ProjectTest < Test::Rails::TestCase
   end
 
   def test_deferred_todo_count
-    assert_equal 1, @timemachine.deferred_todo_count
-    assert_equal 0, @moremoney.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, @moremoney.deferred_todo_count
+    assert_equal 1, @moremoney.deferred_todos.count
   end
 
   def test_done_todo_count
-    assert_equal 0, @timemachine.done_todo_count
-    assert_equal 0, @moremoney.done_todo_count
+    assert_equal 0, @timemachine.done_todos.count
+    assert_equal 0, @moremoney.done_todos.count
     @moremoney.todos[0].complete!
-    assert_equal 1, @moremoney.done_todo_count
+    assert_equal 1, @moremoney.done_todos.count
   end
 
   def test_not_done_todo_count
-    assert_equal 2, @timemachine.not_done_todo_count
-    assert_equal 4, @moremoney.not_done_todo_count
+    assert_equal 2, @timemachine.not_done_todos.count
+    assert_equal 4, @moremoney.not_done_todos.count
     @moremoney.todos[0].complete!
-    assert_equal 3, @moremoney.not_done_todo_count
+    assert_equal 3, @moremoney.not_done_todos.count
   end
   
   def test_default_context_name