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

2 files changed, 17 insertions, 42 deletions

diff --git a/test/functional/feeds_controller_test.rb b/test/functional/news_controller_test.rb
index c41fa2c60..8a02345fd 100644
--- a/test/functional/feeds_controller_test.rb
+++ b/test/functional/news_controller_test.rb
@@ -16,51 +16,33 @@
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 
 require File.dirname(__FILE__) + '/../test_helper'
-require 'feeds_controller'
+require 'news_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
+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 = FeedsController.new
+    @controller = NewsController.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)
+    User.current = nil
   end
   
-  def test_history
-    get :history
+  def test_index
+    get :index
     assert_response :success
-    assert_template 'history'
-    assert_not_nil assigns(:journals)
-  end
-  
-  def test_project_privacy
-    get :news, :project_id => 2
-    assert_response 403
+    assert_template 'index'
+    assert_not_nil assigns(:newss)
+    assert_nil assigns(:project)
   end
-  
-  def test_rss_key
-    user = User.find(2)
-    key = user.rss_key
-    
-    get :news, :project_id => 2, :key => key
+
+  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