From 0e81706fee2e84350eb09aa6f047319d4d452b05 Mon Sep 17 00:00:00 2001
From: Reinier Balt <lrbalt@gmail.com>
Date: Tue, 9 Nov 2010 19:57:53 +0100
Subject: [PATCH] fix last functional and integration tests after merge and
 jquery changes

---
 app/controllers/contexts_controller.rb      | 9 ++++++---
 app/controllers/projects_controller.rb      | 8 ++++----
 app/views/contexts/index.text.erb           | 2 +-
 test/functional/projects_controller_test.rb | 7 -------
 4 files changed, 11 insertions(+), 15 deletions(-)

diff --git a/app/controllers/contexts_controller.rb b/app/controllers/contexts_controller.rb
index 025d7493..83a4c217 100644
--- a/app/controllers/contexts_controller.rb
+++ b/app/controllers/contexts_controller.rb
@@ -22,7 +22,10 @@ class ContextsController < ApplicationController
       format.xml  { render :xml => current_user.contexts.to_xml( :except => :user_id ) }
       format.rss  &render_contexts_rss_feed
       format.atom &render_contexts_atom_feed
-      format.text { render :action => 'index', :layout => false, :content_type => Mime::TEXT }
+      format.text do
+        @all_contexts = current_user.contexts.all
+        render :action => 'index', :layout => false, :content_type => Mime::TEXT
+      end
       format.autocomplete { render :text => for_autocomplete(@active_contexts + @hidden_contexts, params[:term])}
     end
   end
@@ -196,14 +199,14 @@ class ContextsController < ApplicationController
 
   def render_contexts_rss_feed
     lambda do
-      render_rss_feed_for current_user.contexts, :feed => feed_options,
+      render_rss_feed_for current_user.contexts.all, :feed => feed_options,
         :item => { :description => lambda { |c| c.summary(count_undone_todos_phrase(c)) } }
     end
   end
 
   def render_contexts_atom_feed
     lambda do
-      render_atom_feed_for current_user.contexts, :feed => feed_options,
+      render_atom_feed_for current_user.contexts.all, :feed => feed_options,
         :item => { :description => lambda { |c| c.summary(count_undone_todos_phrase(c)) },
         :author => lambda { |c| nil } }
     end
diff --git a/app/controllers/projects_controller.rb b/app/controllers/projects_controller.rb
index 1344772b..f21329d2 100644
--- a/app/controllers/projects_controller.rb
+++ b/app/controllers/projects_controller.rb
@@ -9,12 +9,12 @@ class ProjectsController < ApplicationController
 
   def index
     @source_view = params['_source_view'] || 'project_list'
-    @projects = current_user.projects
+    @projects = current_user.projects.all
     @new_project = current_user.projects.build
     if params[:projects_and_actions]
       projects_and_actions
     else      
-      @contexts = current_user.contexts
+      @contexts = current_user.contexts.all
       init_not_done_counts(['project'])
       if params[:only_active_with_no_next_actions]
         @projects = current_user.projects.active.select { |p| count_undone_todos(p) == 0 }
@@ -258,7 +258,7 @@ class ProjectsController < ApplicationController
 
   def render_rss_feed
     lambda do
-      render_rss_feed_for current_user.projects, :feed => feed_options,
+      render_rss_feed_for @projects, :feed => feed_options,
         :title => :name,
         :item => { :description => lambda { |p| summary(p) } }
     end
@@ -266,7 +266,7 @@ class ProjectsController < ApplicationController
 
   def render_atom_feed
     lambda do
-      render_atom_feed_for current_user.projects, :feed => feed_options,
+      render_atom_feed_for @projects, :feed => feed_options,
         :item => { :description => lambda { |p| summary(p) },
         :title => :name,
         :author => lambda { |p| nil } }
diff --git a/app/views/contexts/index.text.erb b/app/views/contexts/index.text.erb
index 3d60a918..7a09c3ba 100644
--- a/app/views/contexts/index.text.erb
+++ b/app/views/contexts/index.text.erb
@@ -1,4 +1,4 @@
-<% current_user.contexts.each do |c| -%>
+<% @all_contexts.each do |c| -%>
 
 <%= c.name.upcase %>
 <%= count_undone_todos_phrase_text(c)%>. <%= c.hidden? ? t('contexts.status_hidden') : t('contexts.status_active') %>.
diff --git a/test/functional/projects_controller_test.rb b/test/functional/projects_controller_test.rb
index 28c753d5..297ae2e2 100644
--- a/test/functional/projects_controller_test.rb
+++ b/test/functional/projects_controller_test.rb
@@ -48,13 +48,6 @@ class ProjectsControllerTest < TodoContainerControllerTestBase
     assert_ajax_create_increments_count 'My New Project'
   end
 
-  def test_create_project_and_go_to_project_page
-    num_projects = Project.count
-    xhr :post, :create, { :project => {:name => 'Immediate Project Planning Required'}, :go_to_project => 1}
-    assert_js_redirected_to %r{/?projects/\d+}
-    assert_equal num_projects + 1, Project.count
-  end
-
   def test_create_with_comma_in_name_does_not_increment_number_of_projects
     assert_ajax_create_does_not_increment_count 'foo,bar'
   end