From 586f4e3831e31aef7d2a0e837c1c9fb6fc5c52ce Mon Sep 17 00:00:00 2001
From: Jean-Philippe Lang <jp_lang@yahoo.fr>
Date: Thu, 11 Sep 2008 17:03:26 +0000
Subject: Adds support for free ticket filtering and custom queries on
 Calendar. ProjectsController#calendar moved to IssuesController.

git-svn-id: http://redmine.rubyforge.org/svn/trunk@1798 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 test/functional/issues_controller_test.rb   | 11 +++++++++--
 test/functional/projects_controller_test.rb | 28 ++--------------------------
 2 files changed, 11 insertions(+), 28 deletions(-)

(limited to 'test')

diff --git a/test/functional/issues_controller_test.rb b/test/functional/issues_controller_test.rb
index 67e7f1f91..52426b4d9 100644
--- a/test/functional/issues_controller_test.rb
+++ b/test/functional/issues_controller_test.rb
@@ -1,5 +1,5 @@
-# redMine - project management software
-# Copyright (C) 2006-2007  Jean-Philippe Lang
+# Redmine - project management software
+# Copyright (C) 2006-2008  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
@@ -161,6 +161,13 @@ class IssuesControllerTest < Test::Unit::TestCase
     puts "RMagick not installed. Skipping tests !!!"
   end
   
+  def test_calendar
+    get :calendar, :project_id => 1
+    assert_response :success
+    assert_template 'calendar'
+    assert_not_nil assigns(:calendar)
+  end
+  
   def test_changes
     get :changes, :project_id => 1
     assert_response :success
diff --git a/test/functional/projects_controller_test.rb b/test/functional/projects_controller_test.rb
index 3d969d11f..45af4e33e 100644
--- a/test/functional/projects_controller_test.rb
+++ b/test/functional/projects_controller_test.rb
@@ -1,5 +1,5 @@
-# redMine - project management software
-# Copyright (C) 2006-2007  Jean-Philippe Lang
+# Redmine - project management software
+# Copyright (C) 2006-2008  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
@@ -208,30 +208,6 @@ class ProjectsControllerTest < Test::Unit::TestCase
     assert_template 'common/feed.atom.rxml'
   end
   
-  def test_calendar
-    get :calendar, :id => 1
-    assert_response :success
-    assert_template 'calendar'
-    assert_not_nil assigns(:calendar)
-  end
-
-  def test_calendar_with_subprojects_should_not_show_private_subprojects
-    get :calendar, :id => 1, :with_subprojects => 1, :tracker_ids => [1, 2]
-    assert_response :success
-    assert_template 'calendar'
-    assert_not_nil assigns(:calendar)
-    assert_no_tag :tag => 'a', :content => /#6/
-  end
-  
-  def test_calendar_with_subprojects_should_show_private_subprojects
-    @request.session[:user_id] = 2
-    get :calendar, :id => 1, :with_subprojects => 1, :tracker_ids => [1, 2]
-    assert_response :success
-    assert_template 'calendar'
-    assert_not_nil assigns(:calendar)
-    assert_tag :tag => 'a', :content => /#6/
-  end
-  
   def test_archive    
     @request.session[:user_id] = 1 # admin
     post :archive, :id => 1
-- 
cgit v1.2.3