From ad68a82be19f44c8e9ab895075a4e932133ad6ee Mon Sep 17 00:00:00 2001
From: Jean-Philippe Lang <jp_lang@yahoo.fr>
Date: Mon, 5 Nov 2007 22:22:51 +0000
Subject: Moved ProjectsController#list_news to NewsController#index. Removed
 FeedsController, issues and news feeds are now handled by issues and news
 controllers.

git-svn-id: http://redmine.rubyforge.org/svn/trunk@888 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 test/functional/feeds_controller_test.rb    | 66 -----------------------------
 test/functional/news_controller_test.rb     | 48 +++++++++++++++++++++
 test/functional/projects_controller_test.rb |  7 ---
 3 files changed, 48 insertions(+), 73 deletions(-)
 delete mode 100644 test/functional/feeds_controller_test.rb
 create mode 100644 test/functional/news_controller_test.rb

(limited to 'test')

diff --git a/test/functional/feeds_controller_test.rb b/test/functional/feeds_controller_test.rb
deleted file mode 100644
index c41fa2c60..000000000
--- a/test/functional/feeds_controller_test.rb
+++ /dev/null
@@ -1,66 +0,0 @@
-# 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'
-require 'feeds_controller'
-
-# Re-raise errors caught by the controller.
-class FeedsController; def rescue_action(e) raise e end; end
-
-class FeedsControllerTest < Test::Unit::TestCase
-  fixtures :projects, :users, :members, :roles
-
-  def setup
-    @controller = FeedsController.new
-    @request    = ActionController::TestRequest.new
-    @response   = ActionController::TestResponse.new
-  end
-
-  def test_news
-    get :news
-    assert_response :success
-    assert_template 'news'
-    assert_not_nil assigns(:news)
-  end
-  
-  def test_issues
-    get :issues
-    assert_response :success
-    assert_template 'issues'
-    assert_not_nil assigns(:issues)
-  end
-  
-  def test_history
-    get :history
-    assert_response :success
-    assert_template 'history'
-    assert_not_nil assigns(:journals)
-  end
-  
-  def test_project_privacy
-    get :news, :project_id => 2
-    assert_response 403
-  end
-  
-  def test_rss_key
-    user = User.find(2)
-    key = user.rss_key
-    
-    get :news, :project_id => 2, :key => key
-    assert_response :success
-  end
-end
diff --git a/test/functional/news_controller_test.rb b/test/functional/news_controller_test.rb
new file mode 100644
index 000000000..8a02345fd
--- /dev/null
+++ b/test/functional/news_controller_test.rb
@@ -0,0 +1,48 @@
+# 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'
+require 'news_controller'
+
+# Re-raise errors caught by the controller.
+class NewsController; def rescue_action(e) raise e end; end
+
+class NewsControllerTest < Test::Unit::TestCase
+  fixtures :projects, :users, :roles, :members, :enabled_modules
+  
+  def setup
+    @controller = NewsController.new
+    @request    = ActionController::TestRequest.new
+    @response   = ActionController::TestResponse.new
+    User.current = nil
+  end
+  
+  def test_index
+    get :index
+    assert_response :success
+    assert_template 'index'
+    assert_not_nil assigns(:newss)
+    assert_nil assigns(:project)
+  end
+
+  def test_index_with_project
+    get :index, :project_id => 1
+    assert_response :success
+    assert_template 'index'
+    assert_not_nil assigns(:newss)
+  end
+end
diff --git a/test/functional/projects_controller_test.rb b/test/functional/projects_controller_test.rb
index 28f826b8b..002dc1e4d 100644
--- a/test/functional/projects_controller_test.rb
+++ b/test/functional/projects_controller_test.rb
@@ -65,13 +65,6 @@ class ProjectsControllerTest < Test::Unit::TestCase
     # check that the issues were updated
     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_list_news
-    get :list_news, :id => 1
-    assert_response :success
-    assert_template 'list_news'
-    assert_not_nil assigns(:newss)
   end
 
   def test_list_files
-- 
cgit v1.2.3