3 files changed, 88 insertions, 29 deletions
diff --git a/test/functional/issues_controller_test.rb b/test/functional/issues_controller_test.rb
new file mode 100644
index 000000000..484ebc62b
--- /dev/null
+++ b/test/functional/issues_controller_test.rb
@@ -0,0 +1,86 @@
+# 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 'issues_controller'
+
+# Re-raise errors caught by the controller.
+class IssuesController; def rescue_action(e) raise e end; end
+
+class IssuesControllerTest < Test::Unit::TestCase
+  fixtures :projects, :users, :roles, :members, :issues, :enabled_modules, :enumerations
+  
+  def setup
+    @controller = IssuesController.new
+    @request    = ActionController::TestRequest.new
+    @response   = ActionController::TestResponse.new
+    User.current = nil
+  end
+
+  def test_index
+    get :index
+    assert_response :success
+    assert_template 'index.rhtml'
+    assert_not_nil assigns(:issues)
+    assert_nil assigns(:project)
+  end
+
+  def test_index_with_project
+    get :index, :project_id => 1
+    assert_response :success
+    assert_template 'index.rhtml'
+    assert_not_nil assigns(:issues)
+  end
+  
+  def test_index_with_project_and_filter
+    get :index, :project_id => 1, :set_filter => 1
+    assert_response :success
+    assert_template 'index.rhtml'
+    assert_not_nil assigns(:issues)
+  end
+  
+  def test_index_csv_with_project
+    get :index, :format => 'csv'
+    assert_response :success
+    assert_not_nil assigns(:issues)
+    assert_equal 'text/csv', @response.content_type
+
+    get :index, :project_id => 1, :format => 'csv'
+    assert_response :success
+    assert_not_nil assigns(:issues)
+    assert_equal 'text/csv', @response.content_type
+  end
+  
+  def test_index_pdf
+    get :index, :format => 'pdf'
+    assert_response :success
+    assert_not_nil assigns(:issues)
+    assert_equal 'application/pdf', @response.content_type
+    
+    get :index, :project_id => 1, :format => 'pdf'
+    assert_response :success
+    assert_not_nil assigns(:issues)
+    assert_equal 'application/pdf', @response.content_type
+  end
+  
+  def test_changes
+    get :changes, :project_id => 1
+    assert_response :success
+    assert_not_nil assigns(:changes)
+    assert_equal 'application/atom+xml', @response.content_type
+  end
+end
diff --git a/test/functional/projects_controller_test.rb b/test/functional/projects_controller_test.rb
index 86cea62f8..28f826b8b 100644
--- a/test/functional/projects_controller_test.rb
+++ b/test/functional/projects_controller_test.rb
@@ -55,33 +55,6 @@ class ProjectsControllerTest < Test::Unit::TestCase
     assert_response :success
     assert_template 'list_documents'
     assert_not_nil assigns(:grouped)
-  end
-  
-  def test_list_issues
-    get :list_issues, :id => 1
-    assert_response :success
-    assert_template 'list_issues'
-    assert_not_nil assigns(:issues)
-  end
-  
-  def test_list_issues_with_filter
-    get :list_issues, :id => 1, :set_filter => 1
-    assert_response :success
-    assert_template 'list_issues'
-    assert_not_nil assigns(:issues)
-  end
-  
-  def test_list_issues_reset_filter
-    post :list_issues, :id => 1
-    assert_response :success
-    assert_template 'list_issues'
-    assert_not_nil assigns(:issues)
-  end
-  
-  def test_export_issues_csv
-    get :export_issues_csv, :id => 1
-    assert_response :success
-    assert_not_nil assigns(:issues)
   end
   
   def test_bulk_edit_issues
@@ -150,7 +123,7 @@ class ProjectsControllerTest < Test::Unit::TestCase
     assert_response :success
     assert_template 'add_issue'
     post :add_issue, :id => 1, :issue => {:tracker_id => 1, :subject => 'This is the test_add_issue issue', :description => 'This is the description', :priority_id => 5}
-    assert_redirected_to 'projects/list_issues'
+    assert_redirected_to 'projects/1/issues'
     assert Issue.find_by_subject('This is the test_add_issue issue')
   end
   
diff --git a/test/integration/issues_test.rb b/test/integration/issues_test.rb
index 668bcbd18..eac407b1b 100644
--- a/test/integration/issues_test.rb
+++ b/test/integration/issues_test.rb
@@ -24,7 +24,7 @@ class IssuesTest < ActionController::IntegrationTest
     assert_kind_of Issue, issue
 
     # check redirection
-    assert_redirected_to "projects/list_issues/1"
+    assert_redirected_to "projects/1/issues"
     follow_redirect!
     assert assigns(:issues).include?(issue)