Refactor: Move the rest of the routing tests to RoutingTest.

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@3687 e93f8b46-1217-0410-a6f0-8f06a7374b81

3 files changed, 167 insertions, 71 deletions

diff --git a/test/integration/issues_api_test.rb b/test/integration/issues_api_test.rb
index c622d0c46..081f37524 100644
--- a/test/integration/issues_api_test.rb
+++ b/test/integration/issues_api_test.rb
@@ -46,13 +46,6 @@ class IssuesApiTest < ActionController::IntegrationTest
     Setting.rest_api_enabled = '1'
   end
     
-  def test_index_routing
-    assert_routing(
-      {:method => :get, :path => '/issues.xml'},
-      :controller => 'issues', :action => 'index', :format => 'xml'
-    )
-  end
-  
   def test_index
     get '/issues.xml'
     assert_response :success
@@ -68,26 +61,12 @@ class IssuesApiTest < ActionController::IntegrationTest
                               :only => { :tag => 'issue' } }
   end
     
-  def test_show_routing
-    assert_routing(
-      {:method => :get, :path => '/issues/1.xml'},
-      :controller => 'issues', :action => 'show', :id => '1', :format => 'xml'
-    )
-  end
-  
   def test_show
     get '/issues/1.xml'
     assert_response :success
     assert_equal 'application/xml', @response.content_type
   end
     
-  def test_create_routing
-    assert_routing(
-      {:method => :post, :path => '/issues.xml'},
-      :controller => 'issues', :action => 'new', :format => 'xml'
-    )
-  end
-  
   def test_create
     attributes = {:project_id => 1, :subject => 'API test', :tracker_id => 2, :status_id => 3}
     assert_difference 'Issue.count' do
@@ -111,13 +90,6 @@ class IssuesApiTest < ActionController::IntegrationTest
     assert_tag :errors, :child => {:tag => 'error', :content => "Subject can't be blank"}
   end
     
-  def test_update_routing
-    assert_routing(
-      {:method => :put, :path => '/issues/1.xml'},
-      :controller => 'issues', :action => 'update', :id => '1', :format => 'xml'
-    )
-  end
-  
   def test_update
     attributes = {:subject => 'API update'}
     assert_no_difference 'Issue.count' do
@@ -145,13 +117,6 @@ class IssuesApiTest < ActionController::IntegrationTest
     assert_tag :errors, :child => {:tag => 'error', :content => "Subject can't be blank"}
   end
     
-  def test_destroy_routing
-    assert_routing(
-      {:method => :delete, :path => '/issues/1.xml'},
-      :controller => 'issues', :action => 'destroy', :id => '1', :format => 'xml'
-    )
-  end
-  
   def test_destroy
     assert_difference 'Issue.count', -1 do
       delete '/issues/1.xml', {}, :authorization => credentials('jsmith')
diff --git a/test/integration/projects_api_test.rb b/test/integration/projects_api_test.rb
index a93532a58..e254c5137 100644
--- a/test/integration/projects_api_test.rb
+++ b/test/integration/projects_api_test.rb
@@ -26,39 +26,18 @@ class ProjectsApiTest < ActionController::IntegrationTest
     Setting.rest_api_enabled = '1'
   end
     
-  def test_index_routing
-    assert_routing(
-      {:method => :get, :path => '/projects.xml'},
-      :controller => 'projects', :action => 'index', :format => 'xml'
-    )
-  end
-  
   def test_index
     get '/projects.xml'
     assert_response :success
     assert_equal 'application/xml', @response.content_type
   end
     
-  def test_show_routing
-    assert_routing(
-      {:method => :get, :path => '/projects/1.xml'},
-      :controller => 'projects', :action => 'show', :id => '1', :format => 'xml'
-    )
-  end
-  
   def test_show
     get '/projects/1.xml'
     assert_response :success
     assert_equal 'application/xml', @response.content_type
   end
     
-  def test_create_routing
-    assert_routing(
-      {:method => :post, :path => '/projects.xml'},
-      :controller => 'projects', :action => 'add', :format => 'xml'
-    )
-  end
-  
   def test_create
     attributes = {:name => 'API test', :identifier => 'api-test'}
     assert_difference 'Project.count' do
@@ -82,13 +61,6 @@ class ProjectsApiTest < ActionController::IntegrationTest
     assert_tag :errors, :child => {:tag => 'error', :content => "Identifier can't be blank"}
   end
     
-  def test_update_routing
-    assert_routing(
-      {:method => :put, :path => '/projects/1.xml'},
-      :controller => 'projects', :action => 'edit', :id => '1', :format => 'xml'
-    )
-  end
-  
   def test_update
     attributes = {:name => 'API update'}
     assert_no_difference 'Project.count' do
@@ -112,13 +84,6 @@ class ProjectsApiTest < ActionController::IntegrationTest
     assert_tag :errors, :child => {:tag => 'error', :content => "Name can't be blank"}
   end
     
-  def test_destroy_routing
-    assert_routing(
-      {:method => :delete, :path => '/projects/1.xml'},
-      :controller => 'projects', :action => 'destroy', :id => '1', :format => 'xml'
-    )
-  end
-  
   def test_destroy
     assert_difference 'Project.count', -1 do
       delete '/projects/2.xml', {}, :authorization => credentials('admin')
diff --git a/test/integration/routing_test.rb b/test/integration/routing_test.rb
index 969aa7f17..e51f34642 100644
--- a/test/integration/routing_test.rb
+++ b/test/integration/routing_test.rb
@@ -18,6 +18,42 @@
 require "#{File.dirname(__FILE__)}/../test_helper"
 
 class RoutingTest < ActionController::IntegrationTest
+  context "activities" do
+    should_route :get, "/activity", :controller => 'projects', :action => 'activity', :id => nil
+    should_route :get, "/activity.atom", :controller => 'projects', :action => 'activity', :id => nil, :format => 'atom'
+  end
+
+  context "attachments" do
+    should_route :get, "/attachments/1", :controller => 'attachments', :action => 'show', :id => '1'
+    should_route :get, "/attachments/1/filename.ext", :controller => 'attachments', :action => 'show', :id => '1', :filename => 'filename.ext'
+    should_route :get, "/attachments/download/1", :controller => 'attachments', :action => 'download', :id => '1'
+    should_route :get, "/attachments/download/1/filename.ext", :controller => 'attachments', :action => 'download', :id => '1', :filename => 'filename.ext'
+  end
+  
+  context "boards" do
+    should_route :get, "/projects/world_domination/boards", :controller => 'boards', :action => 'index', :project_id => 'world_domination'
+    should_route :get, "/projects/world_domination/boards/new", :controller => 'boards', :action => 'new', :project_id => 'world_domination'
+    should_route :get, "/projects/world_domination/boards/44", :controller => 'boards', :action => 'show', :project_id => 'world_domination', :id => '44'
+    should_route :get, "/projects/world_domination/boards/44.atom", :controller => 'boards', :action => 'show', :project_id => 'world_domination', :id => '44', :format => 'atom'
+    should_route :get, "/projects/world_domination/boards/44/edit", :controller => 'boards', :action => 'edit', :project_id => 'world_domination', :id => '44'
+
+    should_route :post, "/projects/world_domination/boards/new", :controller => 'boards', :action => 'new', :project_id => 'world_domination'
+    should_route :post, "/projects/world_domination/boards/44/edit", :controller => 'boards', :action => 'edit', :project_id => 'world_domination', :id => '44'
+    should_route :post, "/projects/world_domination/boards/44/destroy", :controller => 'boards', :action => 'destroy', :project_id => 'world_domination', :id => '44'
+    
+  end
+
+  context "documents" do
+    should_route :get, "/projects/567/documents", :controller => 'documents', :action => 'index', :project_id => '567'
+    should_route :get, "/projects/567/documents/new", :controller => 'documents', :action => 'new', :project_id => '567'
+    should_route :get, "/documents/22", :controller => 'documents', :action => 'show', :id => '22'
+    should_route :get, "/documents/22/edit", :controller => 'documents', :action => 'edit', :id => '22'
+
+    should_route :post, "/projects/567/documents/new", :controller => 'documents', :action => 'new', :project_id => '567'
+    should_route :post, "/documents/567/edit", :controller => 'documents', :action => 'edit', :id => '567'
+    should_route :post, "/documents/567/destroy", :controller => 'documents', :action => 'destroy', :id => '567'
+  end
+  
   context "issues" do
     # REST actions
     should_route :get, "/issues", :controller => 'issues', :action => 'index'
@@ -34,13 +70,16 @@ class RoutingTest < ActionController::IntegrationTest
     should_route :get, "/issues/64.xml", :controller => 'issues', :action => 'show', :id => '64', :format => 'xml'
 
     should_route :get, "/projects/23/issues/new", :controller => 'issues', :action => 'new', :project_id => '23'
+    should_route :post, "/issues.xml", :controller => 'issues', :action => 'new', :format => 'xml'
       
     should_route :get, "/issues/64/edit", :controller => 'issues', :action => 'edit', :id => '64'
     # TODO: Should use PUT
     should_route :post, "/issues/64/edit", :controller => 'issues', :action => 'edit', :id => '64'
+    should_route :put, "/issues/1.xml", :controller => 'issues', :action => 'update', :id => '1', :format => 'xml'
 
     # TODO: Should use DELETE
     should_route :post, "/issues/64/destroy", :controller => 'issues', :action => 'destroy', :id => '64'
+    should_route :delete, "/issues/1.xml", :controller => 'issues', :action => 'destroy', :id => '1', :format => 'xml'
     
     # Extra actions
     should_route :get, "/projects/23/issues/64/copy", :controller => 'issues', :action => 'new', :project_id => '23', :copy_from => '64'
@@ -62,12 +101,132 @@ class RoutingTest < ActionController::IntegrationTest
 
     should_route :get, "/issues/auto_complete", :controller => 'issues', :action => 'auto_complete'
   end
+
+  context "issue categories" do
+    should_route :get, "/projects/test/issue_categories/new", :controller => 'issue_categories', :action => 'new', :project_id => 'test'
+
+    should_route :post, "/projects/test/issue_categories/new", :controller => 'issue_categories', :action => 'new', :project_id => 'test'
+  end
+
+  context "issue relations" do
+    should_route :post, "/issues/1/relations", :controller => 'issue_relations', :action => 'new', :issue_id => '1'
+    should_route :post, "/issues/1/relations/23/destroy", :controller => 'issue_relations', :action => 'destroy', :issue_id => '1', :id => '23'
+  end
   
   context "issue reports" do
     should_route :get, "/projects/567/issues/report", :controller => 'reports', :action => 'issue_report', :id => '567'
     should_route :get, "/projects/567/issues/report/assigned_to", :controller => 'reports', :action => 'issue_report_details', :id => '567', :detail => 'assigned_to'
   end
 
+  context "members" do
+    should_route :post, "/projects/5234/members/new", :controller => 'members', :action => 'new', :id => '5234'
+  end
+
+  context "messages" do
+    should_route :get, "/boards/22/topics/2", :controller => 'messages', :action => 'show', :id => '2', :board_id => '22'
+    should_route :get, "/boards/lala/topics/new", :controller => 'messages', :action => 'new', :board_id => 'lala'
+    should_route :get, "/boards/lala/topics/22/edit", :controller => 'messages', :action => 'edit', :id => '22', :board_id => 'lala'
+
+    should_route :post, "/boards/lala/topics/new", :controller => 'messages', :action => 'new', :board_id => 'lala'
+    should_route :post, "/boards/lala/topics/22/edit", :controller => 'messages', :action => 'edit', :id => '22', :board_id => 'lala'
+    should_route :post, "/boards/22/topics/555/replies", :controller => 'messages', :action => 'reply', :id => '555', :board_id => '22'
+    should_route :post, "/boards/22/topics/555/destroy", :controller => 'messages', :action => 'destroy', :id => '555', :board_id => '22'
+  end
+
+  context "news" do
+    should_route :get, "/news", :controller => 'news', :action => 'index'
+    should_route :get, "/news.atom", :controller => 'news', :action => 'index', :format => 'atom'
+    should_route :get, "/news.xml", :controller => 'news', :action => 'index', :format => 'xml'
+    should_route :get, "/news.json", :controller => 'news', :action => 'index', :format => 'json'
+    should_route :get, "/projects/567/news", :controller => 'news', :action => 'index', :project_id => '567'
+    should_route :get, "/projects/567/news.atom", :controller => 'news', :action => 'index', :format => 'atom', :project_id => '567'
+    should_route :get, "/projects/567/news.xml", :controller => 'news', :action => 'index', :format => 'xml', :project_id => '567'
+    should_route :get, "/projects/567/news.json", :controller => 'news', :action => 'index', :format => 'json', :project_id => '567'
+    should_route :get, "/news/2", :controller => 'news', :action => 'show', :id => '2'
+    should_route :get, "/projects/567/news/new", :controller => 'news', :action => 'new', :project_id => '567'
+    should_route :get, "/news/234", :controller => 'news', :action => 'show', :id => '234'
+
+    should_route :post, "/projects/567/news/new", :controller => 'news', :action => 'new', :project_id => '567'
+    should_route :post, "/news/567/edit", :controller => 'news', :action => 'edit', :id => '567'
+    should_route :post, "/news/567/destroy", :controller => 'news', :action => 'destroy', :id => '567'
+  end
+
+  context "projects" do
+    should_route :get, "/projects", :controller => 'projects', :action => 'index'
+    should_route :get, "/projects.atom", :controller => 'projects', :action => 'index', :format => 'atom'
+    should_route :get, "/projects.xml", :controller => 'projects', :action => 'index', :format => 'xml'
+    should_route :get, "/projects/new", :controller => 'projects', :action => 'add'
+    should_route :get, "/projects/test", :controller => 'projects', :action => 'show', :id => 'test'
+    should_route :get, "/projects/1.xml", :controller => 'projects', :action => 'show', :id => '1', :format => 'xml'
+    should_route :get, "/projects/4223/settings", :controller => 'projects', :action => 'settings', :id => '4223'
+    should_route :get, "/projects/4223/settings/members", :controller => 'projects', :action => 'settings', :id => '4223', :tab => 'members'
+    should_route :get, "/projects/567/destroy", :controller => 'projects', :action => 'destroy', :id => '567'
+    should_route :get, "/projects/33/files", :controller => 'projects', :action => 'list_files', :id => '33'
+    should_route :get, "/projects/33/files/new", :controller => 'projects', :action => 'add_file', :id => '33'
+    should_route :get, "/projects/33/roadmap", :controller => 'projects', :action => 'roadmap', :id => '33'
+    should_route :get, "/projects/33/activity", :controller => 'projects', :action => 'activity', :id => '33'
+    should_route :get, "/projects/33/activity.atom", :controller => 'projects', :action => 'activity', :id => '33', :format => 'atom'
+    
+    should_route :post, "/projects/new", :controller => 'projects', :action => 'add'
+    should_route :post, "/projects.xml", :controller => 'projects', :action => 'add', :format => 'xml'
+    should_route :post, "/projects/4223/edit", :controller => 'projects', :action => 'edit', :id => '4223'
+    should_route :post, "/projects/64/destroy", :controller => 'projects', :action => 'destroy', :id => '64'
+    should_route :post, "/projects/33/files/new", :controller => 'projects', :action => 'add_file', :id => '33'
+    should_route :post, "/projects/64/archive", :controller => 'projects', :action => 'archive', :id => '64'
+    should_route :post, "/projects/64/unarchive", :controller => 'projects', :action => 'unarchive', :id => '64'
+    should_route :post, "/projects/64/activities/save", :controller => 'projects', :action => 'save_activities', :id => '64'
+
+    should_route :put, "/projects/1.xml", :controller => 'projects', :action => 'edit', :id => '1', :format => 'xml'
+
+    should_route :delete, "/projects/1.xml", :controller => 'projects', :action => 'destroy', :id => '1', :format => 'xml'
+    should_route :delete, "/projects/64/reset_activities", :controller => 'projects', :action => 'reset_activities', :id => '64'
+  end
+
+  context "repositories" do
+    should_route :get, "/projects/redmine/repository", :controller => 'repositories', :action => 'show', :id => 'redmine'
+    should_route :get, "/projects/redmine/repository/edit", :controller => 'repositories', :action => 'edit', :id => 'redmine'
+    should_route :get, "/projects/redmine/repository/revisions", :controller => 'repositories', :action => 'revisions', :id => 'redmine'
+    should_route :get, "/projects/redmine/repository/revisions.atom", :controller => 'repositories', :action => 'revisions', :id => 'redmine', :format => 'atom'
+    should_route :get, "/projects/redmine/repository/revisions/2457", :controller => 'repositories', :action => 'revision', :id => 'redmine', :rev => '2457'
+    should_route :get, "/projects/redmine/repository/revisions/2457/diff", :controller => 'repositories', :action => 'diff', :id => 'redmine', :rev => '2457'
+    should_route :get, "/projects/redmine/repository/revisions/2457/diff.diff", :controller => 'repositories', :action => 'diff', :id => 'redmine', :rev => '2457', :format => 'diff'
+    should_route :get, "/projects/redmine/repository/diff/path/to/file.c", :controller => 'repositories', :action => 'diff', :id => 'redmine', :path => %w[path to file.c]
+    should_route :get, "/projects/redmine/repository/revisions/2/diff/path/to/file.c", :controller => 'repositories', :action => 'diff', :id => 'redmine', :path => %w[path to file.c], :rev => '2'
+    should_route :get, "/projects/redmine/repository/browse/path/to/file.c", :controller => 'repositories', :action => 'browse', :id => 'redmine', :path => %w[path to file.c]
+    should_route :get, "/projects/redmine/repository/entry/path/to/file.c", :controller => 'repositories', :action => 'entry', :id => 'redmine', :path => %w[path to file.c]
+    should_route :get, "/projects/redmine/repository/revisions/2/entry/path/to/file.c", :controller => 'repositories', :action => 'entry', :id => 'redmine', :path => %w[path to file.c], :rev => '2'
+    should_route :get, "/projects/redmine/repository/raw/path/to/file.c", :controller => 'repositories', :action => 'entry', :id => 'redmine', :path => %w[path to file.c], :format => 'raw'
+    should_route :get, "/projects/redmine/repository/revisions/2/raw/path/to/file.c", :controller => 'repositories', :action => 'entry', :id => 'redmine', :path => %w[path to file.c], :rev => '2', :format => 'raw'
+    should_route :get, "/projects/redmine/repository/annotate/path/to/file.c", :controller => 'repositories', :action => 'annotate', :id => 'redmine', :path => %w[path to file.c]
+    should_route :get, "/projects/redmine/repository/changes/path/to/file.c", :controller => 'repositories', :action => 'changes', :id => 'redmine', :path => %w[path to file.c]
+    should_route :get, "/projects/redmine/repository/statistics", :controller => 'repositories', :action => 'stats', :id => 'redmine'
+  
+    
+    should_route :post, "/projects/redmine/repository/edit", :controller => 'repositories', :action => 'edit', :id => 'redmine'
+  end
+
+  context "timelogs" do
+    should_route :get, "/issues/567/time_entries/new", :controller => 'timelog', :action => 'edit', :issue_id => '567'
+    should_route :get, "/projects/ecookbook/time_entries/new", :controller => 'timelog', :action => 'edit', :project_id => 'ecookbook'
+    should_route :get, "/projects/ecookbook/issues/567/time_entries/new", :controller => 'timelog', :action => 'edit', :project_id => 'ecookbook', :issue_id => '567'
+    should_route :get, "/time_entries/22/edit", :controller => 'timelog', :action => 'edit', :id => '22'
+    should_route :get, "/time_entries/report", :controller => 'timelog', :action => 'report'
+    should_route :get, "/projects/567/time_entries/report", :controller => 'timelog', :action => 'report', :project_id => '567'
+    should_route :get, "/projects/567/time_entries/report.csv", :controller => 'timelog', :action => 'report', :project_id => '567', :format => 'csv'
+    should_route :get, "/time_entries", :controller => 'timelog', :action => 'details'
+    should_route :get, "/time_entries.csv", :controller => 'timelog', :action => 'details', :format => 'csv'
+    should_route :get, "/time_entries.atom", :controller => 'timelog', :action => 'details', :format => 'atom'
+    should_route :get, "/projects/567/time_entries", :controller => 'timelog', :action => 'details', :project_id => '567'
+    should_route :get, "/projects/567/time_entries.csv", :controller => 'timelog', :action => 'details', :project_id => '567', :format => 'csv'
+    should_route :get, "/projects/567/time_entries.atom", :controller => 'timelog', :action => 'details', :project_id => '567', :format => 'atom'
+    should_route :get, "/issues/234/time_entries", :controller => 'timelog', :action => 'details', :issue_id => '234'
+    should_route :get, "/issues/234/time_entries.csv", :controller => 'timelog', :action => 'details', :issue_id => '234', :format => 'csv'
+    should_route :get, "/issues/234/time_entries.atom", :controller => 'timelog', :action => 'details', :issue_id => '234', :format => 'atom'
+    should_route :get, "/projects/ecookbook/issues/123/time_entries", :controller => 'timelog', :action => 'details', :project_id => 'ecookbook', :issue_id => '123'
+
+    should_route :post, "/time_entries/55/destroy", :controller => 'timelog', :action => 'destroy', :id => '55'
+  end
+
   context "users" do
     should_route :get, "/users", :controller => 'users', :action => 'index'
     should_route :get, "/users/44", :controller => 'users', :action => 'show', :id => '44'
@@ -88,7 +247,7 @@ class RoutingTest < ActionController::IntegrationTest
     should_route :post, "/projects/foo/versions/new", :controller => 'versions', :action => 'new', :project_id => 'foo'
   end
 
-  context "wikis" do
+  context "wiki (singular, project's pages)" do
     should_route :get, "/projects/567/wiki", :controller => 'wiki', :action => 'index', :id => '567'
     should_route :get, "/projects/567/wiki/lalala", :controller => 'wiki', :action => 'index', :id => '567', :page => 'lalala'
     should_route :get, "/projects/567/wiki/my_page/edit", :controller => 'wiki', :action => 'edit', :id => '567', :page => 'my_page'
@@ -108,6 +267,13 @@ class RoutingTest < ActionController::IntegrationTest
     should_route :post, "/projects/22/wiki/ladida/protect", :controller => 'wiki', :action => 'protect', :id => '22', :page => 'ladida'
   end
 
+  context "wikis (plural, admin setup)" do
+    should_route :get, "/projects/ladida/wiki/destroy", :controller => 'wikis', :action => 'destroy', :id => 'ladida'
+
+    should_route :post, "/projects/ladida/wiki", :controller => 'wikis', :action => 'edit', :id => 'ladida'
+    should_route :post, "/projects/ladida/wiki/destroy", :controller => 'wikis', :action => 'destroy', :id => 'ladida'
+  end
+
   context "administration panel" do
     should_route :get, "/admin/projects", :controller => 'admin', :action => 'projects'
   end