diff --git a/app/helpers/projects_helper.rb b/app/helpers/projects_helper.rb
index 4b1b1a9541c699d577915ceeeecc1820e66a0b18..df4b9c3345dfe5d8eb11c3973425dbef1d4412de 100644
--- a/app/helpers/projects_helper.rb
+++ b/app/helpers/projects_helper.rb
@@ -179,9 +179,9 @@ module ProjectsHelper
     end
     
     # today red line
-    if Date.today >= @date_from and Date.today <= @date_to
+    if Date.today >= date_from and Date.today <= date_to
       gc.stroke('red')
-      x = (Date.today-@date_from+1)*zoom + subject_width
+      x = (Date.today-date_from+1)*zoom + subject_width
       gc.line(x, headers_heigth, x, headers_heigth + g_height-1)      
     end    
     
diff --git a/test/fixtures/issues.yml b/test/fixtures/issues.yml
index 6649849d8e28e04624a1af50477d0a5b74b84677..fc5b48dee0cf64433207eba5cbe9fbce31e12fd2 100644
--- a/test/fixtures/issues.yml
+++ b/test/fixtures/issues.yml
@@ -41,6 +41,8 @@ issues_003:
   assigned_to_id: 
   author_id: 2
   status_id: 1
+  start_date: <%= 1.day.from_now.to_date.to_s(:db) %>
+  due_date: <%= 40.day.ago.to_date.to_s(:db) %>
 issues_004: 
   created_on: 2006-07-19 21:07:27 +02:00
   project_id: 2
diff --git a/test/functional/projects_controller_test.rb b/test/functional/projects_controller_test.rb
index 52c33ddd7772c4588a86a87cc941fb436bd3b193..b6ac59141c42858c2af2b868de60b7982bdc1276 100644
--- a/test/functional/projects_controller_test.rb
+++ b/test/functional/projects_controller_test.rb
@@ -52,7 +52,37 @@ class ProjectsControllerTest < Test::Unit::TestCase
     assert_response :success
     assert_template 'show'
     assert_not_nil assigns(:project)
+  end
+  
+  def test_settings
+    @request.session[:user_id] = 2 # manager
+    get :settings, :id => 1
+    assert_response :success
+    assert_template 'settings'
+  end
+  
+  def test_edit
+    @request.session[:user_id] = 2 # manager
+    post :edit, :id => 1, :project => {:name => 'Test changed name'}
+    assert_redirected_to 'projects/settings/1'
+    project = Project.find(1)
+    assert_equal 'Test changed name', project.name
+  end
+  
+  def test_get_destroy
+    @request.session[:user_id] = 1 # admin
+    get :destroy, :id => 1
+    assert_response :success
+    assert_template 'destroy'
+    assert_not_nil Project.find_by_id(1)
   end
+
+  def test_post_destroy
+    @request.session[:user_id] = 1 # admin
+    post :destroy, :id => 1, :confirm => 1
+    assert_redirected_to 'admin/projects'
+    assert_nil Project.find_by_id(1)
+  end
   
   def test_list_documents
     get :list_documents, :id => 1
@@ -70,7 +100,23 @@ class ProjectsControllerTest < Test::Unit::TestCase
     assert_equal [7, 7], Issue.find_all_by_id([1, 2]).collect {|i| i.priority.id}
     assert_equal 'Bulk editing', Issue.find(1).journals.find(:first, :order => 'created_on DESC').notes
   end
-
+
+  def test_move_issues_to_another_project
+    @request.session[:user_id] = 1
+    post :move_issues, :id => 1, :issue_ids => [1, 2], :new_project_id => 2
+    assert_redirected_to 'projects/1/issues'
+    assert_equal 2, Issue.find(1).project_id
+    assert_equal 2, Issue.find(2).project_id
+  end
+  
+  def test_move_issues_to_another_tracker
+    @request.session[:user_id] = 1
+    post :move_issues, :id => 1, :issue_ids => [1, 2], :new_tracker_id => 3
+    assert_redirected_to 'projects/1/issues'
+    assert_equal 3, Issue.find(1).tracker_id
+    assert_equal 3, Issue.find(2).tracker_id
+  end
+  
   def test_list_files
     get :list_files, :id => 1
     assert_response :success
diff --git a/test/unit/helpers/projects_helper_test.rb b/test/unit/helpers/projects_helper_test.rb
new file mode 100644
index 0000000000000000000000000000000000000000..d76d92bc9d05b2db8a4328978ecc56d65b3584bd
--- /dev/null
+++ b/test/unit/helpers/projects_helper_test.rb
@@ -0,0 +1,41 @@
+# redMine - project management software
+# Copyright (C) 2006-2007  Jean-Philippe Lang
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
+# 
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+# 
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+
+require File.dirname(__FILE__) + '/../../test_helper'
+
+class ProjectsHelperTest < HelperTestCase
+  include ProjectsHelper
+  include ActionView::Helpers::TextHelper
+  fixtures :projects, :trackers, :issue_statuses, :issues, :enumerations, :users, :issue_categories
+
+  def setup
+    super
+  end
+  
+  if Object.const_defined?(:Magick)
+    def test_gantt_image
+      assert gantt_image(Issue.find(:all, :conditions => "start_date IS NOT NULL AND due_date IS NOT NULL"), Date.today, 6, 2)
+    end
+
+    def test_gantt_image_with_days
+      assert gantt_image(Issue.find(:all, :conditions => "start_date IS NOT NULL AND due_date IS NOT NULL"), Date.today, 3, 4)
+    end
+  else
+    puts "RMagick not installed. Skipping tests !!!"
+    def test_fake; assert true end
+  end
+end