ProjectsController#add_issue moved to IssuesController#new.

Tracker can now be changed/selected on the new issue form. This action can be invoked without the tracker_id parameter (the first enabled tracker will be used by default).

git-svn-id: http://redmine.rubyforge.org/svn/trunk@1080 e93f8b46-1217-0410-a6f0-8f06a7374b81

3 files changed, 53 insertions, 22 deletions

diff --git a/test/functional/issues_controller_test.rb b/test/functional/issues_controller_test.rb
index d60e32200..05bfc96e3 100644
--- a/test/functional/issues_controller_test.rb
+++ b/test/functional/issues_controller_test.rb
@@ -29,6 +29,7 @@ class IssuesControllerTest < Test::Unit::TestCase
            :issues,
            :issue_statuses,
            :trackers,
+           :projects_trackers,
            :issue_categories,
            :enabled_modules,
            :enumerations,
@@ -126,6 +127,55 @@ class IssuesControllerTest < Test::Unit::TestCase
                                             :content => /Notes/ } }
   end
 
+  def test_get_new
+    @request.session[:user_id] = 2
+    get :new, :project_id => 1, :tracker_id => 1
+    assert_response :success
+    assert_template 'new'
+  end
+
+  def test_get_new_without_tracker_id
+    @request.session[:user_id] = 2
+    get :new, :project_id => 1
+    assert_response :success
+    assert_template 'new'
+    
+    issue = assigns(:issue)
+    assert_not_nil issue
+    assert_equal Project.find(1).trackers.first, issue.tracker
+  end
+  
+  def test_update_new_form
+    @request.session[:user_id] = 2
+    xhr :post, :new, :project_id => 1,
+                     :issue => {:tracker_id => 2, 
+                                :subject => 'This is the test_new issue',
+                                :description => 'This is the description',
+                                :priority_id => 5}
+    assert_response :success
+    assert_template 'new'
+  end
+  
+  def test_post_new
+    @request.session[:user_id] = 2
+    post :new, :project_id => 1, 
+               :issue => {:tracker_id => 1,
+                          :subject => 'This is the test_new issue',
+                          :description => 'This is the description',
+                          :priority_id => 5}
+    assert_redirected_to 'projects/ecookbook/issues'
+    assert Issue.find_by_subject('This is the test_new issue')
+  end
+  
+  def test_copy_issue
+    @request.session[:user_id] = 2
+    get :new, :project_id => 1, :copy_from => 1
+    assert_template 'new'
+    assert_not_nil assigns(:issue)
+    orig = Issue.find(1)
+    assert_equal orig.subject, assigns(:issue).subject
+  end
+  
   def test_get_edit
     @request.session[:user_id] = 2
     get :edit, :id => 1
diff --git a/test/functional/projects_controller_test.rb b/test/functional/projects_controller_test.rb
index f19aa7748..61047079e 100644
--- a/test/functional/projects_controller_test.rb
+++ b/test/functional/projects_controller_test.rb
@@ -236,23 +236,4 @@ class ProjectsControllerTest < Test::Unit::TestCase
     assert_redirected_to 'admin/projects'
     assert Project.find(1).active?
   end
-  
-  def test_add_issue
-    @request.session[:user_id] = 2
-    get :add_issue, :id => 1, :tracker_id => 1
-    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/ecookbook/issues'
-    assert Issue.find_by_subject('This is the test_add_issue issue')
-  end
-  
-  def test_copy_issue
-    @request.session[:user_id] = 2
-    get :add_issue, :id => 1, :copy_from => 1
-    assert_template 'add_issue'
-    assert_not_nil assigns(:issue)
-    orig = Issue.find(1)
-    assert_equal orig.subject, assigns(:issue).subject
-  end
 end
diff --git a/test/integration/issues_test.rb b/test/integration/issues_test.rb
index a9d3f9c74..81d27c30f 100644
--- a/test/integration/issues_test.rb
+++ b/test/integration/issues_test.rb
@@ -6,11 +6,11 @@ class IssuesTest < ActionController::IntegrationTest
   # create an issue
   def test_add_issue
     log_user('jsmith', 'jsmith')
-    get "projects/add_issue/1", :tracker_id => "1"
+    get 'projects/1/issues/new', :tracker_id => '1'
     assert_response :success
-    assert_template "projects/add_issue"
+    assert_template 'issues/new'
     
-    post "projects/add_issue/1", :tracker_id => "1",
+    post 'projects/1/issues/new', :tracker_id => "1",
                                  :issue => { :start_date => "2006-12-26", 
                                              :priority_id => "3", 
                                              :subject => "new test issue",