jro_apps/redmine Commit - r2315:765f7abc6033

Converted routing and urls to follow the Rails REST convention....

Converted routing and urls to follow the Rails REST convention. Patch supplied by commits from Gerrit Kaiser on Github. Existing routes will still work (backwards compatible) but any new urls will be generated using the new routing rules. Changes listed below: * made the URLs for some project tabs and project settings follow the new rails RESTful conventions of /collection/:id/subcollection/:sub_id * prettier URL for project roadmap * more nice project URLs * use GET for filtering form * prettified URLs used on issues tab * custom route for activity atom feeds * prettier repository urls * fixed broken route definition * fixed failing tests for issuecontroller that were hardcoding the url string * more RESTful routes for boards and messages * RESTful routes for wiki pages * RESTful routes for documents * moved old routes that are retained for compatibility to the bottom and grouped them together * added RESTful URIs for issues * RESTfulness for the news section * fixed route order * changed hardcoded URLs in tests * fixed badly written tests * fixed forgotten parameter in routes * changed hardcoded URLS to new scheme * changed project add url to the standard POST to collection * create new issue by POSTing to collection * changed hardcoded URLs in integrations tests * made project add form work again * restful routes for project deletion * prettier routes for project (un)archival * made routes table more readable * fixed note quoting * user routing * fixed bug * always sort by GET * Fixed: cross-project issue list should not show issues of projects for which the issue tracking module was disabled. * prettified URLs used on issues tab * urls for time log * fixed reply routing * eliminate revision query paremeter for diff and entry actions * fixed test failures with hard-coded urls * ensure ajax links always use get * refactored ajax link generation into separate method #1901 git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@2317 e93f8b46-1217-0410-a6f0-8f06a7374b81

Eric Davis -

r2315:765f7abc6033

parent child

Context file:

r2315:765f7abc6033

Expand all files

test/functional/issue_relations_controller_test.rb created 644 +22 0

@@ -0,0 +1,22
	1	require File.dirname(__FILE__) + '/../test_helper'
	2	require 'issue_relations_controller'
	3
	4	# Re-raise errors caught by the controller.
	5	class IssueRelationsController; def rescue_action(e) raise e end; end
	6
	7
	8	class IssueRelationsControllerTest < Test::Unit::TestCase
	9	def test_new_routing
	10	assert_routing(
	11	{:method => :post, :path => '/issues/1/relations'},
	12	{:controller => 'issue_relations', :action => 'new', :issue_id => '1'}
	13	)
	14	end
	15
	16	def test_destroy_routing
	17	assert_recognizes( #TODO: use DELETE on issue URI
	18	{:controller => 'issue_relations', :action => 'destroy', :issue_id => '1', :id => '23'},
	19	{:method => :post, :path => '/issues/1/relations/23/destroy'}
	20	)
	21	end
	22	end

test/functional/members_controller_test.rb created 644 +15 0

@@ -0,0 +1,15
	1	require File.dirname(__FILE__) + '/../test_helper'
	2	require 'members_controller'
	3
	4	# Re-raise errors caught by the controller.
	5	class MembersController; def rescue_action(e) raise e end; end
	6
	7
	8	class MembersControllerTest < Test::Unit::TestCase
	9	def test_members_routing
	10	assert_routing(
	11	{:method => :post, :path => 'projects/5234/members/new'},
	12	:controller => 'members', :action => 'new', :id => '5234'
	13	)
	14	end
	15	end

test/functional/reports_controller_test.rb created 644 +20 0

@@ -0,0 +1,20
	1	require File.dirname(__FILE__) + '/../test_helper'
	2	require 'reports_controller'
	3
	4	# Re-raise errors caught by the controller.
	5	class ReportsController; def rescue_action(e) raise e end; end
	6
	7
	8	class ReportsControllerTest < Test::Unit::TestCase
	9	def test_issue_report_routing
	10	assert_routing(
	11	{:method => :get, :path => '/projects/567/issues/report'},
	12	:controller => 'reports', :action => 'issue_report', :id => '567'
	13	)
	14	assert_routing(
	15	{:method => :get, :path => '/projects/567/issues/report/assigned_to'},
	16	:controller => 'reports', :action => 'issue_report', :id => '567', :detail => 'assigned_to'
	17	)
	18
	19	end
	20	end

app/helpers/application_helper.rb +24 -19

             # 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 'coderay'
             require 'coderay/helpers/file_type'
             require 'forwardable'
             require 'cgi'
             module ApplicationHelper
               include Redmine::WikiFormatting::Macros::Definitions
               include GravatarHelper::PublicMethods
               extend Forwardable
               def_delegators :wiki_helper, :wikitoolbar_for, :heads_for_wiki_formatter
               def current_role
                 @current_role ||= User.current.role_for_project(@project)
               end
               # Return true if user is authorized for controller/action, otherwise false
               def authorize_for(controller, action)
                 User.current.allowed_to?({:controller => controller, :action => action}, @project)
               end
               # Display a link if user is authorized
               def link_to_if_authorized(name, options = {}, html_options = nil, *parameters_for_method_reference)
                 link_to(name, options, html_options, *parameters_for_method_reference) if authorize_for(options[:controller] || params[:controller], options[:action])
               end
               # Display a link to remote if user is authorized
               def link_to_remote_if_authorized(name, options = {}, html_options = nil)
                 url = options[:url] || {}
                 link_to_remote(name, options, html_options) if authorize_for(url[:controller] || params[:controller], url[:action])
               end
               # Display a link to user's account page
               def link_to_user(user, options={})
                 (user && !user.anonymous?) ? link_to(user.name(options[:format]), :controller => 'account', :action => 'show', :id => user) : 'Anonymous'
               end
               def link_to_issue(issue, options={})
                 options[:class] ||= ''
                 options[:class] << ' issue'
                 options[:class] << ' closed' if issue.closed?
                 link_to "#{issue.tracker.name} ##{issue.id}", {:controller => "issues", :action => "show", :id => issue}, options
               end
               # Generates a link to an attachment.
               # Options:
               # * :text - Link text (default to attachment filename)
               # * :download - Force download (default: false)
               def link_to_attachment(attachment, options={})
                 text = options.delete(:text) || attachment.filename
                 action = options.delete(:download) ? 'download' : 'show'
                 link_to(h(text), {:controller => 'attachments', :action => action, :id => attachment, :filename => attachment.filename }, options)
               end
               def toggle_link(name, id, options={})
                 onclick = "Element.toggle('#{id}'); "
                 onclick << (options[:focus] ? "Form.Element.focus('#{options[:focus]}'); " : "this.blur(); ")
                 onclick << "return false;"
                 link_to(name, "#", :onclick => onclick)
               end
               def image_to_function(name, function, html_options = {})
                 html_options.symbolize_keys!
                 tag(:input, html_options.merge({
                     :type => "image", :src => image_path(name),
                     :onclick => (html_options[:onclick] ? "#{html_options[:onclick]}; " : "") + "#{function};"
                     }))
               end
               def prompt_to_remote(name, text, param, url, html_options = {})
                 html_options[:onclick] = "promptToRemote('#{text}', '#{param}', '#{url_for(url)}'); return false;"
                 link_to name, {}, html_options
               end
               def format_date(date)
                 return nil unless date
                 # "Setting.date_format.size < 2" is a temporary fix (content of date_format setting changed)
                 @date_format ||= (Setting.date_format.blank? || Setting.date_format.size < 2 ? l(:general_fmt_date) : Setting.date_format)
                 date.strftime(@date_format)
               end
               def format_time(time, include_date = true)
                 return nil unless time
                 time = time.to_time if time.is_a?(String)
                 zone = User.current.time_zone
                 local = zone ? time.in_time_zone(zone) : (time.utc? ? time.localtime : time)
                 @date_format ||= (Setting.date_format.blank? || Setting.date_format.size < 2 ? l(:general_fmt_date) : Setting.date_format)
                 @time_format ||= (Setting.time_format.blank? ? l(:general_fmt_time) : Setting.time_format)
                 include_date ? local.strftime("#{@date_format} #{@time_format}") : local.strftime(@time_format)
               end
               def format_activity_title(text)
                 h(truncate_single_line(text, 100))
               end
               def format_activity_day(date)
                 date == Date.today ? l(:label_today).titleize : format_date(date)
               end
               def format_activity_description(text)
                 h(truncate(text.to_s, 250).gsub(%r{<(pre|code)>.*$}m, '...'))
               end
               def distance_of_date_in_words(from_date, to_date = 0)
                 from_date = from_date.to_date if from_date.respond_to?(:to_date)
                 to_date = to_date.to_date if to_date.respond_to?(:to_date)
                 distance_in_days = (to_date - from_date).abs
                 lwr(:actionview_datehelper_time_in_words_day, distance_in_days)
               end
               def due_date_distance_in_words(date)
                 if date
                   l((date < Date.today ? :label_roadmap_overdue : :label_roadmap_due_in), distance_of_date_in_words(Date.today, date))
                 end
               end
               def render_page_hierarchy(pages, node=nil)
                 content = ''
                 if pages[node]
                   content << "<ul class=\"pages-hierarchy\">\n"
                   pages[node].each do |page|
                     content << "<li>"
                     content << link_to(h(page.pretty_title), {:controller => 'wiki', :action => 'index', :id => page.project, :page => page.title},
                                        :title => (page.respond_to?(:updated_on) ? l(:label_updated_time, distance_of_time_in_words(Time.now, page.updated_on)) : nil))
                     content << "\n" + render_page_hierarchy(pages, page.id) if pages[page.id]
                     content << "</li>\n"
                   end
                   content << "</ul>\n"
                 end
                 content
               end
               # Renders flash messages
               def render_flash_messages
                 s = ''
                 flash.each do |k,v|
                   s << content_tag('div', v, :class => "flash #{k}")
                 end
                 s
               end
               # Renders the project quick-jump box
               def render_project_jump_box
                 # Retrieve them now to avoid a COUNT query
                 projects = User.current.projects.all
                 if projects.any?
                   s = '<select onchange="if (this.value != \'\') { window.location = this.value; }">' +
                         "<option selected='selected'>#{ l(:label_jump_to_a_project) }</option>" +
                         '<option disabled="disabled">---</option>'
                   s << project_tree_options_for_select(projects) do |p|
                     { :value => url_for(:controller => 'projects', :action => 'show', :id => p, :jump => current_menu_item) }
                   end
                   s << '</select>'
                   s
                 end
               end
               def project_tree_options_for_select(projects, options = {})
                 s = ''
                 project_tree(projects) do |project, level|
                   name_prefix = (level > 0 ? ('&nbsp;' * 2 * level + '&#187; ') : '')
                   tag_options = {:value => project.id, :selected => ((project == options[:selected]) ? 'selected' : nil)}
                   tag_options.merge!(yield(project)) if block_given?
                   s << content_tag('option', name_prefix + h(project), tag_options)
                 end
                 s
               end
               # Yields the given block for each project with its level in the tree
               def project_tree(projects, &block)
                 ancestors = []
                 projects.sort_by(&:lft).each do |project|
                   while (ancestors.any? && !project.is_descendant_of?(ancestors.last))
                     ancestors.pop
                   end
                   yield project, ancestors.size
                   ancestors << project
                 end
               end
               # Truncates and returns the string as a single line
               def truncate_single_line(string, *args)
                 truncate(string, *args).gsub(%r{[\r\n]+}m, ' ')
               end
               def html_hours(text)
                 text.gsub(%r{(\d+)\.(\d+)}, '<span class="hours hours-int">\1</span><span class="hours hours-dec">.\2</span>')
               end
               def authoring(created, author, options={})
                 time_tag = @project.nil? ? content_tag('acronym', distance_of_time_in_words(Time.now, created), :title => format_time(created)) :
                                            link_to(distance_of_time_in_words(Time.now, created),
                                                    {:controller => 'projects', :action => 'activity', :id => @project, :from => created.to_date},
                                                    :title => format_time(created))
                 author_tag = (author.is_a?(User) && !author.anonymous?) ? link_to(h(author), :controller => 'account', :action => 'show', :id => author) : h(author || 'Anonymous')
                 l(options[:label] || :label_added_time_by, author_tag, time_tag)
               end
               def l_or_humanize(s, options={})
                 k = "#{options[:prefix]}#{s}".to_sym
                 l_has_string?(k) ? l(k) : s.to_s.humanize
               end
               def day_name(day)
                 l(:general_day_names).split(',')[day-1]
               end
               def month_name(month)
                 l(:actionview_datehelper_select_month_names).split(',')[month-1]
               end
               def syntax_highlight(name, content)
                 type = CodeRay::FileType[name]
                 type ? CodeRay.scan(content, type).html : h(content)
               end
               def to_path_param(path)
                 path.to_s.split(%r{[/\\]}).select {|p| !p.blank?}
               end
               def pagination_links_full(paginator, count=nil, options={})
                 page_param = options.delete(:page_param) || :page
                 url_param = params.dup
                 # don't reuse params if filters are present
                 url_param.clear if url_param.has_key?(:set_filter)
                 html = ''
-                html << link_to_remote(('&#171; ' + l(:label_previous)),
+                if paginator.current.previous
-                                        {:update => 'content',
+                  html << link_to_remote_content_update('&#171; ' + l(:label_previous), url_param.merge(page_param => paginator.current.previous)) + ' '
-                                         :url => url_param.merge(page_param => paginator.current.previous),
+                end
-                                         :complete => 'window.scrollTo(0,0)'},
-                                        {:href => url_for(:params => url_param.merge(page_param => paginator.current.previous))}) + ' ' if paginator.current.previous
                 html << (pagination_links_each(paginator, options) do |n|
-                  link_to_remote(n.to_s,
+                  link_to_remote_content_update(n.to_s, url_param.merge(page_param => n))
-                                  {:url => {:params => url_param.merge(page_param => n)},
-                                   :update => 'content',
-                                   :complete => 'window.scrollTo(0,0)'},
-                                  {:href => url_for(:params => url_param.merge(page_param => n))})
                 end || '')
-                html << ' ' + link_to_remote((l(:label_next) + ' &#187;'),
+                if paginator.current.next
-                                             {:update => 'content',
+                  html << ' ' + link_to_remote_content_update((l(:label_next) + ' &#187;'), url_param.merge(page_param => paginator.current.next))
-                                              :url => url_param.merge(page_param => paginator.current.next),
+                end
-                                              :complete => 'window.scrollTo(0,0)'},
-                                             {:href => url_for(:params => url_param.merge(page_param => paginator.current.next))}) if paginator.current.next
                 unless count.nil?
-                  html << [" (#{paginator.current.first_item}-#{paginator.current.last_item}/#{count})", per_page_links(paginator.items_per_page)].compact.join(' | ')
+                  html << [
+                    " (#{paginator.current.first_item}-#{paginator.current.last_item}/#{count})",
+                    per_page_links(paginator.items_per_page)
+                  ].compact.join(' | ')
                 end
                 html
               end
               def per_page_links(selected=nil)
                 url_param = params.dup
                 url_param.clear if url_param.has_key?(:set_filter)
                 links = Setting.per_page_options_array.collect do |n|
-                  n == selected ? n : link_to_remote(n, {:update => "content", :url => params.dup.merge(:per_page => n)},
+                  n == selected ? n : link_to_remote(n, {:update => "content",
+                                                         :url => params.dup.merge(:per_page => n),
+                                                         :method => :get},
                                                         {:href => url_for(url_param.merge(:per_page => n))})
                 end
                 links.size > 1 ? l(:label_display_per_page, links.join(', ')) : nil
               end
               def breadcrumb(*args)
                 elements = args.flatten
                 elements.any? ? content_tag('p', args.join(' &#187; ') + ' &#187; ', :class => 'breadcrumb') : nil
               end
               def html_title(*args)
                 if args.empty?
                   title = []
                   title << @project.name if @project
                   title += @html_title if @html_title
                   title << Setting.app_title
                   title.compact.join(' - ')
                 else
                   @html_title ||= []
                   @html_title += args
                 end
               end
               def accesskey(s)
                 Redmine::AccessKeys.key_for s
               end
               # Formats text according to system settings.
               # 2 ways to call this method:
               # * with a String: textilizable(text, options)
               # * with an object and one of its attribute: textilizable(issue, :description, options)
               def textilizable(*args)
                 options = args.last.is_a?(Hash) ? args.pop : {}
                 case args.size
                 when 1
                   obj = options[:object]
                   text = args.shift
                 when 2
                   obj = args.shift
                   text = obj.send(args.shift).to_s
                 else
                   raise ArgumentError, 'invalid arguments to textilizable'
                 end
                 return '' if text.blank?
                 only_path = options.delete(:only_path) == false ? false : true
                 # when using an image link, try to use an attachment, if possible
                 attachments = options[:attachments] || (obj && obj.respond_to?(:attachments) ? obj.attachments : nil)
                 if attachments
                   attachments = attachments.sort_by(&:created_on).reverse
                   text = text.gsub(/!((\<|\=|\>)?(\([^\)]+\))?(\[[^\]]+\])?(\{[^\}]+\})?)(\S+\.(bmp|gif|jpg|jpeg|png))!/i) do |m|
                     style = $1
                     filename = $6
                     rf = Regexp.new(Regexp.escape(filename),  Regexp::IGNORECASE)
                     # search for the picture in attachments
                     if found = attachments.detect { |att| att.filename =~ rf }
                       image_url = url_for :only_path => only_path, :controller => 'attachments', :action => 'download', :id => found
                       desc = found.description.to_s.gsub(/^([^\(\)]*).*$/, "\\1")
                       alt = desc.blank? ? nil : "(#{desc})"
                       "!#{style}#{image_url}#{alt}!"
                     else
                       "!#{style}#{filename}!"
                     end
                   end
                 end
                 text = Redmine::WikiFormatting.to_html(Setting.text_formatting, text) { |macro, args| exec_macro(macro, obj, args) }
                 # different methods for formatting wiki links
                 case options[:wiki_links]
                 when :local
                   # used for local links to html files
                   format_wiki_link = Proc.new {|project, title, anchor| "#{title}.html" }
                 when :anchor
                   # used for single-file wiki export
                   format_wiki_link = Proc.new {|project, title, anchor| "##{title}" }
                 else
                   format_wiki_link = Proc.new {|project, title, anchor| url_for(:only_path => only_path, :controller => 'wiki', :action => 'index', :id => project, :page => title, :anchor => anchor) }
                 end
                 project = options[:project] || @project || (obj && obj.respond_to?(:project) ? obj.project : nil)
                 # Wiki links
                 #
                 # Examples:
                 #   [[mypage]]
                 #   [[mypage|mytext]]
                 # wiki links can refer other project wikis, using project name or identifier:
                 #   [[project:]] -> wiki starting page
                 #   [[project:|mytext]]
                 #   [[project:mypage]]
                 #   [[project:mypage|mytext]]
                 text = text.gsub(/(!)?(\[\[([^\]\n\|]+)(\|([^\]\n\|]+))?\]\])/) do |m|
                   link_project = project
                   esc, all, page, title = $1, $2, $3, $5
                   if esc.nil?
                     if page =~ /^([^\:]+)\:(.*)$/
                       link_project = Project.find_by_name($1) || Project.find_by_identifier($1)
                       page = $2
                       title ||= $1 if page.blank?
                     end
                     if link_project && link_project.wiki
                       # extract anchor
                       anchor = nil
                       if page =~ /^(.+?)\#(.+)$/
                         page, anchor = $1, $2
                       end
                       # check if page exists
                       wiki_page = link_project.wiki.find_page(page)
                       link_to((title || page), format_wiki_link.call(link_project, Wiki.titleize(page), anchor),
                                                :class => ('wiki-page' + (wiki_page ? '' : ' new')))
                     else
                       # project or wiki doesn't exist
                       title || page
                     end
                   else
                     all
                   end
                 end
                 # Redmine links
                 #
                 # Examples:
                 #   Issues:
                 #     #52 -> Link to issue #52
                 #   Changesets:
                 #     r52 -> Link to revision 52
                 #     commit:a85130f -> Link to scmid starting with a85130f
                 #   Documents:
                 #     document#17 -> Link to document with id 17
                 #     document:Greetings -> Link to the document with title "Greetings"
                 #     document:"Some document" -> Link to the document with title "Some document"
                 #   Versions:
                 #     version#3 -> Link to version with id 3
                 #     version:1.0.0 -> Link to version named "1.0.0"
                 #     version:"1.0 beta 2" -> Link to version named "1.0 beta 2"
                 #   Attachments:
                 #     attachment:file.zip -> Link to the attachment of the current object named file.zip
                 #   Source files:
                 #     source:some/file -> Link to the file located at /some/file in the project's repository
                 #     source:some/file@52 -> Link to the file's revision 52
                 #     source:some/file#L120 -> Link to line 120 of the file
                 #     source:some/file@52#L120 -> Link to line 120 of the file's revision 52
                 #     export:some/file -> Force the download of the file
                 #  Forum messages:
                 #     message#1218 -> Link to message with id 1218
                 text = text.gsub(%r{([\s\(,\-\>]|^)(!)?(attachment|document|version|commit|source|export|message)?((#|r)(\d+)|(:)([^"\s<>][^\s<>]*?|"[^"]+?"))(?=(?=[[:punct:]]\W)|\s|<|$)}) do |m|
                   leading, esc, prefix, sep, oid = $1, $2, $3, $5 || $7, $6 || $8
                   link = nil
                   if esc.nil?
                     if prefix.nil? && sep == 'r'
                       if project && (changeset = project.changesets.find_by_revision(oid))
                         link = link_to("r#{oid}", {:only_path => only_path, :controller => 'repositories', :action => 'revision', :id => project, :rev => oid},
                                                   :class => 'changeset',
                                                   :title => truncate_single_line(changeset.comments, 100))
                       end
                     elsif sep == '#'
                       oid = oid.to_i
                       case prefix
                       when nil
                         if issue = Issue.find_by_id(oid, :include => [:project, :status], :conditions => Project.visible_by(User.current))
                           link = link_to("##{oid}", {:only_path => only_path, :controller => 'issues', :action => 'show', :id => oid},
                                                     :class => (issue.closed? ? 'issue closed' : 'issue'),
                                                     :title => "#{truncate(issue.subject, 100)} (#{issue.status.name})")
                           link = content_tag('del', link) if issue.closed?
                         end
                       when 'document'
                         if document = Document.find_by_id(oid, :include => [:project], :conditions => Project.visible_by(User.current))
                           link = link_to h(document.title), {:only_path => only_path, :controller => 'documents', :action => 'show', :id => document},
                                                             :class => 'document'
                         end
                       when 'version'
                         if version = Version.find_by_id(oid, :include => [:project], :conditions => Project.visible_by(User.current))
                           link = link_to h(version.name), {:only_path => only_path, :controller => 'versions', :action => 'show', :id => version},
                                                           :class => 'version'
                         end
                       when 'message'
                         if message = Message.find_by_id(oid, :include => [:parent, {:board => :project}], :conditions => Project.visible_by(User.current))
                           link = link_to h(truncate(message.subject, 60)), {:only_path => only_path,
                                                                             :controller => 'messages',
                                                                             :action => 'show',
                                                                             :board_id => message.board,
                                                                             :id => message.root,
                                                                             :anchor => (message.parent ? "message-#{message.id}" : nil)},
                                                              :class => 'message'
                         end
                       end
                     elsif sep == ':'
                       # removes the double quotes if any
                       name = oid.gsub(%r{^"(.*)"$}, "\\1")
                       case prefix
                       when 'document'
                         if project && document = project.documents.find_by_title(name)
                           link = link_to h(document.title), {:only_path => only_path, :controller => 'documents', :action => 'show', :id => document},
                                                             :class => 'document'
                         end
                       when 'version'
                         if project && version = project.versions.find_by_name(name)
                           link = link_to h(version.name), {:only_path => only_path, :controller => 'versions', :action => 'show', :id => version},
                                                           :class => 'version'
                         end
                       when 'commit'
                         if project && (changeset = project.changesets.find(:first, :conditions => ["scmid LIKE ?", "#{name}%"]))
                           link = link_to h("#{name}"), {:only_path => only_path, :controller => 'repositories', :action => 'revision', :id => project, :rev => changeset.revision},
                                                        :class => 'changeset',
                                                        :title => truncate_single_line(changeset.comments, 100)
                         end
                       when 'source', 'export'
                         if project && project.repository
                           name =~ %r{^[/\\]*(.*?)(@([0-9a-f]+))?(#(L\d+))?$}
                           path, rev, anchor = $1, $3, $5
                           link = link_to h("#{prefix}:#{name}"), {:controller => 'repositories', :action => 'entry', :id => project,
                                                                   :path => to_path_param(path),
                                                                   :rev => rev,
                                                                   :anchor => anchor,
                                                                   :format => (prefix == 'export' ? 'raw' : nil)},
                                                                  :class => (prefix == 'export' ? 'source download' : 'source')
                         end
                       when 'attachment'
                         if attachments && attachment = attachments.detect {|a| a.filename == name }
                           link = link_to h(attachment.filename), {:only_path => only_path, :controller => 'attachments', :action => 'download', :id => attachment},
                                                                  :class => 'attachment'
                         end
                       end
                     end
                   end
                   leading + (link || "#{prefix}#{sep}#{oid}")
                 end
                 text
               end
               # Same as Rails' simple_format helper without using paragraphs
               def simple_format_without_paragraph(text)
                 text.to_s.
                   gsub(/\r\n?/, "\n").                    # \r\n and \r -> \n
                   gsub(/\n\n+/, "<br /><br />").          # 2+ newline  -> 2 br
                   gsub(/([^\n]\n)(?=[^\n])/, '\1<br />')  # 1 newline   -> br
               end
               def error_messages_for(object_name, options = {})
                 options = options.symbolize_keys
                 object = instance_variable_get("@#{object_name}")
                 if object && !object.errors.empty?
                   # build full_messages here with controller current language
                   full_messages = []
                   object.errors.each do |attr, msg|
                     next if msg.nil?
                     msg = msg.first if msg.is_a? Array
                     if attr == "base"
                       full_messages << l(msg)
                     else
                       full_messages << "&#171; " + (l_has_string?("field_" + attr) ? l("field_" + attr) : object.class.human_attribute_name(attr)) + " &#187; " + l(msg) unless attr == "custom_values"
                     end
                   end
                   # retrieve custom values error messages
                   if object.errors[:custom_values]
                     object.custom_values.each do |v|
                       v.errors.each do |attr, msg|
                         next if msg.nil?
                         msg = msg.first if msg.is_a? Array
                         full_messages << "&#171; " + v.custom_field.name + " &#187; " + l(msg)
                       end
                     end
                   end
                   content_tag("div",
                     content_tag(
                       options[:header_tag] || "span", lwr(:gui_validation_error, full_messages.length) + ":"
                     ) +
                     content_tag("ul", full_messages.collect { |msg| content_tag("li", msg) }),
                     "id" => options[:id] || "errorExplanation", "class" => options[:class] || "errorExplanation"
                   )
                 else
                   ""
                 end
               end
               def lang_options_for_select(blank=true)
                 (blank ? [["(auto)", ""]] : []) +
                   GLoc.valid_languages.collect{|lang| [ ll(lang.to_s, :general_lang_name), lang.to_s]}.sort{|x,y| x.last <=> y.last }
               end
               def label_tag_for(name, option_tags = nil, options = {})
                 label_text = l(("field_"+field.to_s.gsub(/\_id$/, "")).to_sym) + (options.delete(:required) ? @template.content_tag("span", " *", :class => "required"): "")
                 content_tag("label", label_text)
               end
               def labelled_tabular_form_for(name, object, options, &proc)
                 options[:html] ||= {}
                 options[:html][:class] = 'tabular' unless options[:html].has_key?(:class)
                 form_for(name, object, options.merge({ :builder => TabularFormBuilder, :lang => current_language}), &proc)
               end
               def back_url_hidden_field_tag
                 back_url = params[:back_url] || request.env['HTTP_REFERER']
                 back_url = CGI.unescape(back_url.to_s)
                 hidden_field_tag('back_url', CGI.escape(back_url)) unless back_url.blank?
               end
               def check_all_links(form_name)
                 link_to_function(l(:button_check_all), "checkAll('#{form_name}', true)") +
                 " | " +
                 link_to_function(l(:button_uncheck_all), "checkAll('#{form_name}', false)")
               end
               def progress_bar(pcts, options={})
                 pcts = [pcts, pcts] unless pcts.is_a?(Array)
                 pcts[1] = pcts[1] - pcts[0]
                 pcts << (100 - pcts[1] - pcts[0])
                 width = options[:width] || '100px;'
                 legend = options[:legend] || ''
                 content_tag('table',
                   content_tag('tr',
                     (pcts[0] > 0 ? content_tag('td', '', :style => "width: #{pcts[0].floor}%;", :class => 'closed') : '') +
                     (pcts[1] > 0 ? content_tag('td', '', :style => "width: #{pcts[1].floor}%;", :class => 'done') : '') +
                     (pcts[2] > 0 ? content_tag('td', '', :style => "width: #{pcts[2].floor}%;", :class => 'todo') : '')
                   ), :class => 'progress', :style => "width: #{width};") +
                   content_tag('p', legend, :class => 'pourcent')
               end
               def context_menu_link(name, url, options={})
                 options[:class] ||= ''
                 if options.delete(:selected)
                   options[:class] << ' icon-checked disabled'
                   options[:disabled] = true
                 end
                 if options.delete(:disabled)
                   options.delete(:method)
                   options.delete(:confirm)
                   options.delete(:onclick)
                   options[:class] << ' disabled'
                   url = '#'
                 end
                 link_to name, url, options
               end
               def calendar_for(field_id)
                 include_calendar_headers_tags
                 image_tag("calendar.png", {:id => "#{field_id}_trigger",:class => "calendar-trigger"}) +
                 javascript_tag("Calendar.setup({inputField : '#{field_id}', ifFormat : '%Y-%m-%d', button : '#{field_id}_trigger' });")
               end
               def include_calendar_headers_tags
                 unless @calendar_headers_tags_included
                   @calendar_headers_tags_included = true
                   content_for :header_tags do
                     javascript_include_tag('calendar/calendar') +
                     javascript_include_tag("calendar/lang/calendar-#{current_language}.js") +
                     javascript_include_tag('calendar/calendar-setup') +
                     stylesheet_link_tag('calendar')
                   end
                 end
               end
               def content_for(name, content = nil, &block)
                 @has_content ||= {}
                 @has_content[name] = true
                 super(name, content, &block)
               end
               def has_content?(name)
                 (@has_content && @has_content[name]) || false
               end
               # Returns the avatar image tag for the given +user+ if avatars are enabled
               # +user+ can be a User or a string that will be scanned for an email address (eg. 'joe <joe@foo.bar>')
               def avatar(user, options = { })
                 if Setting.gravatar_enabled?
                   email = nil
                   if user.respond_to?(:mail)
                     email = user.mail
                   elsif user.to_s =~ %r{<(.+?)>}
                     email = $1
                   end
                   return gravatar(email.to_s.downcase, options) unless email.blank? rescue nil
                 end
               end
               private
               def wiki_helper
                 helper = Redmine::WikiFormatting.helper_for(Setting.text_formatting)
                 extend helper
                 return self
               end
+              def link_to_remote_content_update(text, url_params)
+                link_to_remote(text,
+                  {:url => url_params, :method => :get, :update => 'content', :complete => 'window.scrollTo(0,0)'},
+                  {:href => url_for(:params => url_params)}
+                )
+              end
             end

app/helpers/sort_helper.rb +1 -1

             # Helpers to sort tables using clickable column headers.
             #
             # Author:  Stuart Rackham <srackham@methods.co.nz>, March 2005.
             # License: This source code is released under the MIT license.
             #
             # - Consecutive clicks toggle the column's sort order.
             # - Sort state is maintained by a session hash entry.
             # - Icon image identifies sort column and state.
             # - Typically used in conjunction with the Pagination module.
             #
             # Example code snippets:
             #
             # Controller:
             #
             #   helper :sort
             #   include SortHelper
             #
             #   def list
             #     sort_init 'last_name'
             #     sort_update
             #     @items = Contact.find_all nil, sort_clause
             #   end
             #
             # Controller (using Pagination module):
             #
             #   helper :sort
             #   include SortHelper
             #
             #   def list
             #     sort_init 'last_name'
             #     sort_update
             #     @contact_pages, @items = paginate :contacts,
             #       :order_by => sort_clause,
             #       :per_page => 10
             #   end
             #
             # View (table header in list.rhtml):
             #
             #   <thead>
             #     <tr>
             #       <%= sort_header_tag('id', :title => 'Sort by contact ID') %>
             #       <%= sort_header_tag('last_name', :caption => 'Name') %>
             #       <%= sort_header_tag('phone') %>
             #       <%= sort_header_tag('address', :width => 200) %>
             #     </tr>
             #   </thead>
             #
             # - The ascending and descending sort icon images are sort_asc.png and
             #   sort_desc.png and reside in the application's images directory.
             # - Introduces instance variables: @sort_name, @sort_default.
             # - Introduces params :sort_key and :sort_order.
             #
             module SortHelper
               # Initializes the default sort column (default_key) and sort order
               # (default_order).
               #
               # - default_key is a column attribute name.
               # - default_order is 'asc' or 'desc'.
               # - name is the name of the session hash entry that stores the sort state,
               #   defaults to '<controller_name>_sort'.
               #
               def sort_init(default_key, default_order='asc', name=nil)
                 @sort_name = name || params[:controller] + params[:action] + '_sort'
                 @sort_default = {:key => default_key, :order => default_order}
               end
               # Updates the sort state. Call this in the controller prior to calling
               # sort_clause.
               # sort_keys can be either an array or a hash of allowed keys
               def sort_update(sort_keys)
                 sort_key = params[:sort_key]
                 sort_key = nil unless (sort_keys.is_a?(Array) ? sort_keys.include?(sort_key) : sort_keys[sort_key])
                 sort_order = (params[:sort_order] == 'desc' ? 'DESC' : 'ASC')
                 if sort_key
                   sort = {:key => sort_key, :order => sort_order}
                 elsif session[@sort_name]
                   sort = session[@sort_name]   # Previous sort.
                 else
                   sort = @sort_default
                 end
                 session[@sort_name] = sort
                 sort_column = (sort_keys.is_a?(Hash) ? sort_keys[sort[:key]] : sort[:key])
                 @sort_clause = (sort_column.blank? ? nil : "#{sort_column} #{sort[:order]}")
               end
               # Returns an SQL sort clause corresponding to the current sort state.
               # Use this to sort the controller's table items collection.
               #
               def sort_clause()
                 @sort_clause
               end
               # Returns a link which sorts by the named column.
               #
               # - column is the name of an attribute in the sorted record collection.
               # - The optional caption explicitly specifies the displayed link text.
               # - A sort icon image is positioned to the right of the sort link.
               #
               def sort_link(column, caption, default_order)
                 key, order = session[@sort_name][:key], session[@sort_name][:order]
                 if key == column
                   if order.downcase == 'asc'
                     icon = 'sort_asc.png'
                     order = 'desc'
                   else
                     icon = 'sort_desc.png'
                     order = 'asc'
                   end
                 else
                   icon = nil
                   order = default_order
                 end
                 caption = titleize(Inflector::humanize(column)) unless caption
                 sort_options = { :sort_key => column, :sort_order => order }
                 # don't reuse params if filters are present
                 url_options = params.has_key?(:set_filter) ? sort_options : params.merge(sort_options)
                 link_to_remote(caption,
-                              {:update => "content", :url => url_options},
+                              {:update => "content", :url => url_options, :method => :get},
                               {:href => url_for(url_options)}) +
                 (icon ? nbsp(2) + image_tag(icon) : '')
               end
               # Returns a table header <th> tag with a sort link for the named column
               # attribute.
               #
               # Options:
               #   :caption     The displayed link name (defaults to titleized column name).
               #   :title       The tag's 'title' attribute (defaults to 'Sort by :caption').
               #
               # Other options hash entries generate additional table header tag attributes.
               #
               # Example:
               #
               #   <%= sort_header_tag('id', :title => 'Sort by contact ID', :width => 40) %>
               #
               # Renders:
               #
               #   <th title="Sort by contact ID" width="40">
               #     <a href="/contact/list?sort_order=desc&amp;sort_key=id">Id</a>
               #     &nbsp;&nbsp;<img alt="Sort_asc" src="/images/sort_asc.png" />
               #   </th>
               #
               def sort_header_tag(column, options = {})
                 caption = options.delete(:caption) || titleize(Inflector::humanize(column))
                 default_order = options.delete(:default_order) || 'asc'
                 options[:title]= l(:label_sort_by, "\"#{caption}\"") unless options[:title]
                 content_tag('th', sort_link(column, caption, default_order), options)
               end
               private
                 # Return n non-breaking spaces.
                 def nbsp(n)
                   '&nbsp;' * n
                 end
                 # Return capitalized title.
                 def titleize(title)
                   title.split.map {|w| w.capitalize }.join(' ')
                 end
             end

app/views/projects/changelog.rhtml +1 -1

             <h2><%=l(:label_change_log)%></h2>
             <% if @versions.empty? %>
             <p class="nodata"><%= l(:label_no_data) %></p>
             <% end %>
             <% @versions.each do |version| %>
                 <a name="<%= version.name %>"><h3 class="icon22 icon22-package"><%= version.name %></h3></a>
                 <% if version.effective_date %>
                   <p><%= format_date(version.effective_date) %></p>
                 <% end %>
                 <p><%=h version.description %></p>
                 <% issues = version.fixed_issues.find(:all,
                                              :include => [:status, :tracker],
                                              :conditions => ["#{IssueStatus.table_name}.is_closed=? AND #{Issue.table_name}.tracker_id in (#{@selected_tracker_ids.join(',')})", true],
                                              :order => "#{Tracker.table_name}.position") unless @selected_tracker_ids.empty?
                    issues ||= []
                 %>
                 <% if !issues.empty? %>
                 <ul>
                   <% issues.each do |issue| %>
                     <li><%= link_to_issue(issue) %>: <%=h issue.subject %></li>
                   <% end %>
                 </ul>
                 <% end %>
             <% end %>
             <% content_for :sidebar do %>
-            <% form_tag do %>
+            <% form_tag({},:method => :get) do %>
             <h3><%= l(:label_change_log) %></h3>
             <% @trackers.each do |tracker| %>
               <label><%= check_box_tag "tracker_ids[]", tracker.id, (@selected_tracker_ids.include? tracker.id.to_s) %>
               <%= tracker.name %></label><br />
             <% end %>
             <p><%= submit_tag l(:button_apply), :class => 'button-small' %></p>
             <% end %>
             <h3><%= l(:label_version_plural) %></h3>
             <% @versions.each do |version| %>
             <%= link_to version.name, :anchor => version.name %><br />
             <% end %>
             <% end %>

app/views/timelog/details.rhtml +3 -1

             <div class="contextual">
             <%= link_to_if_authorized l(:button_log_time), {:controller => 'timelog', :action => 'edit', :project_id => @project, :issue_id => @issue}, :class => 'icon icon-time' %>
             </div>
             <%= render_timelog_breadcrumb %>
             <h2><%= l(:label_spent_time) %></h2>
-            <% form_remote_tag( :url => {}, :method => :get, :update => 'content' ) do %>
+            <% form_remote_tag( :url => {}, :html => {:method => :get}, :method => :get, :update => 'content' ) do %>
+            <%# TOOD: remove the project_id and issue_id hidden fields, that information is
+            already in the URI %>
             <%= hidden_field_tag 'project_id', params[:project_id] %>
             <%= hidden_field_tag 'issue_id', params[:issue_id] if @issue %>
             <%= render :partial => 'date_range' %>
             <% end %>
             <div class="total-hours">
             <p><%= l(:label_total) %>: <%= html_hours(lwr(:label_f_hour, @total_hours)) %></p>
             </div>
             <% unless @entries.empty? %>
             <%= render :partial => 'list', :locals => { :entries => @entries }%>
             <p class="pagination"><%= pagination_links_full @entry_pages, @entry_count %></p>
             <p class="other-formats">
             <%= l(:label_export_to) %>
             <span><%= link_to 'Atom', {:issue_id => @issue, :format => 'atom', :key => User.current.rss_key}, :class => 'feed' %></span>
             <span><%= link_to 'CSV', params.merge(:format => 'csv'), :class => 'csv' %></span>
             </p>
             <% end %>
             <% html_title l(:label_spent_time), l(:label_details) %>
             <% content_for :header_tags do %>
                 <%= auto_discovery_link_tag(:atom, {:issue_id => @issue, :format => 'atom', :key => User.current.rss_key}, :title => l(:label_spent_time)) %>
             <% end %>

app/views/timelog/report.rhtml +3 -1

             <div class="contextual">
             <%= link_to_if_authorized l(:button_log_time), {:controller => 'timelog', :action => 'edit', :project_id => @project, :issue_id => @issue}, :class => 'icon icon-time' %>
             </div>
             <%= render_timelog_breadcrumb %>
             <h2><%= l(:label_spent_time) %></h2>
-            <% form_remote_tag(:url => {}, :update => 'content') do %>
+            <% form_remote_tag(:url => {}, :html => {:method => :get}, :method => :get, :update => 'content') do %>
               <% @criterias.each do |criteria| %>
                 <%= hidden_field_tag 'criterias[]', criteria, :id => nil %>
               <% end %>
+              <%# TODO: get rid of the project_id field, that should already be in the URL %>
               <%= hidden_field_tag 'project_id', params[:project_id] %>
               <%= render :partial => 'date_range' %>
               <p><%= l(:label_details) %>: <%= select_tag 'columns', options_for_select([[l(:label_year), 'year'],
                                                                                         [l(:label_month), 'month'],
                                                                                         [l(:label_week), 'week'],
                                                                                         [l(:label_day_plural).titleize, 'day']], @columns),
                                                                     :onchange => "this.form.onsubmit();" %>
               <%= l(:button_add) %>: <%= select_tag('criterias[]', options_for_select([[]] + (@available_criterias.keys - @criterias).collect{|k| [l(@available_criterias[k][:label]), k]}),
                                                                       :onchange => "this.form.onsubmit();",
                                                                       :style => 'width: 200px',
                                                                       :id => nil,
                                                                       :disabled => (@criterias.length >= 3)) %>
                  <%= link_to_remote l(:button_clear), {:url => {:project_id => @project, :period_type => params[:period_type], :period => params[:period], :from => @from, :to => @to, :columns => @columns},
+                                                       :method => :get,
                                                        :update => 'content'
                                                       }, :class => 'icon icon-reload' %></p>
             <% end %>
             <% unless @criterias.empty? %>
             <div class="total-hours">
             <p><%= l(:label_total) %>: <%= html_hours(lwr(:label_f_hour, @total_hours)) %></p>
             </div>
             <% unless @hours.empty? %>
             <table class="list" id="time-report">
             <thead>
             <tr>
             <% @criterias.each do |criteria| %>
               <th><%= l(@available_criterias[criteria][:label]) %></th>
             <% end %>
             <% columns_width = (40 / (@periods.length+1)).to_i %>
             <% @periods.each do |period| %>
               <th class="period" width="<%= columns_width %>%"><%= period %></th>
             <% end %>
               <th class="total" width="<%= columns_width %>%"><%= l(:label_total) %></th>
             </tr>
             </thead>
             <tbody>
             <%= render :partial => 'report_criteria', :locals => {:criterias => @criterias, :hours => @hours, :level => 0} %>
               <tr class="total">
               <td><%= l(:label_total) %></td>
               <%= '<td></td>' * (@criterias.size - 1) %>
               <% total = 0 -%>
               <% @periods.each do |period| -%>
                 <% sum = sum_hours(select_hours(@hours, @columns, period.to_s)); total += sum -%>
                 <td class="hours"><%= html_hours("%.2f" % sum) if sum > 0 %></td>
               <% end -%>
               <td class="hours"><%= html_hours("%.2f" % total) if total > 0 %></td>
               </tr>
             </tbody>
             </table>
             <p class="other-formats">
             <%= l(:label_export_to) %>
             <span><%= link_to 'CSV', params.merge({:format => 'csv'}), :class => 'csv' %></span>
             </p>
             <% end %>
             <% end %>
             <% html_title l(:label_spent_time), l(:label_report) %>

app/views/users/_general.rhtml +1 -1

-            <% labelled_tabular_form_for :user, @user, :url => { :action => "edit" } do |f| %>
+            <% labelled_tabular_form_for :user, @user, :url => { :action => "edit", :tab => nil } do |f| %>
             <%= render :partial => 'form', :locals => { :f => f } %>
             <%= submit_tag l(:button_save) %>
             <% end %>

config/routes.rb +214 -12

@@ -1,51 +1,253
1	ActionController::Routing::Routes.draw do \|map\|	1	ActionController::Routing::Routes.draw do \|map\|
2	# Add your own custom routes here.	2	# Add your own custom routes here.
3	# The priority is based upon order of creation: first created -> highest priority.	3	# The priority is based upon order of creation: first created -> highest priority.
4		4
5	# Here's a sample route:	5	# Here's a sample route:
6	# map.connect 'products/:id', :controller => 'catalog', :action => 'view'	6	# map.connect 'products/:id', :controller => 'catalog', :action => 'view'
7	# Keep in mind you can assign values other than :controller and :action	7	# Keep in mind you can assign values other than :controller and :action
8		8
9	# Allow Redmine plugins to map routes and potentially override them	9	# Allow Redmine plugins to map routes and potentially override them
10	Rails.plugins.each do \|plugin\|	10	Rails.plugins.each do \|plugin\|
11	map.from_plugin plugin.name.to_sym	11	map.from_plugin plugin.name.to_sym
12	end	12	end
13		13
14	map.home '', :controller => 'welcome'	14	map.home '', :controller => 'welcome'
		15
15	map.signin 'login', :controller => 'account', :action => 'login'	16	map.signin 'login', :controller => 'account', :action => 'login'
16	map.signout 'logout', :controller => 'account', :action => 'logout'	17	map.signout 'logout', :controller => 'account', :action => 'logout'
17		18
18	map.connect 'wiki/:id/:page/:action', :controller => 'wiki', :page => nil
19	map.connect 'roles/workflow/:id/:role_id/:tracker_id', :controller => 'roles', :action => 'workflow'	19	map.connect 'roles/workflow/:id/:role_id/:tracker_id', :controller => 'roles', :action => 'workflow'
20	map.connect 'help/:ctrl/:page', :controller => 'help'	20	map.connect 'help/:ctrl/:page', :controller => 'help'
21	#map.connect ':controller/:action/:id/:sort_key/:sort_order'
22		21
23	map.connect '~~issues/:issue_id/relations/:action/:id~~', :controller => '~~issue_relations~~'	22	map.connect 'time_entries/:id/edit', :action => 'edit', :controller => 'timelog'
		23	map.connect 'projects/:project_id/time_entries/new', :action => 'edit', :controller => 'timelog'
		24	map.connect 'projects/:project_id/issues/:issue_id/time_entries/new', :action => 'edit', :controller => 'timelog'
		25
		26	map.with_options :controller => 'timelog' do \|timelog\|
		27	timelog.connect 'projects/:project_id/time_entries', :action => 'details'
		28
		29	timelog.with_options :action => 'details', :conditions => {:method => :get} do \|time_details\|
		30	time_details.connect 'time_entries'
		31	time_details.connect 'time_entries.:format'
		32	time_details.connect 'issues/:issue_id/time_entries'
		33	time_details.connect 'issues/:issue_id/time_entries.:format'
		34	time_details.connect 'projects/:project_id/time_entries.:format'
		35	time_details.connect 'projects/:project_id/issues/:issue_id/time_entries'
		36	time_details.connect 'projects/:project_id/issues/:issue_id/time_entries.:format'
		37	end
		38	timelog.connect 'projects/:project_id/time_entries/report', :action => 'report'
		39	timelog.with_options :action => 'report',:conditions => {:method => :get} do \|time_report\|
		40	time_report.connect 'time_entries/report'
		41	time_report.connect 'time_entries/report.:format'
		42	time_report.connect 'projects/:project_id/time_entries/report.:format'
		43	end
		44
		45	timelog.with_options :action => 'edit', :conditions => {:method => :get} do \|time_edit\|
		46	time_edit.connect 'issues/:issue_id/time_entries/new'
		47	end
		48
		49	timelog.connect 'time_entries/:id/destroy', :action => 'destroy', :conditions => {:method => :post}
		50	end
		51
		52	map.connect 'projects/:id/wiki', :controller => 'wikis', :action => 'edit', :conditions => {:method => :post}
		53	map.connect 'projects/:id/wiki/destroy', :controller => 'wikis', :action => 'destroy', :conditions => {:method => :get}
		54	map.connect 'projects/:id/wiki/destroy', :controller => 'wikis', :action => 'destroy', :conditions => {:method => :post}
		55	map.with_options :controller => 'wiki' do \|wiki_routes\|
		56	wiki_routes.with_options :conditions => {:method => :get} do \|wiki_views\|
		57	wiki_views.connect 'projects/:id/wiki/:page', :action => 'special', :page => /page_index\|date_index\|export/i
		58	wiki_views.connect 'projects/:id/wiki/:page', :action => 'index', :page => nil
		59	wiki_views.connect 'projects/:id/wiki/:page/edit', :action => 'edit'
		60	wiki_views.connect 'projects/:id/wiki/:page/rename', :action => 'rename'
		61	wiki_views.connect 'projects/:id/wiki/:page/history', :action => 'history'
		62	wiki_views.connect 'projects/:id/wiki/:page/diff/:version/vs/:version_from', :action => 'diff'
		63	wiki_views.connect 'projects/:id/wiki/:page/annotate/:version', :action => 'annotate'
		64	end
		65
		66	wiki_routes.connect 'projects/:id/wiki/:page/:action',
		67	:action => /edit\|rename\|destroy\|preview\|protect/,
		68	:conditions => {:method => :post}
		69	end
		70
		71	map.with_options :controller => 'messages' do \|messages_routes\|
		72	messages_routes.with_options :conditions => {:method => :get} do \|messages_views\|
		73	messages_views.connect 'boards/:board_id/topics/new', :action => 'new'
		74	messages_views.connect 'boards/:board_id/topics/:id', :action => 'show'
		75	messages_views.connect 'boards/:board_id/topics/:id/edit', :action => 'edit'
		76	end
		77	messages_routes.with_options :conditions => {:method => :post} do \|messages_actions\|
		78	messages_actions.connect 'boards/:board_id/topics/new', :action => 'new'
		79	messages_actions.connect 'boards/:board_id/topics/:id/replies', :action => 'reply'
		80	messages_actions.connect 'boards/:board_id/topics/:id/:action', :action => /edit\|destroy/
		81	end
		82	end
		83
		84	map.with_options :controller => 'boards' do \|board_routes\|
		85	board_routes.with_options :conditions => {:method => :get} do \|board_views\|
		86	board_views.connect 'projects/:project_id/boards', :action => 'index'
		87	board_views.connect 'projects/:project_id/boards/new', :action => 'new'
		88	board_views.connect 'projects/:project_id/boards/:id', :action => 'show'
		89	board_views.connect 'projects/:project_id/boards/:id/edit', :action => 'edit'
		90	end
		91	board_routes.with_options :conditions => {:method => :post} do \|board_actions\|
		92	board_actions.connect 'projects/:project_id/boards', :action => 'new'
		93	board_actions.connect 'projects/:project_id/boards/:id/:action', :action => /edit\|destroy/
		94	end
		95	end
		96
		97	map.with_options :controller => 'documents' do \|document_routes\|
		98	document_routes.with_options :conditions => {:method => :get} do \|document_views\|
		99	document_views.connect 'projects/:project_id/documents', :action => 'index'
		100	document_views.connect 'projects/:project_id/documents/new', :action => 'new'
		101	document_views.connect 'documents/:id', :action => 'show'
		102	document_views.connect 'documents/:id/edit', :action => 'edit'
		103	end
		104	document_routes.with_options :conditions => {:method => :post} do \|document_actions\|
		105	document_actions.connect 'projects/:project_id/documents', :action => 'new'
		106	document_actions.connect 'documents/:id/:action', :action => /destroy\|edit/
		107	end
		108	end
		109
		110	map.with_options :controller => 'issues' do \|issues_routes\|
		111	issues_routes.with_options :conditions => {:method => :get} do \|issues_views\|
		112	issues_views.connect 'issues', :action => 'index'
		113	issues_views.connect 'issues.:format', :action => 'index'
		114	issues_views.connect 'projects/:project_id/issues.:format', :action => 'index'
		115	issues_views.connect 'projects/:project_id/issues/new', :action => 'new'
		116	issues_views.connect 'projects/:project_id/issues/:copy_from/copy', :action => 'new'
		117	issues_views.connect 'issues/:id', :action => 'show'
		118	issues_views.connect 'issues/:id.:format', :action => 'show'
		119	issues_views.connect 'issues/:id/edit', :action => 'edit'
		120	issues_views.connect 'issues/:id/move', :action => 'move'
		121	end
		122	issues_routes.with_options :conditions => {:method => :post} do \|issues_actions\|
		123	issues_actions.connect 'projects/:project_id/issues', :action => 'new'
		124	issues_actions.connect 'issues/:id/quoted', :action => 'reply'
		125	issues_actions.connect 'issues/:id/:action',
		126	:action => /edit\|move\|destroy/
		127	end
		128	end
		129
		130	map.with_options :controller => 'issue_relations', :conditions => {:method => :post} do \|relations\|
		131	relations.connect 'issues/:issue_id/relations/:id', :action => 'new'
		132	relations.connect 'issues/:issue_id/relations/:id/destroy', :action => 'destroy'
		133	end
		134
		135	map.with_options :controller => 'reports', :action => 'issue_report', :conditions => {:method => :get} do \|reports\|
		136	reports.connect 'projects/:id/issues/report'
		137	reports.connect 'projects/:id/issues/report/:detail'
		138	end
		139
		140	map.with_options :controller => 'news' do \|news_routes\|
		141	news_routes.with_options :conditions => {:method => :get} do \|news_views\|
		142	news_views.connect 'news', :action => 'index'
		143	news_views.connect 'projects/:project_id/news', :action => 'index'
		144	news_views.connect 'projects/:project_id/news.:format', :action => 'index'
		145	news_views.connect 'news.:format', :action => 'index'
		146	news_views.connect 'projects/:project_id/news/new', :action => 'new'
		147	news_views.connect 'news/:id', :action => 'show'
		148	news_views.connect 'news/:id/edit', :action => 'edit'
		149	end
		150	news_routes.with_options do \|news_actions\|
		151	news_actions.connect 'projects/:project_id/news', :action => 'new'
		152	news_actions.connect 'news/:id/edit', :action => 'edit'
		153	news_actions.connect 'news/:id/destroy', :action => 'destroy'
		154	end
		155	end
		156
		157	map.connect 'projects/:id/members/new', :controller => 'members', :action => 'new'
		158
		159	map.with_options :controller => 'users' do \|users\|
		160	users.with_options :conditions => {:method => :get} do \|user_views\|
		161	user_views.connect 'users', :action => 'list'
		162	user_views.connect 'users', :action => 'index'
		163	user_views.connect 'users/new', :action => 'add'
		164	user_views.connect 'users/:id/edit/:tab', :action => 'edit', :tab => nil
		165	end
		166	users.with_options :conditions => {:method => :post} do \|user_actions\|
		167	user_actions.connect 'users', :action => 'add'
		168	user_actions.connect 'users/new', :action => 'add'
		169	user_actions.connect 'users/:id/edit', :action => 'edit'
		170	user_actions.connect 'users/:id/memberships', :action => 'edit_membership'
		171	user_actions.connect 'users/:id/memberships/:membership_id', :action => 'edit_membership'
		172	user_actions.connect 'users/:id/memberships/:membership_id/destroy', :action => 'destroy_membership'
		173	end
		174	end
		175
		176	map.with_options :controller => 'projects' do \|projects\|
		177	projects.with_options :conditions => {:method => :get} do \|project_views\|
		178	project_views.connect 'projects', :action => 'index'
		179	project_views.connect 'projects.:format', :action => 'index'
		180	project_views.connect 'projects/new', :action => 'add'
		181	project_views.connect 'projects/:id', :action => 'show'
		182	project_views.connect 'projects/:id/:action', :action => /roadmap\|changelog\|destroy\|settings/
		183	project_views.connect 'projects/:id/files', :action => 'list_files'
		184	project_views.connect 'projects/:id/files/new', :action => 'add_file'
		185	project_views.connect 'projects/:id/versions/new', :action => 'add_version'
		186	project_views.connect 'projects/:id/categories/new', :action => 'add_issue_category'
		187	project_views.connect 'projects/:id/settings/:tab', :action => 'settings'
		188	end
		189
		190	projects.with_options :action => 'activity', :conditions => {:method => :get} do \|activity\|
		191	activity.connect 'projects/:id/activity'
		192	activity.connect 'projects/:id/activity.:format'
		193	activity.connect 'activity'
		194	activity.connect 'activity.:format'
		195	end
		196
		197	projects.with_options :conditions => {:method => :post} do \|project_actions\|
		198	project_actions.connect 'projects/new', :action => 'add'
		199	project_actions.connect 'projects', :action => 'add'
		200	project_actions.connect 'projects/:id/:action', :action => /destroy\|archive\|unarchive/
		201	project_actions.connect 'projects/:id/files/new', :action => 'add_file'
		202	project_actions.connect 'projects/:id/versions/new', :action => 'add_version'
		203	project_actions.connect 'projects/:id/categories/new', :action => 'add_issue_category'
		204	end
		205	end
		206
		207	map.with_options :controller => 'repositories' do \|repositories\|
		208	repositories.with_options :conditions => {:method => :get} do \|repository_views\|
		209	repositories.connect 'projects/:id/repository', :action => 'show'
		210	repositories.connect 'projects/:id/repository/edit', :action => 'edit'
		211	repositories.connect 'projects/:id/repository/statistics', :action => 'stats'
		212	repositories.connect 'projects/:id/repository/revisions', :action => 'revisions'
		213	repositories.connect 'projects/:id/repository/revisions.:format', :action => 'revisions'
		214	repositories.connect 'projects/:id/repository/revisions/:rev', :action => 'revision'
		215	repositories.connect 'projects/:id/repository/revisions/:rev/diff', :action => 'diff'
		216	repositories.connect 'projects/:id/repository/revisions/:rev/diff.:format', :action => 'diff'
		217	repositories.connect 'projects/:id/repository/revisions/:rev/:action/*path'
		218	repositories.connect 'projects/:id/repository/:action/*path'
		219	end
		220
		221	repositories.connect 'projects/:id/repository/edit', :action => 'edit', :conditions => {:method => :post}
		222	end
		223
		224	map.connect 'attachments/:id', :controller => 'attachments', :action => 'show', :id => /\d+/
		225	map.connect 'attachments/:id/:filename', :controller => 'attachments', :action => 'show', :id => /\d+/, :filename => /.*/
		226	map.connect 'attachments/download/:id/:filename', :controller => 'attachments', :action => 'download', :id => /\d+/, :filename => /.*/
		227
		228
		229	#left old routes at the bottom for backwards compat
24	map.connect 'projects/:project_id/issues/:action', :controller => 'issues'	230	map.connect 'projects/:project_id/issues/:action', :controller => 'issues'
25	map.connect 'projects/:project_id/news/:action', :controller => 'news'
26	map.connect 'projects/:project_id/documents/:action', :controller => 'documents'	231	map.connect 'projects/:project_id/documents/:action', :controller => 'documents'
27	map.connect 'projects/:project_id/boards/:action/:id', :controller => 'boards'	232	map.connect 'projects/:project_id/boards/:action/:id', :controller => 'boards'
28	map.connect 'projects/:project_id/timelog/:action/:id', :controller => 'timelog', :project_id => /.+/
29	map.connect 'boards/:board_id/topics/:action/:id', :controller => 'messages'	233	map.connect 'boards/:board_id/topics/:action/:id', :controller => 'messages'
30		234	map.connect 'wiki/:id/:page/:action', :page => nil, :controller => 'wiki'
		235	map.connect 'issues/:issue_id/relations/:action/:id', :controller => 'issue_relations'
		236	map.connect 'projects/:project_id/news/:action', :controller => 'news'
		237	map.connect 'projects/:project_id/timelog/:action/:id', :controller => 'timelog', :project_id => /.+/
31	map.with_options :controller => 'repositories' do \|omap\|	238	map.with_options :controller => 'repositories' do \|omap\|
32	omap.repositories_show 'repositories/browse/:id/*path', :action => 'browse'	239	omap.repositories_show 'repositories/browse/:id/*path', :action => 'browse'
33	omap.repositories_changes 'repositories/changes/:id/*path', :action => 'changes'	240	omap.repositories_changes 'repositories/changes/:id/*path', :action => 'changes'
34	omap.repositories_diff 'repositories/diff/:id/*path', :action => 'diff'	241	omap.repositories_diff 'repositories/diff/:id/*path', :action => 'diff'
35	omap.repositories_entry 'repositories/entry/:id/*path', :action => 'entry'	242	omap.repositories_entry 'repositories/entry/:id/*path', :action => 'entry'
36	omap.repositories_entry 'repositories/annotate/:id/*path', :action => 'annotate'	243	omap.repositories_entry 'repositories/annotate/:id/*path', :action => 'annotate'
37	omap.~~repositories_revision~~ 'repositories/revision/:id/:rev', :action => 'revision'	244	omap.connect 'repositories/revision/:id/:rev', :action => 'revision'
38	end	245	end
39
40	map.connect 'attachments/:id', :controller => 'attachments', :action => 'show', :id => /\d+/
41	map.connect 'attachments/:id/:filename', :controller => 'attachments', :action => 'show', :id => /\d+/, :filename => /.*/
42	map.connect 'attachments/download/:id/:filename', :controller => 'attachments', :action => 'download', :id => /\d+/, :filename => /.*/
43		246
44	# Allow downloading Web Service WSDL as a file with an extension	247	# Allow downloading Web Service WSDL as a file with an extension
45	# instead of a file named 'wsdl'	248	# instead of a file named 'wsdl'
46	map.connect ':controller/service.wsdl', :action => 'wsdl'	249	map.connect ':controller/service.wsdl', :action => 'wsdl'
47
48		250
49	# Install the default route as the lowest priority.	251	# Install the default route as the lowest priority.
50	map.connect ':controller/:action/:id'	252	map.connect ':controller/:action/:id'
51	end	253	end

test/functional/admin_controller_test.rb +7 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 'admin_controller'
             # Re-raise errors caught by the controller.
             class AdminController; def rescue_action(e) raise e end; end
             class AdminControllerTest < Test::Unit::TestCase
               fixtures :projects, :users, :roles
               def setup
                 @controller = AdminController.new
                 @request    = ActionController::TestRequest.new
                 @response   = ActionController::TestResponse.new
                 User.current = nil
                 @request.session[:user_id] = 1 # admin
               end
               def test_index
                 get :index
                 assert_no_tag :tag => 'div',
                               :attributes => { :class => /nodata/ }
               end
+              def test_projects_routing
+                assert_routing(
+                  {:method => :get, :path => '/admin/projects'},
+                  :controller => 'admin', :action => 'projects'
+                )
+              end
               def test_index_with_no_configuration_data
                 delete_configuration_data
                 get :index
                 assert_tag :tag => 'div',
                            :attributes => { :class => /nodata/ }
               end
               def test_projects
                 get :projects
                 assert_response :success
                 assert_template 'projects'
                 assert_not_nil assigns(:projects)
                 # active projects only
                 assert_nil assigns(:projects).detect {|u| !u.active?}
               end
               def test_projects_with_name_filter
                 get :projects, :name => 'store', :status => ''
                 assert_response :success
                 assert_template 'projects'
                 projects = assigns(:projects)
                 assert_not_nil projects
                 assert_equal 1, projects.size
                 assert_equal 'OnlineStore', projects.first.name
               end
               def test_load_default_configuration_data
                 delete_configuration_data
                 post :default_configuration, :lang => 'fr'
                 assert IssueStatus.find_by_name('Nouveau')
               end
               def test_test_email
                 get :test_email
                 assert_redirected_to '/settings/edit?tab=notifications'
                 mail = ActionMailer::Base.deliveries.last
                 assert_kind_of TMail::Mail, mail
                 user = User.find(1)
                 assert_equal [user.mail], mail.bcc
               end
               def test_no_plugins
                 Redmine::Plugin.clear
                 get :plugins
                 assert_response :success
                 assert_template 'plugins'
               end
               def test_plugins
                 # Register a few plugins
                 Redmine::Plugin.register :foo do
                   name 'Foo plugin'
                   author 'John Smith'
                   description 'This is a test plugin'
                   version '0.0.1'
                   settings :default => {'sample_setting' => 'value', 'foo'=>'bar'}, :partial => 'foo/settings'
                 end
                 Redmine::Plugin.register :bar do
                 end
                 get :plugins
                 assert_response :success
                 assert_template 'plugins'
                 assert_tag :td, :child => { :tag => 'span', :content => 'Foo plugin' }
                 assert_tag :td, :child => { :tag => 'span', :content => 'Bar' }
               end
               def test_info
                 get :info
                 assert_response :success
                 assert_template 'info'
               end
               private
               def delete_configuration_data
                 Role.delete_all('builtin = 0')
                 Tracker.delete_all
                 IssueStatus.delete_all
                 Enumeration.delete_all
               end
             end

test/functional/boards_controller_test.rb +43 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 'boards_controller'
             # Re-raise errors caught by the controller.
             class BoardsController; def rescue_action(e) raise e end; end
             class BoardsControllerTest < Test::Unit::TestCase
               fixtures :projects, :users, :members, :roles, :boards, :messages, :enabled_modules
               def setup
                 @controller = BoardsController.new
                 @request    = ActionController::TestRequest.new
                 @response   = ActionController::TestResponse.new
                 User.current = nil
               end
+              def test_index_routing
+                assert_routing(
+                  {:method => :get, :path => '/projects/world_domination/boards'},
+                  :controller => 'boards', :action => 'index', :project_id => 'world_domination'
+                )
+              end
               def test_index
                 get :index, :project_id => 1
                 assert_response :success
                 assert_template 'index'
                 assert_not_nil assigns(:boards)
                 assert_not_nil assigns(:project)
               end
+              def test_new_routing
+                assert_routing(
+                  {:method => :get, :path => '/projects/world_domination/boards/new'},
+                  :controller => 'boards', :action => 'new', :project_id => 'world_domination'
+                )
+                assert_recognizes(
+                  {:controller => 'boards', :action => 'new', :project_id => 'world_domination'},
+                  {:method => :post, :path => '/projects/world_domination/boards'}
+                )
+              end
+              def test_show_routing
+                assert_routing(
+                  {:method => :get, :path => '/projects/world_domination/boards/44'},
+                  :controller => 'boards', :action => 'show', :id => '44', :project_id => 'world_domination'
+                )
+              end
               def test_show
                 get :show, :project_id => 1, :id => 1
                 assert_response :success
                 assert_template 'show'
                 assert_not_nil assigns(:board)
                 assert_not_nil assigns(:project)
                 assert_not_nil assigns(:topics)
               end
+              def test_edit_routing
+                assert_routing(
+                  {:method => :get, :path => '/projects/world_domination/boards/44/edit'},
+                  :controller => 'boards', :action => 'edit', :id => '44', :project_id => 'world_domination'
+                )
+                assert_recognizes(#TODO: use PUT method to board_path, modify form accordingly
+                  {:controller => 'boards', :action => 'edit', :id => '44', :project_id => 'world_domination'},
+                  {:method => :post, :path => '/projects/world_domination/boards/44/edit'}
+                )
+              end
+              def test_destroy_routing
+                assert_routing(#TODO: use DELETE method to board_path, modify form accoringly
+                  {:method => :post, :path => '/projects/world_domination/boards/44/destroy'},
+                  :controller => 'boards', :action => 'destroy', :id => '44', :project_id => 'world_domination'
+                )
+              end
             end

test/functional/documents_controller_test.rb +44 -1

             # 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 'documents_controller'
             # Re-raise errors caught by the controller.
             class DocumentsController; def rescue_action(e) raise e end; end
             class DocumentsControllerTest < Test::Unit::TestCase
               fixtures :projects, :users, :roles, :members, :enabled_modules, :documents, :enumerations
               def setup
                 @controller = DocumentsController.new
                 @request    = ActionController::TestRequest.new
                 @response   = ActionController::TestResponse.new
                 User.current = nil
               end
+              def test_index_routing
+                assert_routing(
+                  {:method => :get, :path => '/projects/567/documents'},
+                  :controller => 'documents', :action => 'index', :project_id => '567'
+                )
+              end
               def test_index
                 # Sets a default category
                 e = Enumeration.find_by_name('Technical documentation')
                 e.update_attributes(:is_default => true)
                 get :index, :project_id => 'ecookbook'
                 assert_response :success
                 assert_template 'index'
                 assert_not_nil assigns(:grouped)
                 # Default category selected in the new document form
                 assert_tag :select, :attributes => {:name => 'document[category_id]'},
                                     :child => {:tag => 'option', :attributes => {:selected => 'selected'},
                                                                  :content => 'Technical documentation'}
               end
+              def test_new_routing
+                assert_routing(
+                  {:method => :get, :path => '/projects/567/documents/new'},
+                  :controller => 'documents', :action => 'new', :project_id => '567'
+                )
+                assert_recognizes(
+                  {:controller => 'documents', :action => 'new', :project_id => '567'},
+                  {:method => :post, :path => '/projects/567/documents'}
+                )
+              end
               def test_new_with_one_attachment
                 @request.session[:user_id] = 2
                 set_tmp_attachments_directory
                 post :new, :project_id => 'ecookbook',
                            :document => { :title => 'DocumentsControllerTest#test_post_new',
                                           :description => 'This is a new document',
                                           :category_id => 2},
                            :attachments => {'1' => {'file' => test_uploaded_file('testfile.txt', 'text/plain')}}
                 assert_redirected_to 'projects/ecookbook/documents'
                 document = Document.find_by_title('DocumentsControllerTest#test_post_new')
                 assert_not_nil document
                 assert_equal Enumeration.find(2), document.category
                 assert_equal 1, document.attachments.size
                 assert_equal 'testfile.txt', document.attachments.first.filename
               end
+              def test_edit_routing
+                assert_routing(
+                  {:method => :get, :path => '/documents/22/edit'},
+                  :controller => 'documents', :action => 'edit', :id => '22'
+                )
+                assert_recognizes(#TODO: should be using PUT on document URI
+                  {:controller => 'documents', :action => 'edit', :id => '567'},
+                  {:method => :post, :path => '/documents/567/edit'}
+                )
+              end
+              def test_show_routing
+                assert_routing(
+                  {:method => :get, :path => '/documents/22'},
+                  :controller => 'documents', :action => 'show', :id => '22'
+                )
+              end
+              def test_destroy_routing
+                assert_recognizes(#TODO: should be using DELETE on document URI
+                  {:controller => 'documents', :action => 'destroy', :id => '567'},
+                  {:method => :post, :path => '/documents/567/destroy'}
+                )
+              end
               def test_destroy
                 @request.session[:user_id] = 2
                 post :destroy, :id => 1
                 assert_redirected_to 'projects/ecookbook/documents'
                 assert_nil Document.find_by_id(1)
               end
             end

test/functional/issues_controller_test.rb +147 -21

             # Redmine - project management software
             # Copyright (C) 2006-2008  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,
                        :issue_statuses,
                        :versions,
                        :trackers,
                        :projects_trackers,
                        :issue_categories,
                        :enabled_modules,
                        :enumerations,
                        :attachments,
                        :workflows,
                        :custom_fields,
                        :custom_values,
                        :custom_fields_trackers,
                        :time_entries,
                        :journals,
                        :journal_details
               def setup
                 @controller = IssuesController.new
                 @request    = ActionController::TestRequest.new
                 @response   = ActionController::TestResponse.new
                 User.current = nil
               end
+              def test_index_routing
+                assert_routing(
+                  {:method => :get, :path => '/issues'},
+                  :controller => 'issues', :action => 'index'
+                )
+              end
               def test_index
                 get :index
                 assert_response :success
                 assert_template 'index.rhtml'
                 assert_not_nil assigns(:issues)
                 assert_nil assigns(:project)
                 assert_tag :tag => 'a', :content => /Can't print recipes/
                 assert_tag :tag => 'a', :content => /Subproject issue/
                 # private projects hidden
                 assert_no_tag :tag => 'a', :content => /Issue of a private subproject/
                 assert_no_tag :tag => 'a', :content => /Issue on project 2/
               end
               def test_index_should_not_list_issues_when_module_disabled
                 EnabledModule.delete_all("name = 'issue_tracking' AND project_id = 1")
                 get :index
                 assert_response :success
                 assert_template 'index.rhtml'
                 assert_not_nil assigns(:issues)
                 assert_nil assigns(:project)
                 assert_no_tag :tag => 'a', :content => /Can't print recipes/
                 assert_tag :tag => 'a', :content => /Subproject issue/
               end
+              def test_index_with_project_routing
+                assert_routing(
+                  {:method => :get, :path => '/projects/23/issues'},
+                  :controller => 'issues', :action => 'index', :project_id => '23'
+                )
+              end
+              def test_index_should_not_list_issues_when_module_disabled
+                EnabledModule.delete_all("name = 'issue_tracking' AND project_id = 1")
+                get :index
+                assert_response :success
+                assert_template 'index.rhtml'
+                assert_not_nil assigns(:issues)
+                assert_nil assigns(:project)
+                assert_no_tag :tag => 'a', :content => /Can't print recipes/
+                assert_tag :tag => 'a', :content => /Subproject issue/
+              end
+              def test_index_with_project_routing
+                assert_routing(
+                  {:method => :get, :path => 'projects/23/issues'},
+                  :controller => 'issues', :action => 'index', :project_id => '23'
+                )
+              end
               def test_index_with_project
                 Setting.display_subprojects_issues = 0
                 get :index, :project_id => 1
                 assert_response :success
                 assert_template 'index.rhtml'
                 assert_not_nil assigns(:issues)
                 assert_tag :tag => 'a', :content => /Can't print recipes/
                 assert_no_tag :tag => 'a', :content => /Subproject issue/
               end
               def test_index_with_project_and_subprojects
                 Setting.display_subprojects_issues = 1
                 get :index, :project_id => 1
                 assert_response :success
                 assert_template 'index.rhtml'
                 assert_not_nil assigns(:issues)
                 assert_tag :tag => 'a', :content => /Can't print recipes/
                 assert_tag :tag => 'a', :content => /Subproject issue/
                 assert_no_tag :tag => 'a', :content => /Issue of a private subproject/
               end
               def test_index_with_project_and_subprojects_should_show_private_subprojects
                 @request.session[:user_id] = 2
                 Setting.display_subprojects_issues = 1
                 get :index, :project_id => 1
                 assert_response :success
                 assert_template 'index.rhtml'
                 assert_not_nil assigns(:issues)
                 assert_tag :tag => 'a', :content => /Can't print recipes/
                 assert_tag :tag => 'a', :content => /Subproject issue/
                 assert_tag :tag => 'a', :content => /Issue of a private subproject/
               end
+              def test_index_with_project_routing_formatted
+                assert_routing(
+                  {:method => :get, :path => 'projects/23/issues.pdf'},
+                  :controller => 'issues', :action => 'index', :project_id => '23', :format => 'pdf'
+                )
+                assert_routing(
+                  {:method => :get, :path => 'projects/23/issues.atom'},
+                  :controller => 'issues', :action => 'index', :project_id => '23', :format => 'atom'
+                )
+              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_formatted
+                assert_routing(
+                  {:method => :get, :path => 'issues.pdf'},
+                  :controller => 'issues', :action => 'index', :format => 'pdf'
+                )
+                assert_routing(
+                  {:method => :get, :path => 'issues.atom'},
+                  :controller => 'issues', :action => 'index', :format => 'atom'
+                )
+              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_index_sort
                 get :index, :sort_key => 'tracker'
                 assert_response :success
                 sort_params = @request.session['issuesindex_sort']
                 assert sort_params.is_a?(Hash)
                 assert_equal 'tracker', sort_params[:key]
                 assert_equal 'ASC', sort_params[:order]
               end
               def test_gantt
                 get :gantt, :project_id => 1
                 assert_response :success
                 assert_template 'gantt.rhtml'
                 assert_not_nil assigns(:gantt)
                 events = assigns(:gantt).events
                 assert_not_nil events
                 # Issue with start and due dates
                 i = Issue.find(1)
                 assert_not_nil i.due_date
                 assert events.include?(Issue.find(1))
                 # Issue with without due date but targeted to a version with date
                 i = Issue.find(2)
                 assert_nil i.due_date
                 assert events.include?(i)
               end
               def test_cross_project_gantt
                 get :gantt
                 assert_response :success
                 assert_template 'gantt.rhtml'
                 assert_not_nil assigns(:gantt)
                 events = assigns(:gantt).events
                 assert_not_nil events
               end
               def test_gantt_export_to_pdf
                 get :gantt, :project_id => 1, :format => 'pdf'
                 assert_response :success
                 assert_equal 'application/pdf', @response.content_type
                 assert @response.body.starts_with?('%PDF')
                 assert_not_nil assigns(:gantt)
               end
               def test_cross_project_gantt_export_to_pdf
                 get :gantt, :format => 'pdf'
                 assert_response :success
                 assert_equal 'application/pdf', @response.content_type
                 assert @response.body.starts_with?('%PDF')
                 assert_not_nil assigns(:gantt)
               end
               if Object.const_defined?(:Magick)
                 def test_gantt_image
                   get :gantt, :project_id => 1, :format => 'png'
                   assert_response :success
                   assert_equal 'image/png', @response.content_type
                 end
               else
                 puts "RMagick not installed. Skipping tests !!!"
               end
               def test_calendar
                 get :calendar, :project_id => 1
                 assert_response :success
                 assert_template 'calendar'
                 assert_not_nil assigns(:calendar)
               end
               def test_cross_project_calendar
                 get :calendar
                 assert_response :success
                 assert_template 'calendar'
                 assert_not_nil assigns(:calendar)
               end
               def test_changes
                 get :changes, :project_id => 1
                 assert_response :success
                 assert_not_nil assigns(:journals)
                 assert_equal 'application/atom+xml', @response.content_type
               end
+              def test_show_routing
+                assert_routing(
+                  {:method => :get, :path => '/issues/64'},
+                  :controller => 'issues', :action => 'show', :id => '64'
+                )
+              end
+              def test_show_routing_formatted
+                assert_routing(
+                  {:method => :get, :path => '/issues/2332.pdf'},
+                  :controller => 'issues', :action => 'show', :id => '2332', :format => 'pdf'
+                )
+                assert_routing(
+                  {:method => :get, :path => '/issues/23123.atom'},
+                  :controller => 'issues', :action => 'show', :id => '23123', :format => 'atom'
+                )
+              end
               def test_show_by_anonymous
                 get :show, :id => 1
                 assert_response :success
                 assert_template 'show.rhtml'
                 assert_not_nil assigns(:issue)
                 assert_equal Issue.find(1), assigns(:issue)
                 # anonymous role is allowed to add a note
                 assert_tag :tag => 'form',
                            :descendant => { :tag => 'fieldset',
                                             :child => { :tag => 'legend',
                                                         :content => /Notes/ } }
               end
               def test_show_by_manager
                 @request.session[:user_id] = 2
                 get :show, :id => 1
                 assert_response :success
                 assert_tag :tag => 'form',
                            :descendant => { :tag => 'fieldset',
                                             :child => { :tag => 'legend',
                                                         :content => /Change properties/ } },
                            :descendant => { :tag => 'fieldset',
                                             :child => { :tag => 'legend',
                                                         :content => /Log time/ } },
                            :descendant => { :tag => 'fieldset',
                                             :child => { :tag => 'legend',
                                                         :content => /Notes/ } }
               end
+              def test_new_routing
+                assert_routing(
+                  {:method => :get, :path => '/projects/1/issues/new'},
+                  :controller => 'issues', :action => 'new', :project_id => '1'
+                )
+                assert_recognizes(
+                  {:controller => 'issues', :action => 'new', :project_id => '1'},
+                  {:method => :post, :path => '/projects/1/issues'}
+                )
+              end
               def test_show_export_to_pdf
                 get :show, :id => 3, :format => 'pdf'
                 assert_response :success
                 assert_equal 'application/pdf', @response.content_type
                 assert @response.body.starts_with?('%PDF')
                 assert_not_nil assigns(:issue)
               end
               def test_get_new
                 @request.session[:user_id] = 2
                 get :new, :project_id => 1, :tracker_id => 1
                 assert_response :success
                 assert_template 'new'
                 assert_tag :tag => 'input', :attributes => { :name => 'issue[custom_field_values][2]',
                                                              :value => 'Default string' }
               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 => 3,
                                       :subject => 'This is the test_new issue',
                                       :description => 'This is the description',
                                       :priority_id => 5,
                                       :estimated_hours => '',
                                       :custom_field_values => {'2' => 'Value for field 2'}}
-                assert_redirected_to :controller => 'issues', :action => 'show'
+                assert_redirected_to :action => 'show'
                 issue = Issue.find_by_subject('This is the test_new issue')
                 assert_not_nil issue
                 assert_equal 2, issue.author_id
                 assert_equal 3, issue.tracker_id
                 assert_nil issue.estimated_hours
                 v = issue.custom_values.find(:first, :conditions => {:custom_field_id => 2})
                 assert_not_nil v
                 assert_equal 'Value for field 2', v.value
               end
               def test_post_new_and_continue
                 @request.session[:user_id] = 2
                 post :new, :project_id => 1,
                            :issue => {:tracker_id => 3,
                                       :subject => 'This is first issue',
                                       :priority_id => 5},
                            :continue => ''
                 assert_redirected_to :controller => 'issues', :action => 'new', :tracker_id => 3
               end
               def test_post_new_without_custom_fields_param
                 @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 :controller => 'issues', :action => 'show'
+                assert_redirected_to :action => 'show'
               end
               def test_post_new_with_required_custom_field_and_without_custom_fields_param
                 field = IssueCustomField.find_by_name('Database')
                 field.update_attribute(:is_required, true)
                 @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_response :success
                 assert_template 'new'
                 issue = assigns(:issue)
                 assert_not_nil issue
                 assert_equal 'activerecord_error_invalid', issue.errors.on(:custom_values)
               end
               def test_post_new_with_watchers
                 @request.session[:user_id] = 2
                 ActionMailer::Base.deliveries.clear
                 assert_difference 'Watcher.count', 2 do
                   post :new, :project_id => 1,
                              :issue => {:tracker_id => 1,
                                         :subject => 'This is a new issue with watchers',
                                         :description => 'This is the description',
                                         :priority_id => 5,
                                         :watcher_user_ids => ['2', '3']}
                 end
                 issue = Issue.find_by_subject('This is a new issue with watchers')
                 assert_not_nil issue
                 assert_redirected_to :controller => 'issues', :action => 'show', :id => issue
                 # Watchers added
                 assert_equal [2, 3], issue.watcher_user_ids.sort
                 assert issue.watched_by?(User.find(3))
                 # Watchers notified
                 mail = ActionMailer::Base.deliveries.last
                 assert_kind_of TMail::Mail, mail
                 assert [mail.bcc, mail.cc].flatten.include?(User.find(3).mail)
               end
               def test_post_should_preserve_fields_values_on_validation_failure
                 @request.session[:user_id] = 2
                 post :new, :project_id => 1,
                            :issue => {:tracker_id => 1,
                                       # empty subject
                                       :subject => '',
                                       :description => 'This is a description',
                                       :priority_id => 6,
                                       :custom_field_values => {'1' => 'Oracle', '2' => 'Value for field 2'}}
                 assert_response :success
                 assert_template 'new'
                 assert_tag :textarea, :attributes => { :name => 'issue[description]' },
                                       :content => 'This is a description'
                 assert_tag :select, :attributes => { :name => 'issue[priority_id]' },
                                     :child => { :tag => 'option', :attributes => { :selected => 'selected',
                                                                                    :value => '6' },
                                                                   :content => 'High' }
                 # Custom fields
                 assert_tag :select, :attributes => { :name => 'issue[custom_field_values][1]' },
                                     :child => { :tag => 'option', :attributes => { :selected => 'selected',
                                                                                    :value => 'Oracle' },
                                                                   :content => 'Oracle' }
                 assert_tag :input, :attributes => { :name => 'issue[custom_field_values][2]',
                                                     :value => 'Value for field 2'}
               end
+              def test_copy_routing
+                assert_routing(
+                  {:method => :get, :path => '/projects/world_domination/issues/567/copy'},
+                  :controller => 'issues', :action => 'new', :project_id => 'world_domination', :copy_from => '567'
+                )
+              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_edit_routing
+                assert_routing(
+                  {:method => :get, :path => '/issues/1/edit'},
+                  :controller => 'issues', :action => 'edit', :id => '1'
+                )
+                assert_recognizes( #TODO: use a PUT on the issue URI isntead, need to adjust form
+                  {:controller => 'issues', :action => 'edit', :id => '1'},
+                  {:method => :post, :path => '/issues/1/edit'}
+                )
+              end
               def test_get_edit
                 @request.session[:user_id] = 2
                 get :edit, :id => 1
                 assert_response :success
                 assert_template 'edit'
                 assert_not_nil assigns(:issue)
                 assert_equal Issue.find(1), assigns(:issue)
               end
               def test_get_edit_with_params
                 @request.session[:user_id] = 2
                 get :edit, :id => 1, :issue => { :status_id => 5, :priority_id => 7 }
                 assert_response :success
                 assert_template 'edit'
                 issue = assigns(:issue)
                 assert_not_nil issue
                 assert_equal 5, issue.status_id
                 assert_tag :select, :attributes => { :name => 'issue[status_id]' },
                                     :child => { :tag => 'option',
                                                 :content => 'Closed',
                                                 :attributes => { :selected => 'selected' } }
                 assert_equal 7, issue.priority_id
                 assert_tag :select, :attributes => { :name => 'issue[priority_id]' },
                                     :child => { :tag => 'option',
                                                 :content => 'Urgent',
                                                 :attributes => { :selected => 'selected' } }
               end
+              def test_reply_routing
+                assert_routing(
+                  {:method => :post, :path => '/issues/1/quoted'},
+                  :controller => 'issues', :action => 'reply', :id => '1'
+                )
+              end
               def test_reply_to_issue
                 @request.session[:user_id] = 2
                 get :reply, :id => 1
                 assert_response :success
                 assert_select_rjs :show, "update"
               end
               def test_reply_to_note
                 @request.session[:user_id] = 2
                 get :reply, :id => 1, :journal_id => 2
                 assert_response :success
                 assert_select_rjs :show, "update"
               end
               def test_post_edit_without_custom_fields_param
                 @request.session[:user_id] = 2
                 ActionMailer::Base.deliveries.clear
                 issue = Issue.find(1)
                 assert_equal '125', issue.custom_value_for(2).value
                 old_subject = issue.subject
                 new_subject = 'Subject modified by IssuesControllerTest#test_post_edit'
                 assert_difference('Journal.count') do
                   assert_difference('JournalDetail.count', 2) do
                     post :edit, :id => 1, :issue => {:subject => new_subject,
                                                      :priority_id => '6',
                                                      :category_id => '1' # no change
                                                     }
                   end
                 end
-                assert_redirected_to 'issues/show/1'
+                assert_redirected_to :action => 'show', :id => '1'
                 issue.reload
                 assert_equal new_subject, issue.subject
                 # Make sure custom fields were not cleared
                 assert_equal '125', issue.custom_value_for(2).value
                 mail = ActionMailer::Base.deliveries.last
                 assert_kind_of TMail::Mail, mail
                 assert mail.subject.starts_with?("[#{issue.project.name} - #{issue.tracker.name} ##{issue.id}]")
                 assert mail.body.include?("Subject changed from #{old_subject} to #{new_subject}")
               end
               def test_post_edit_with_custom_field_change
                 @request.session[:user_id] = 2
                 issue = Issue.find(1)
                 assert_equal '125', issue.custom_value_for(2).value
                 assert_difference('Journal.count') do
                   assert_difference('JournalDetail.count', 3) do
                     post :edit, :id => 1, :issue => {:subject => 'Custom field change',
                                                      :priority_id => '6',
                                                      :category_id => '1', # no change
                                                      :custom_field_values => { '2' => 'New custom value' }
                                                     }
                   end
                 end
-                assert_redirected_to 'issues/show/1'
+                assert_redirected_to :action => 'show', :id => '1'
                 issue.reload
                 assert_equal 'New custom value', issue.custom_value_for(2).value
                 mail = ActionMailer::Base.deliveries.last
                 assert_kind_of TMail::Mail, mail
                 assert mail.body.include?("Searchable field changed from 125 to New custom value")
               end
               def test_post_edit_with_status_and_assignee_change
                 issue = Issue.find(1)
                 assert_equal 1, issue.status_id
                 @request.session[:user_id] = 2
                 assert_difference('TimeEntry.count', 0) do
                   post :edit,
                        :id => 1,
                        :issue => { :status_id => 2, :assigned_to_id => 3 },
                        :notes => 'Assigned to dlopper',
                        :time_entry => { :hours => '', :comments => '', :activity_id => Enumeration.get_values('ACTI').first }
                 end
-                assert_redirected_to 'issues/show/1'
+                assert_redirected_to :action => 'show', :id => '1'
                 issue.reload
                 assert_equal 2, issue.status_id
                 j = issue.journals.find(:first, :order => 'id DESC')
                 assert_equal 'Assigned to dlopper', j.notes
                 assert_equal 2, j.details.size
                 mail = ActionMailer::Base.deliveries.last
                 assert mail.body.include?("Status changed from New to Assigned")
               end
               def test_post_edit_with_note_only
                 notes = 'Note added by IssuesControllerTest#test_update_with_note_only'
                 # anonymous user
                 post :edit,
                      :id => 1,
                      :notes => notes
-                assert_redirected_to 'issues/show/1'
+                assert_redirected_to :action => 'show', :id => '1'
                 j = Issue.find(1).journals.find(:first, :order => 'id DESC')
                 assert_equal notes, j.notes
                 assert_equal 0, j.details.size
                 assert_equal User.anonymous, j.user
                 mail = ActionMailer::Base.deliveries.last
                 assert mail.body.include?(notes)
               end
               def test_post_edit_with_note_and_spent_time
                 @request.session[:user_id] = 2
                 spent_hours_before = Issue.find(1).spent_hours
                 assert_difference('TimeEntry.count') do
                   post :edit,
                        :id => 1,
                        :notes => '2.5 hours added',
                        :time_entry => { :hours => '2.5', :comments => '', :activity_id => Enumeration.get_values('ACTI').first }
                 end
-                assert_redirected_to 'issues/show/1'
+                assert_redirected_to :action => 'show', :id => '1'
                 issue = Issue.find(1)
                 j = issue.journals.find(:first, :order => 'id DESC')
                 assert_equal '2.5 hours added', j.notes
                 assert_equal 0, j.details.size
                 t = issue.time_entries.find(:first, :order => 'id DESC')
                 assert_not_nil t
                 assert_equal 2.5, t.hours
                 assert_equal spent_hours_before + 2.5, issue.spent_hours
               end
               def test_post_edit_with_attachment_only
                 set_tmp_attachments_directory
                 # Delete all fixtured journals, a race condition can occur causing the wrong
                 # journal to get fetched in the next find.
                 Journal.delete_all
                 # anonymous user
                 post :edit,
                      :id => 1,
                      :notes => '',
                      :attachments => {'1' => {'file' => test_uploaded_file('testfile.txt', 'text/plain')}}
-                assert_redirected_to 'issues/show/1'
+                assert_redirected_to :action => 'show', :id => '1'
                 j = Issue.find(1).journals.find(:first, :order => 'id DESC')
                 assert j.notes.blank?
                 assert_equal 1, j.details.size
                 assert_equal 'testfile.txt', j.details.first.value
                 assert_equal User.anonymous, j.user
                 mail = ActionMailer::Base.deliveries.last
                 assert mail.body.include?('testfile.txt')
               end
               def test_post_edit_with_no_change
                 issue = Issue.find(1)
                 issue.journals.clear
                 ActionMailer::Base.deliveries.clear
                 post :edit,
                      :id => 1,
                      :notes => ''
-                assert_redirected_to 'issues/show/1'
+                assert_redirected_to :action => 'show', :id => '1'
                 issue.reload
                 assert issue.journals.empty?
                 # No email should be sent
                 assert ActionMailer::Base.deliveries.empty?
               end
               def test_post_edit_with_invalid_spent_time
                 @request.session[:user_id] = 2
                 notes = 'Note added by IssuesControllerTest#test_post_edit_with_invalid_spent_time'
                 assert_no_difference('Journal.count') do
                   post :edit,
                        :id => 1,
                        :notes => notes,
                        :time_entry => {"comments"=>"", "activity_id"=>"", "hours"=>"2z"}
                 end
                 assert_response :success
                 assert_template 'edit'
                 assert_tag :textarea, :attributes => { :name => 'notes' },
                                       :content => notes
                 assert_tag :input, :attributes => { :name => 'time_entry[hours]', :value => "2z" }
               end
               def test_bulk_edit
                 @request.session[:user_id] = 2
                 # update issues priority
                 post :bulk_edit, :ids => [1, 2], :priority_id => 7,
                                                  :assigned_to_id => '',
                                                  :custom_field_values => {'2' => ''},
                                                  :notes => 'Bulk editing'
                 assert_response 302
                 # check that the issues were updated
                 assert_equal [7, 7], Issue.find_all_by_id([1, 2]).collect {|i| i.priority.id}
                 issue = Issue.find(1)
                 journal = issue.journals.find(:first, :order => 'created_on DESC')
                 assert_equal '125', issue.custom_value_for(2).value
                 assert_equal 'Bulk editing', journal.notes
                 assert_equal 1, journal.details.size
               end
               def test_bulk_edit_custom_field
                 @request.session[:user_id] = 2
                 # update issues priority
                 post :bulk_edit, :ids => [1, 2], :priority_id => '',
                                                  :assigned_to_id => '',
                                                  :custom_field_values => {'2' => '777'},
                                                  :notes => 'Bulk editing custom field'
                 assert_response 302
                 issue = Issue.find(1)
                 journal = issue.journals.find(:first, :order => 'created_on DESC')
                 assert_equal '777', issue.custom_value_for(2).value
                 assert_equal 1, journal.details.size
                 assert_equal '125', journal.details.first.old_value
                 assert_equal '777', journal.details.first.value
               end
               def test_bulk_unassign
                 assert_not_nil Issue.find(2).assigned_to
                 @request.session[:user_id] = 2
                 # unassign issues
                 post :bulk_edit, :ids => [1, 2], :notes => 'Bulk unassigning', :assigned_to_id => 'none'
                 assert_response 302
                 # check that the issues were updated
                 assert_nil Issue.find(2).assigned_to
               end
+              def test_move_routing
+                assert_routing(
+                  {:method => :get, :path => '/issues/1/move'},
+                  :controller => 'issues', :action => 'move', :id => '1'
+                )
+                assert_recognizes(
+                  {:controller => 'issues', :action => 'move', :id => '1'},
+                  {:method => :post, :path => '/issues/1/move'}
+                )
+              end
               def test_move_one_issue_to_another_project
                 @request.session[:user_id] = 1
                 post :move, :id => 1, :new_project_id => 2
-                assert_redirected_to 'projects/ecookbook/issues'
+                assert_redirected_to :action => 'index', :project_id => 'ecookbook'
                 assert_equal 2, Issue.find(1).project_id
               end
               def test_bulk_move_to_another_project
                 @request.session[:user_id] = 1
                 post :move, :ids => [1, 2], :new_project_id => 2
-                assert_redirected_to 'projects/ecookbook/issues'
+                assert_redirected_to :action => 'index', :project_id => 'ecookbook'
                 # Issues moved to project 2
                 assert_equal 2, Issue.find(1).project_id
                 assert_equal 2, Issue.find(2).project_id
                 # No tracker change
                 assert_equal 1, Issue.find(1).tracker_id
                 assert_equal 2, Issue.find(2).tracker_id
               end
               def test_bulk_move_to_another_tracker
                 @request.session[:user_id] = 1
                 post :move, :ids => [1, 2], :new_tracker_id => 2
-                assert_redirected_to 'projects/ecookbook/issues'
+                assert_redirected_to :action => 'index', :project_id => 'ecookbook'
                 assert_equal 2, Issue.find(1).tracker_id
                 assert_equal 2, Issue.find(2).tracker_id
               end
               def test_bulk_copy_to_another_project
                 @request.session[:user_id] = 1
                 assert_difference 'Issue.count', 2 do
                   assert_no_difference 'Project.find(1).issues.count' do
                     post :move, :ids => [1, 2], :new_project_id => 2, :copy_options => {:copy => '1'}
                   end
                 end
                 assert_redirected_to 'projects/ecookbook/issues'
               end
               def test_context_menu_one_issue
                 @request.session[:user_id] = 2
                 get :context_menu, :ids => [1]
                 assert_response :success
                 assert_template 'context_menu'
                 assert_tag :tag => 'a', :content => 'Edit',
-                                        :attributes => { :href => '/issues/edit/1',
+                                        :attributes => { :href => '/issues/1/edit',
                                                          :class => 'icon-edit' }
                 assert_tag :tag => 'a', :content => 'Closed',
-                                        :attributes => { :href => '/issues/edit/1?issue%5Bstatus_id%5D=5',
+                                        :attributes => { :href => '/issues/1/edit?issue%5Bstatus_id%5D=5',
                                                          :class => '' }
                 assert_tag :tag => 'a', :content => 'Immediate',
                                         :attributes => { :href => '/issues/bulk_edit?ids%5B%5D=1&amp;priority_id=8',
                                                          :class => '' }
                 assert_tag :tag => 'a', :content => 'Dave Lopper',
                                         :attributes => { :href => '/issues/bulk_edit?assigned_to_id=3&amp;ids%5B%5D=1',
                                                          :class => '' }
                 assert_tag :tag => 'a', :content => 'Copy',
-                                        :attributes => { :href => '/projects/ecookbook/issues/new?copy_from=1',
+                                        :attributes => { :href => '/projects/ecookbook/issues/1/copy',
                                                          :class => 'icon-copy' }
                 assert_tag :tag => 'a', :content => 'Move',
                                         :attributes => { :href => '/issues/move?ids%5B%5D=1',
                                                          :class => 'icon-move' }
                 assert_tag :tag => 'a', :content => 'Delete',
                                         :attributes => { :href => '/issues/destroy?ids%5B%5D=1',
                                                          :class => 'icon-del' }
               end
               def test_context_menu_one_issue_by_anonymous
                 get :context_menu, :ids => [1]
                 assert_response :success
                 assert_template 'context_menu'
                 assert_tag :tag => 'a', :content => 'Delete',
                                         :attributes => { :href => '#',
                                                          :class => 'icon-del disabled' }
               end
               def test_context_menu_multiple_issues_of_same_project
                 @request.session[:user_id] = 2
                 get :context_menu, :ids => [1, 2]
                 assert_response :success
                 assert_template 'context_menu'
                 assert_tag :tag => 'a', :content => 'Edit',
                                         :attributes => { :href => '/issues/bulk_edit?ids%5B%5D=1&amp;ids%5B%5D=2',
                                                          :class => 'icon-edit' }
                 assert_tag :tag => 'a', :content => 'Immediate',
                                         :attributes => { :href => '/issues/bulk_edit?ids%5B%5D=1&amp;ids%5B%5D=2&amp;priority_id=8',
                                                          :class => '' }
                 assert_tag :tag => 'a', :content => 'Dave Lopper',
                                         :attributes => { :href => '/issues/bulk_edit?assigned_to_id=3&amp;ids%5B%5D=1&amp;ids%5B%5D=2',
                                                          :class => '' }
                 assert_tag :tag => 'a', :content => 'Move',
                                         :attributes => { :href => '/issues/move?ids%5B%5D=1&amp;ids%5B%5D=2',
                                                          :class => 'icon-move' }
                 assert_tag :tag => 'a', :content => 'Delete',
                                         :attributes => { :href => '/issues/destroy?ids%5B%5D=1&amp;ids%5B%5D=2',
                                                          :class => 'icon-del' }
               end
               def test_context_menu_multiple_issues_of_different_project
                 @request.session[:user_id] = 2
                 get :context_menu, :ids => [1, 2, 4]
                 assert_response :success
                 assert_template 'context_menu'
                 assert_tag :tag => 'a', :content => 'Delete',
                                         :attributes => { :href => '#',
                                                          :class => 'icon-del disabled' }
               end
+              def test_destroy_routing
+                assert_recognizes( #TODO: use DELETE on issue URI (need to change forms)
+                  {:controller => 'issues', :action => 'destroy', :id => '1'},
+                  {:method => :post, :path => '/issues/1/destroy'}
+                )
+              end
               def test_destroy_issue_with_no_time_entries
                 assert_nil TimeEntry.find_by_issue_id(2)
                 @request.session[:user_id] = 2
                 post :destroy, :id => 2
-                assert_redirected_to 'projects/ecookbook/issues'
+                assert_redirected_to :action => 'index', :project_id => 'ecookbook'
                 assert_nil Issue.find_by_id(2)
               end
               def test_destroy_issues_with_time_entries
                 @request.session[:user_id] = 2
                 post :destroy, :ids => [1, 3]
                 assert_response :success
                 assert_template 'destroy'
                 assert_not_nil assigns(:hours)
                 assert Issue.find_by_id(1) && Issue.find_by_id(3)
               end
               def test_destroy_issues_and_destroy_time_entries
                 @request.session[:user_id] = 2
                 post :destroy, :ids => [1, 3], :todo => 'destroy'
-                assert_redirected_to 'projects/ecookbook/issues'
+                assert_redirected_to :action => 'index', :project_id => 'ecookbook'
                 assert !(Issue.find_by_id(1) || Issue.find_by_id(3))
                 assert_nil TimeEntry.find_by_id([1, 2])
               end
               def test_destroy_issues_and_assign_time_entries_to_project
                 @request.session[:user_id] = 2
                 post :destroy, :ids => [1, 3], :todo => 'nullify'
-                assert_redirected_to 'projects/ecookbook/issues'
+                assert_redirected_to :action => 'index', :project_id => 'ecookbook'
                 assert !(Issue.find_by_id(1) || Issue.find_by_id(3))
                 assert_nil TimeEntry.find(1).issue_id
                 assert_nil TimeEntry.find(2).issue_id
               end
               def test_destroy_issues_and_reassign_time_entries_to_another_issue
                 @request.session[:user_id] = 2
                 post :destroy, :ids => [1, 3], :todo => 'reassign', :reassign_to_id => 2
-                assert_redirected_to 'projects/ecookbook/issues'
+                assert_redirected_to :action => 'index', :project_id => 'ecookbook'
                 assert !(Issue.find_by_id(1) || Issue.find_by_id(3))
                 assert_equal 2, TimeEntry.find(1).issue_id
                 assert_equal 2, TimeEntry.find(2).issue_id
               end
             end

test/functional/messages_controller_test.rb +43 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 'messages_controller'
             # Re-raise errors caught by the controller.
             class MessagesController; def rescue_action(e) raise e end; end
             class MessagesControllerTest < Test::Unit::TestCase
               fixtures :projects, :users, :members, :roles, :boards, :messages, :enabled_modules
               def setup
                 @controller = MessagesController.new
                 @request    = ActionController::TestRequest.new
                 @response   = ActionController::TestResponse.new
                 User.current = nil
               end
+              def test_show_routing
+                assert_routing(
+                  {:method => :get, :path => '/boards/22/topics/2'},
+                  :controller => 'messages', :action => 'show', :id => '2', :board_id => '22'
+                )
+              end
               def test_show
                 get :show, :board_id => 1, :id => 1
                 assert_response :success
                 assert_template 'show'
                 assert_not_nil assigns(:board)
                 assert_not_nil assigns(:project)
                 assert_not_nil assigns(:topic)
               end
               def test_show_with_reply_permission
                 @request.session[:user_id] = 2
                 get :show, :board_id => 1, :id => 1
                 assert_response :success
                 assert_template 'show'
                 assert_tag :div, :attributes => { :id => 'reply' },
                                  :descendant => { :tag => 'textarea', :attributes => { :id => 'message_content' } }
               end
               def test_show_message_not_found
                 get :show, :board_id => 1, :id => 99999
                 assert_response 404
               end
+              def test_new_routing
+                assert_routing(
+                  {:method => :get, :path => '/boards/lala/topics/new'},
+                  :controller => 'messages', :action => 'new', :board_id => 'lala'
+                )
+                assert_recognizes(#TODO: POST to collection, need to adjust form accordingly
+                  {:controller => 'messages', :action => 'new', :board_id => 'lala'},
+                  {:method => :post, :path => '/boards/lala/topics/new'}
+                )
+              end
               def test_get_new
                 @request.session[:user_id] = 2
                 get :new, :board_id => 1
                 assert_response :success
                 assert_template 'new'
               end
               def test_post_new
                 @request.session[:user_id] = 2
                 ActionMailer::Base.deliveries.clear
                 Setting.notified_events = ['message_posted']
                 post :new, :board_id => 1,
                            :message => { :subject => 'Test created message',
                                          :content => 'Message body'}
                 assert_redirected_to 'messages/show'
                 message = Message.find_by_subject('Test created message')
                 assert_not_nil message
                 assert_equal 'Message body', message.content
                 assert_equal 2, message.author_id
                 assert_equal 1, message.board_id
                 mail = ActionMailer::Base.deliveries.last
                 assert_kind_of TMail::Mail, mail
                 assert_equal "[#{message.board.project.name} - #{message.board.name} - msg#{message.root.id}] Test created message", mail.subject
                 assert mail.body.include?('Message body')
                 # author
                 assert mail.bcc.include?('jsmith@somenet.foo')
                 # project member
                 assert mail.bcc.include?('dlopper@somenet.foo')
               end
+              def test_edit_routing
+                assert_routing(
+                  {:method => :get, :path => '/boards/lala/topics/22/edit'},
+                  :controller => 'messages', :action => 'edit', :board_id => 'lala', :id => '22'
+                )
+                assert_recognizes( #TODO: use PUT to topic_path, modify form accordingly
+                  {:controller => 'messages', :action => 'edit', :board_id => 'lala', :id => '22'},
+                  {:method => :post, :path => '/boards/lala/topics/22/edit'}
+                )
+              end
               def test_get_edit
                 @request.session[:user_id] = 2
                 get :edit, :board_id => 1, :id => 1
                 assert_response :success
                 assert_template 'edit'
               end
               def test_post_edit
                 @request.session[:user_id] = 2
                 post :edit, :board_id => 1, :id => 1,
                             :message => { :subject => 'New subject',
                                           :content => 'New body'}
                 assert_redirected_to 'messages/show'
                 message = Message.find(1)
                 assert_equal 'New subject', message.subject
                 assert_equal 'New body', message.content
               end
+              def test_reply_routing
+                assert_recognizes(
+                  {:controller => 'messages', :action => 'reply', :board_id => '22', :id => '555'},
+                  {:method => :post, :path => '/boards/22/topics/555/replies'}
+                )
+              end
               def test_reply
                 @request.session[:user_id] = 2
                 post :reply, :board_id => 1, :id => 1, :reply => { :content => 'This is a test reply', :subject => 'Test reply' }
                 assert_redirected_to 'messages/show'
                 assert Message.find_by_subject('Test reply')
               end
+              def test_destroy_routing
+                assert_recognizes(#TODO: use DELETE to topic_path, adjust form accordingly
+                  {:controller => 'messages', :action => 'destroy', :board_id => '22', :id => '555'},
+                  {:method => :post, :path => '/boards/22/topics/555/destroy'}
+                )
+              end
               def test_destroy_topic
                 @request.session[:user_id] = 2
                 post :destroy, :board_id => 1, :id => 1
                 assert_redirected_to 'boards/show'
                 assert_nil Message.find_by_id(1)
               end
               def test_quote
                 @request.session[:user_id] = 2
                 xhr :get, :quote, :board_id => 1, :id => 3
                 assert_response :success
                 assert_select_rjs :show, 'reply'
               end
             end

test/functional/news_controller_test.rb +64 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 '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, :news, :comments
               def setup
                 @controller = NewsController.new
                 @request    = ActionController::TestRequest.new
                 @response   = ActionController::TestResponse.new
                 User.current = nil
               end
+              def test_index_routing
+                assert_routing(
+                  {:method => :get, :path => '/news'},
+                  :controller => 'news', :action => 'index'
+                )
+              end
+              def test_index_routing_formatted
+                assert_routing(
+                  {:method => :get, :path => '/news.atom'},
+                  :controller => 'news', :action => 'index', :format => 'atom'
+                )
+              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_routing
+                assert_routing(
+                  {:method => :get, :path => '/projects/567/news'},
+                  :controller => 'news', :action => 'index', :project_id => '567'
+                )
+              end
+              def test_index_with_project_routing_formatted
+                assert_routing(
+                  {:method => :get, :path => '/projects/567/news.atom'},
+                  :controller => 'news', :action => 'index', :project_id => '567', :format => 'atom'
+                )
+              end
               def test_index_with_project
                 get :index, :project_id => 1
                 assert_response :success
                 assert_template 'index'
                 assert_not_nil assigns(:newss)
               end
+              def test_show_routing
+                assert_routing(
+                  {:method => :get, :path => '/news/2'},
+                  :controller => 'news', :action => 'show', :id => '2'
+                )
+              end
               def test_show
                 get :show, :id => 1
                 assert_response :success
                 assert_template 'show'
                 assert_tag :tag => 'h2', :content => /eCookbook first release/
               end
               def test_show_not_found
                 get :show, :id => 999
                 assert_response 404
               end
+              def test_new_routing
+                assert_routing(
+                  {:method => :get, :path => '/projects/567/news/new'},
+                  :controller => 'news', :action => 'new', :project_id => '567'
+                )
+                assert_recognizes(
+                  {:controller => 'news', :action => 'new', :project_id => '567'},
+                  {:method => :post, :path => '/projects/567/news'}
+                )
+              end
               def test_get_new
                 @request.session[:user_id] = 2
                 get :new, :project_id => 1
                 assert_response :success
                 assert_template 'new'
               end
               def test_post_new
                 @request.session[:user_id] = 2
                 post :new, :project_id => 1, :news => { :title => 'NewsControllerTest',
                                                         :description => 'This is the description',
                                                         :summary => '' }
                 assert_redirected_to 'projects/ecookbook/news'
                 news = News.find_by_title('NewsControllerTest')
                 assert_not_nil news
                 assert_equal 'This is the description', news.description
                 assert_equal User.find(2), news.author
                 assert_equal Project.find(1), news.project
               end
+              def test_edit_routing
+                assert_routing(
+                  {:method => :get, :path => '/news/234'},
+                  :controller => 'news', :action => 'show', :id => '234'
+                )
+                assert_recognizes(#TODO: PUT to news URI instead, need to modify form
+                  {:controller => 'news', :action => 'edit', :id => '567'},
+                  {:method => :post, :path => '/news/567/edit'}
+                )
+              end
               def test_get_edit
                 @request.session[:user_id] = 2
                 get :edit, :id => 1
                 assert_response :success
                 assert_template 'edit'
               end
               def test_post_edit
                 @request.session[:user_id] = 2
                 post :edit, :id => 1, :news => { :description => 'Description changed by test_post_edit' }
                 assert_redirected_to 'news/show/1'
                 news = News.find(1)
                 assert_equal 'Description changed by test_post_edit', news.description
               end
               def test_post_new_with_validation_failure
                 @request.session[:user_id] = 2
                 post :new, :project_id => 1, :news => { :title => '',
                                                         :description => 'This is the description',
                                                         :summary => '' }
                 assert_response :success
                 assert_template 'new'
                 assert_not_nil assigns(:news)
                 assert assigns(:news).new_record?
                 assert_tag :tag => 'div', :attributes => { :id => 'errorExplanation' },
                                           :content => /1 error/
               end
               def test_add_comment
                 @request.session[:user_id] = 2
                 post :add_comment, :id => 1, :comment => { :comments => 'This is a NewsControllerTest comment' }
                 assert_redirected_to 'news/show/1'
                 comment = News.find(1).comments.find(:first, :order => 'created_on DESC')
                 assert_not_nil comment
                 assert_equal 'This is a NewsControllerTest comment', comment.comments
                 assert_equal User.find(2), comment.author
               end
               def test_destroy_comment
                 comments_count = News.find(1).comments.size
                 @request.session[:user_id] = 2
                 post :destroy_comment, :id => 1, :comment_id => 2
                 assert_redirected_to 'news/show/1'
                 assert_nil Comment.find_by_id(2)
                 assert_equal comments_count - 1, News.find(1).comments.size
               end
+              def test_destroy_routing
+                assert_recognizes(#TODO: should use DELETE to news URI, need to change form
+                  {:controller => 'news', :action => 'destroy', :id => '567'},
+                  {:method => :post, :path => '/news/567/destroy'}
+                )
+              end
               def test_destroy
                 @request.session[:user_id] = 2
                 post :destroy, :id => 1
                 assert_redirected_to 'projects/ecookbook/news'
                 assert_nil News.find_by_id(1)
               end
               def test_preview
                 get :preview, :project_id => 1,
                               :news => {:title => '',
                                         :description => 'News description',
                                         :summary => ''}
                 assert_response :success
                 assert_template 'common/_preview'
                 assert_tag :tag => 'fieldset', :attributes => { :class => 'preview' },
                                                :content => /News description/
               end
             end

test/functional/projects_controller_test.rb +176 -23

             # Redmine - project management software
             # Copyright (C) 2006-2008  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 'projects_controller'
             # Re-raise errors caught by the controller.
             class ProjectsController; def rescue_action(e) raise e end; end
             class ProjectsControllerTest < Test::Unit::TestCase
               fixtures :projects, :versions, :users, :roles, :members, :issues, :journals, :journal_details,
                        :trackers, :projects_trackers, :issue_statuses, :enabled_modules, :enumerations, :boards, :messages,
                        :attachments
               def setup
                 @controller = ProjectsController.new
                 @request    = ActionController::TestRequest.new
                 @response   = ActionController::TestResponse.new
                 @request.session[:user_id] = nil
                 Setting.default_language = 'en'
               end
+              def test_index_routing
+                assert_routing(
+                  {:method => :get, :path => '/projects'},
+                  :controller => 'projects', :action => 'index'
+                )
+              end
               def test_index
                 get :index
                 assert_response :success
                 assert_template 'index'
                 assert_not_nil assigns(:projects)
                 assert_tag :ul, :child => {:tag => 'li',
                                            :descendant => {:tag => 'a', :content => 'eCookbook'},
                                            :child => { :tag => 'ul',
                                                        :descendant => { :tag => 'a',
                                                                         :content => 'Child of private child'
                                                                        }
                                                       }
                                            }
                 assert_no_tag :a, :content => /Private child of eCookbook/
               end
+              def test_index_atom_routing
+                assert_routing(
+                  {:method => :get, :path => '/projects.atom'},
+                  :controller => 'projects', :action => 'index', :format => 'atom'
+                )
+              end
               def test_index_atom
                 get :index, :format => 'atom'
                 assert_response :success
                 assert_template 'common/feed.atom.rxml'
                 assert_select 'feed>title', :text => 'Redmine: Latest projects'
                 assert_select 'feed>entry', :count => Project.count(:conditions => Project.visible_by(User.current))
               end
-              def test_show_by_id
+              def test_add_routing
-                get :show, :id => 1
+                assert_routing(
+                  {:method => :get, :path => '/projects/new'},
+                  :controller => 'projects', :action => 'add'
+                )
+                assert_recognizes(
+                  {:controller => 'projects', :action => 'add'},
+                  {:method => :post, :path => '/projects/new'}
+                )
+                assert_recognizes(
+                  {:controller => 'projects', :action => 'add'},
+                  {:method => :post, :path => '/projects'}
+                )
+              end
+              def test_show_routing
+                assert_routing(
+                  {:method => :get, :path => '/projects/test'},
+                  :controller => 'projects', :action => 'show', :id => 'test'
+                )
+              end
+              def test_show_by_id
+                get :show, :id => 1
                 assert_response :success
                 assert_template 'show'
                 assert_not_nil assigns(:project)
               end
               def test_show_by_identifier
                 get :show, :id => 'ecookbook'
                 assert_response :success
                 assert_template 'show'
                 assert_not_nil assigns(:project)
                 assert_equal Project.find_by_identifier('ecookbook'), assigns(:project)
               end
               def test_private_subprojects_hidden
                 get :show, :id => 'ecookbook'
                 assert_response :success
                 assert_template 'show'
                 assert_no_tag :tag => 'a', :content => /Private child/
               end
               def test_private_subprojects_visible
                 @request.session[:user_id] = 2 # manager who is a member of the private subproject
                 get :show, :id => 'ecookbook'
                 assert_response :success
                 assert_template 'show'
                 assert_tag :tag => 'a', :content => /Private child/
               end
+              def test_settings_routing
+                assert_routing(
+                  {:method => :get, :path => '/projects/4223/settings'},
+                  :controller => 'projects', :action => 'settings', :id => '4223'
+                )
+                assert_routing(
+                  {:method => :get, :path => '/projects/4223/settings/members'},
+                  :controller => 'projects', :action => 'settings', :id => '4223', :tab => 'members'
+                )
+              end
               def test_settings
                 @request.session[:user_id] = 2 # manager
                 get :settings, :id => 1
                 assert_response :success
                 assert_template 'settings'
               end
               def test_edit
                 @request.session[:user_id] = 2 # manager
                 post :edit, :id => 1, :project => {:name => 'Test changed name',
                                                    :issue_custom_field_ids => ['']}
                 assert_redirected_to 'projects/settings/ecookbook'
                 project = Project.find(1)
                 assert_equal 'Test changed name', project.name
               end
+              def test_add_version_routing
+                assert_routing(
+                  {:method => :get, :path => 'projects/64/versions/new'},
+                  :controller => 'projects', :action => 'add_version', :id => '64'
+                )
+                assert_routing(
+                #TODO: use PUT
+                  {:method => :post, :path => 'projects/64/versions/new'},
+                  :controller => 'projects', :action => 'add_version', :id => '64'
+                )
+              end
+              def test_add_issue_category_routing
+                assert_routing(
+                  {:method => :get, :path => 'projects/test/categories/new'},
+                  :controller => 'projects', :action => 'add_issue_category', :id => 'test'
+                )
+                assert_routing(
+                #TODO: use PUT and update form
+                  {:method => :post, :path => 'projects/64/categories/new'},
+                  :controller => 'projects', :action => 'add_issue_category', :id => '64'
+                )
+              end
+              def test_destroy_routing
+                assert_routing(
+                  {:method => :get, :path => '/projects/567/destroy'},
+                  :controller => 'projects', :action => 'destroy', :id => '567'
+                )
+                assert_routing(
+                #TODO: use DELETE and update form
+                  {:method => :post, :path => 'projects/64/destroy'},
+                  :controller => 'projects', :action => 'destroy', :id => '64'
+                )
+              end
               def test_get_destroy
                 @request.session[:user_id] = 1 # admin
                 get :destroy, :id => 1
                 assert_response :success
                 assert_template 'destroy'
                 assert_not_nil Project.find_by_id(1)
               end
               def test_post_destroy
                 @request.session[:user_id] = 1 # admin
                 post :destroy, :id => 1, :confirm => 1
                 assert_redirected_to 'admin/projects'
                 assert_nil Project.find_by_id(1)
               end
               def test_add_file
                 set_tmp_attachments_directory
                 @request.session[:user_id] = 2
                 Setting.notified_events = ['file_added']
                 ActionMailer::Base.deliveries.clear
                 assert_difference 'Attachment.count' do
                   post :add_file, :id => 1, :version_id => '',
                        :attachments => {'1' => {'file' => test_uploaded_file('testfile.txt', 'text/plain')}}
                 end
                 assert_redirected_to 'projects/list_files/ecookbook'
                 a = Attachment.find(:first, :order => 'created_on DESC')
                 assert_equal 'testfile.txt', a.filename
                 assert_equal Project.find(1), a.container
                 mail = ActionMailer::Base.deliveries.last
                 assert_kind_of TMail::Mail, mail
                 assert_equal "[eCookbook] New file", mail.subject
                 assert mail.body.include?('testfile.txt')
               end
+              def test_add_file_routing
+                assert_routing(
+                  {:method => :get, :path => '/projects/33/files/new'},
+                  :controller => 'projects', :action => 'add_file', :id => '33'
+                )
+                assert_routing(
+                  {:method => :post, :path => '/projects/33/files/new'},
+                  :controller => 'projects', :action => 'add_file', :id => '33'
+                )
+              end
               def test_add_version_file
                 set_tmp_attachments_directory
                 @request.session[:user_id] = 2
                 Setting.notified_events = ['file_added']
                 assert_difference 'Attachment.count' do
                   post :add_file, :id => 1, :version_id => '2',
                        :attachments => {'1' => {'file' => test_uploaded_file('testfile.txt', 'text/plain')}}
                 end
                 assert_redirected_to 'projects/list_files/ecookbook'
                 a = Attachment.find(:first, :order => 'created_on DESC')
                 assert_equal 'testfile.txt', a.filename
                 assert_equal Version.find(2), a.container
               end
               def test_list_files
                 get :list_files, :id => 1
                 assert_response :success
                 assert_template 'list_files'
                 assert_not_nil assigns(:containers)
                 # file attached to the project
                 assert_tag :a, :content => 'project_file.zip',
                                :attributes => { :href => '/attachments/download/8/project_file.zip' }
                 # file attached to a project's version
                 assert_tag :a, :content => 'version_file.zip',
                                :attributes => { :href => '/attachments/download/9/version_file.zip' }
               end
-              def test_changelog
+              def test_list_files_routing
-                get :changelog, :id => 1
+                assert_routing(
-                assert_response :success
+                  {:method => :get, :path => '/projects/33/files'},
-                assert_template 'changelog'
+                  :controller => 'projects', :action => 'list_files', :id => '33'
-                assert_not_nil assigns(:versions)
+              end
+              def test_changelog_routing
+                assert_routing(
+                  {:method => :get, :path => '/projects/44/changelog'},
+                  :controller => 'projects', :action => 'changelog', :id => '44'
+                )
+              end
+              def test_changelog
+                get :changelog, :id => 1
+                assert_response :success
+                assert_template 'changelog'
+                assert_not_nil assigns(:versions)
+              end
+              def test_roadmap_routing
+                assert_routing(
+                  {:method => :get, :path => 'projects/33/roadmap'},
+                  :controller => 'projects', :action => 'roadmap', :id => '33'
+                )
               end
               def test_roadmap
                 get :roadmap, :id => 1
                 assert_response :success
                 assert_template 'roadmap'
                 assert_not_nil assigns(:versions)
                 # Version with no date set appears
                 assert assigns(:versions).include?(Version.find(3))
                 # Completed version doesn't appear
                 assert !assigns(:versions).include?(Version.find(1))
               end
               def test_roadmap_with_completed_versions
                 get :roadmap, :id => 1, :completed => 1
                 assert_response :success
                 assert_template 'roadmap'
                 assert_not_nil assigns(:versions)
                 # Version with no date set appears
                 assert assigns(:versions).include?(Version.find(3))
                 # Completed version appears
                 assert assigns(:versions).include?(Version.find(1))
               end
+              def test_project_activity_routing
+                assert_routing(
+                  {:method => :get, :path => '/projects/1/activity'},
+                   :controller => 'projects', :action => 'activity', :id => '1'
+                )
+              end
+              def test_project_activity_atom_routing
+                assert_routing(
+                  {:method => :get, :path => '/projects/1/activity.atom'},
+                   :controller => 'projects', :action => 'activity', :id => '1', :format => 'atom'
+                )
+              end
               def test_project_activity
                 get :activity, :id => 1, :with_subprojects => 0
                 assert_response :success
                 assert_template 'activity'
                 assert_not_nil assigns(:events_by_day)
                 assert_tag :tag => "h3",
                            :content => /#{2.days.ago.to_date.day}/,
                            :sibling => { :tag => "dl",
                              :child => { :tag => "dt",
                                :attributes => { :class => /issue-edit/ },
                                :child => { :tag => "a",
                                  :content => /(#{IssueStatus.find(2).name})/,
                                }
                              }
                            }
               end
               def test_previous_project_activity
                 get :activity, :id => 1, :from => 3.days.ago.to_date
                 assert_response :success
                 assert_template 'activity'
                 assert_not_nil assigns(:events_by_day)
                 assert_tag :tag => "h3",
                            :content => /#{3.day.ago.to_date.day}/,
                            :sibling => { :tag => "dl",
                              :child => { :tag => "dt",
                                :attributes => { :class => /issue/ },
                                :child => { :tag => "a",
                                  :content => /#{Issue.find(1).subject}/,
                                }
                              }
                            }
               end
+              def test_global_activity_routing
+                assert_routing({:method => :get, :path => '/activity'}, :controller => 'projects', :action => 'activity')
+              end
               def test_global_activity
                 get :activity
                 assert_response :success
                 assert_template 'activity'
                 assert_not_nil assigns(:events_by_day)
                 assert_tag :tag => "h3",
                            :content => /#{5.day.ago.to_date.day}/,
                            :sibling => { :tag => "dl",
                              :child => { :tag => "dt",
                                :attributes => { :class => /issue/ },
                                :child => { :tag => "a",
                                  :content => /#{Issue.find(5).subject}/,
                                }
                              }
                            }
               end
               def test_user_activity
                 get :activity, :user_id => 2
                 assert_response :success
                 assert_template 'activity'
                 assert_not_nil assigns(:events_by_day)
                 assert_tag :tag => "h3",
                            :content => /#{3.day.ago.to_date.day}/,
                            :sibling => { :tag => "dl",
                              :child => { :tag => "dt",
                                :attributes => { :class => /issue/ },
                                :child => { :tag => "a",
                                  :content => /#{Issue.find(1).subject}/,
                                }
                              }
                            }
               end
+              def test_global_activity_atom_routing
+                assert_routing({:method => :get, :path => '/activity.atom'}, :controller => 'projects', :action => 'activity', :format => 'atom')
+              end
               def test_activity_atom_feed
                 get :activity, :format => 'atom'
                 assert_response :success
                 assert_template 'common/feed.atom.rxml'
               end
-              def test_archive
+              def test_archive_routing
+                assert_routing(
+                #TODO: use PUT to project path and modify form
+                  {:method => :post, :path => 'projects/64/archive'},
+                  :controller => 'projects', :action => 'archive', :id => '64'
+                )
+              end
+              def test_archive
                 @request.session[:user_id] = 1 # admin
                 post :archive, :id => 1
                 assert_redirected_to 'admin/projects'
                 assert !Project.find(1).active?
               end
+              def test_unarchive_routing
+                assert_routing(
+                #TODO: use PUT to project path and modify form
+                  {:method => :post, :path => '/projects/567/unarchive'},
+                  :controller => 'projects', :action => 'unarchive', :id => '567'
+                )
+              end
               def test_unarchive
                 @request.session[:user_id] = 1 # admin
                 Project.find(1).archive
                 post :unarchive, :id => 1
                 assert_redirected_to 'admin/projects'
                 assert Project.find(1).active?
               end
               def test_jump_should_redirect_to_active_tab
                 get :show, :id => 1, :jump => 'issues'
                 assert_redirected_to 'projects/ecookbook/issues'
               end
               def test_jump_should_not_redirect_to_inactive_tab
                 get :show, :id => 3, :jump => 'documents'
                 assert_response :success
                 assert_template 'show'
               end
               def test_jump_should_not_redirect_to_unknown_tab
                 get :show, :id => 3, :jump => 'foobar'
                 assert_response :success
                 assert_template 'show'
               end
               def test_project_menu
                 assert_no_difference 'Redmine::MenuManager.items(:project_menu).size' do
                   Redmine::MenuManager.map :project_menu do |menu|
                     menu.push :foo, { :controller => 'projects', :action => 'show' }, :cation => 'Foo'
                     menu.push :bar, { :controller => 'projects', :action => 'show' }, :before => :activity
                     menu.push :hello, { :controller => 'projects', :action => 'show' }, :caption => Proc.new {|p| p.name.upcase }, :after => :bar
                   end
                   get :show, :id => 1
                   assert_tag :div, :attributes => { :id => 'main-menu' },
                                    :descendant => { :tag => 'li', :child => { :tag => 'a', :content => 'Foo',
                                                                                            :attributes => { :class => 'foo' } } }
                   assert_tag :div, :attributes => { :id => 'main-menu' },
                                    :descendant => { :tag => 'li', :child => { :tag => 'a', :content => 'Bar',
                                                                                            :attributes => { :class => 'bar' } },
                                                                   :before => { :tag => 'li', :child => { :tag => 'a', :content => 'ECOOKBOOK' } } }
                   assert_tag :div, :attributes => { :id => 'main-menu' },
                                    :descendant => { :tag => 'li', :child => { :tag => 'a', :content => 'ECOOKBOOK',
                                                                                            :attributes => { :class => 'hello' } },
                                                                   :before => { :tag => 'li', :child => { :tag => 'a', :content => 'Activity' } } }
                   # Remove the menu items
                   Redmine::MenuManager.map :project_menu do |menu|
                     menu.delete :foo
                     menu.delete :bar
                     menu.delete :hello
                   end
                 end
               end
               # A hook that is manually registered later
               class ProjectBasedTemplate < Redmine::Hook::ViewListener
                 def view_layouts_base_html_head(context)
                   # Adds a project stylesheet
                   stylesheet_link_tag(context[:project].identifier) if context[:project]
                 end
               end
               # Don't use this hook now
               Redmine::Hook.clear_listeners
               def test_hook_response
                 Redmine::Hook.add_listener(ProjectBasedTemplate)
                 get :show, :id => 1
                 assert_tag :tag => 'link', :attributes => {:href => '/stylesheets/ecookbook.css'},
                                            :parent => {:tag => 'head'}
                 Redmine::Hook.clear_listeners
               end
             end

test/functional/repositories_controller_test.rb +111 -2

             # 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 'repositories_controller'
             # Re-raise errors caught by the controller.
             class RepositoriesController; def rescue_action(e) raise e end; end
             class RepositoriesControllerTest < Test::Unit::TestCase
               fixtures :projects, :users, :roles, :members, :repositories, :issues, :issue_statuses, :changesets, :changes, :issue_categories, :enumerations, :custom_fields, :custom_values, :trackers
               def setup
                 @controller = RepositoriesController.new
                 @request    = ActionController::TestRequest.new
                 @response   = ActionController::TestResponse.new
                 User.current = nil
               end
+              def test_show_routing
+                assert_routing(
+                  {:method => :get, :path => '/projects/redmine/repository'},
+                  :controller => 'repositories', :action => 'show', :id => 'redmine'
+                )
+              end
+              def test_edit_routing
+                assert_routing(
+                  {:method => :get, :path => '/projects/world_domination/repository/edit'},
+                  :controller => 'repositories', :action => 'edit', :id => 'world_domination'
+                )
+                assert_routing(
+                  {:method => :post, :path => '/projects/world_domination/repository/edit'},
+                  :controller => 'repositories', :action => 'edit', :id => 'world_domination'
+                )
+              end
+              def test_revisions_routing
+                assert_routing(
+                  {:method => :get, :path => '/projects/redmine/repository/revisions'},
+                  :controller => 'repositories', :action => 'revisions', :id => 'redmine'
+                )
+              end
+              def test_revisions_atom_routing
+                assert_routing(
+                  {:method => :get, :path => '/projects/redmine/repository/revisions.atom'},
+                  :controller => 'repositories', :action => 'revisions', :id => 'redmine', :format => 'atom'
+                )
+              end
               def test_revisions
                 get :revisions, :id => 1
                 assert_response :success
                 assert_template 'revisions'
                 assert_not_nil assigns(:changesets)
               end
+              def test_revision_routing
+                assert_routing(
+                  {:method => :get, :path => '/projects/restmine/repository/revisions/2457'},
+                  :controller => 'repositories', :action => 'revision', :id => 'restmine', :rev => '2457'
+                )
+              end
               def test_revision_with_before_nil_and_afer_normal
                 get :revision, {:id => 1, :rev => 1}
                 assert_response :success
                 assert_template 'revision'
                 assert_no_tag :tag => "div", :attributes => { :class => "contextual" },
-                  :child => { :tag => "a", :attributes => { :href => '/repositories/revision/ecookbook/0'}
+                  :child => { :tag => "a", :attributes => { :href => '/projects/ecookbook/repository/revisions/0'}
                 }
                 assert_tag :tag => "div", :attributes => { :class => "contextual" },
-                    :child => { :tag => "a", :attributes => { :href => '/repositories/revision/ecookbook/2'}
+                    :child => { :tag => "a", :attributes => { :href => '/projects/ecookbook/repository/revisions/2'}
                 }
               end
+              def test_diff_routing
+                assert_routing(
+                  {:method => :get, :path => '/projects/restmine/repository/revisions/2457/diff'},
+                  :controller => 'repositories', :action => 'diff', :id => 'restmine', :rev => '2457'
+                )
+              end
+              def test_unified_diff_routing
+                assert_routing(
+                  {:method => :get, :path => '/projects/restmine/repository/revisions/2457/diff.diff'},
+                  :controller => 'repositories', :action => 'diff', :id => 'restmine', :rev => '2457', :format => 'diff'
+                )
+              end
+              def test_diff_path_routing
+                assert_routing(
+                  {:method => :get, :path => '/projects/restmine/repository/diff/path/to/file.c'},
+                  :controller => 'repositories', :action => 'diff', :id => 'restmine', :path => %w[path to file.c]
+                )
+              end
+              def test_diff_path_routing_with_revision
+                assert_routing(
+                  {:method => :get, :path => '/projects/restmine/repository/revisions/2/diff/path/to/file.c'},
+                  :controller => 'repositories', :action => 'diff', :id => 'restmine', :path => %w[path to file.c], :rev => '2'
+                )
+              end
+              def test_browse_routing
+                assert_routing(
+                  {:method => :get, :path => '/projects/restmine/repository/browse/path/to/dir'},
+                  :controller => 'repositories', :action => 'browse', :id => 'restmine', :path => %w[path to dir]
+                )
+              end
+              def test_entry_routing
+                assert_routing(
+                  {:method => :get, :path => '/projects/restmine/repository/entry/path/to/file.c'},
+                  :controller => 'repositories', :action => 'entry', :id => 'restmine', :path => %w[path to file.c]
+                )
+              end
+              def test_entry_routing_with_revision
+                assert_routing(
+                  {:method => :get, :path => '/projects/restmine/repository/revisions/2/entry/path/to/file.c'},
+                  :controller => 'repositories', :action => 'entry', :id => 'restmine', :path => %w[path to file.c], :rev => '2'
+                )
+              end
+              def test_annotate_routing
+                assert_routing(
+                  {:method => :get, :path => '/projects/restmine/repository/annotate/path/to/file.c'},
+                  :controller => 'repositories', :action => 'annotate', :id => 'restmine', :path => %w[path to file.c]
+                )
+              end
+              def test_changesrouting
+                assert_routing(
+                  {:method => :get, :path => '/projects/restmine/repository/changes/path/to/file.c'},
+                  :controller => 'repositories', :action => 'changes', :id => 'restmine', :path => %w[path to file.c]
+                )
+              end
+              def test_statistics_routing
+                assert_routing(
+                  {:method => :get, :path => '/projects/restmine/repository/statistics'},
+                  :controller => 'repositories', :action => 'stats', :id => 'restmine'
+                )
+              end
               def test_graph_commits_per_month
                 get :graph, :id => 1, :graph => 'commits_per_month'
                 assert_response :success
                 assert_equal 'image/svg+xml', @response.content_type
               end
               def test_graph_commits_per_author
                 get :graph, :id => 1, :graph => 'commits_per_author'
                 assert_response :success
                 assert_equal 'image/svg+xml', @response.content_type
               end
               def test_committers
                 @request.session[:user_id] = 2
                 # add a commit with an unknown user
                 Changeset.create!(:repository => Project.find(1).repository, :committer => 'foo', :committed_on => Time.now, :revision => 100, :comments => 'Committed by foo.')
                 get :committers, :id => 1
                 assert_response :success
                 assert_template 'committers'
                 assert_tag :td, :content => 'dlopper',
                                 :sibling => { :tag => 'td',
                                               :child => { :tag => 'select', :attributes => { :name => %r{^committers\[\d+\]\[\]$} },
                                                                             :child => { :tag => 'option', :content => 'Dave Lopper',
                                                                                                           :attributes => { :value => '3', :selected => 'selected' }}}}
                 assert_tag :td, :content => 'foo',
                                 :sibling => { :tag => 'td',
                                               :child => { :tag => 'select', :attributes => { :name => %r{^committers\[\d+\]\[\]$} }}}
                 assert_no_tag :td, :content => 'foo',
                                    :sibling => { :tag => 'td',
                                                  :descendant => { :tag => 'option', :attributes => { :selected => 'selected' }}}
               end
               def test_map_committers
                 @request.session[:user_id] = 2
                 # add a commit with an unknown user
                 c = Changeset.create!(:repository => Project.find(1).repository, :committer => 'foo', :committed_on => Time.now, :revision => 100, :comments => 'Committed by foo.')
                 assert_no_difference "Changeset.count(:conditions => 'user_id = 3')" do
                   post :committers, :id => 1, :committers => { '0' => ['foo', '2'], '1' => ['dlopper', '3']}
                   assert_redirected_to '/repositories/committers/ecookbook'
                   assert_equal User.find(2), c.reload.user
                 end
               end
             end

test/functional/repositories_subversion_controller_test.rb +4 -4

             # redMine - project management software
             # Copyright (C) 2006-2008  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 'repositories_controller'
             # Re-raise errors caught by the controller.
             class RepositoriesController; def rescue_action(e) raise e end; end
             class RepositoriesSubversionControllerTest < Test::Unit::TestCase
               fixtures :projects, :users, :roles, :members, :enabled_modules,
                        :repositories, :issues, :issue_statuses, :changesets, :changes,
                        :issue_categories, :enumerations, :custom_fields, :custom_values, :trackers
               # No '..' in the repository path for svn
               REPOSITORY_PATH = RAILS_ROOT.gsub(%r{config\/\.\.}, '') + '/tmp/test/subversion_repository'
               def setup
                 @controller = RepositoriesController.new
                 @request    = ActionController::TestRequest.new
                 @response   = ActionController::TestResponse.new
                 Setting.default_language = 'en'
                 User.current = nil
               end
               if File.directory?(REPOSITORY_PATH)
                 def test_show
                   get :show, :id => 1
                   assert_response :success
                   assert_template 'show'
                   assert_not_nil assigns(:entries)
                   assert_not_nil assigns(:changesets)
                 end
                 def test_browse_root
                   get :browse, :id => 1
                   assert_response :success
                   assert_template 'browse'
                   assert_not_nil assigns(:entries)
                   entry = assigns(:entries).detect {|e| e.name == 'subversion_test'}
                   assert_equal 'dir', entry.kind
                 end
                 def test_browse_directory
                   get :browse, :id => 1, :path => ['subversion_test']
                   assert_response :success
                   assert_template 'browse'
                   assert_not_nil assigns(:entries)
                   assert_equal ['folder', '.project', 'helloworld.c', 'textfile.txt'], assigns(:entries).collect(&:name)
                   entry = assigns(:entries).detect {|e| e.name == 'helloworld.c'}
                   assert_equal 'file', entry.kind
                   assert_equal 'subversion_test/helloworld.c', entry.path
                 end
                 def test_browse_at_given_revision
                   get :browse, :id => 1, :path => ['subversion_test'], :rev => 4
                   assert_response :success
                   assert_template 'browse'
                   assert_not_nil assigns(:entries)
                   assert_equal ['folder', '.project', 'helloworld.c', 'helloworld.rb', 'textfile.txt'], assigns(:entries).collect(&:name)
                 end
                 def test_changes
                   get :changes, :id => 1, :path => ['subversion_test', 'folder', 'helloworld.rb' ]
                   assert_response :success
                   assert_template 'changes'
                   # svn properties displayed with svn >= 1.5 only
                   if Redmine::Scm::Adapters::SubversionAdapter.client_version_above?([1, 5, 0])
                     assert_not_nil assigns(:properties)
                     assert_equal 'native', assigns(:properties)['svn:eol-style']
                     assert_tag :ul,
                                :child => { :tag => 'li',
                                            :child => { :tag => 'b', :content => 'svn:eol-style' },
                                            :child => { :tag => 'span', :content => 'native' } }
                   end
                 end
                 def test_entry
                   get :entry, :id => 1, :path => ['subversion_test', 'helloworld.c']
                   assert_response :success
                   assert_template 'entry'
                 end
                 def test_entry_at_given_revision
                   get :entry, :id => 1, :path => ['subversion_test', 'helloworld.rb'], :rev => 2
                   assert_response :success
                   assert_template 'entry'
                   # this line was removed in r3 and file was moved in r6
                   assert_tag :tag => 'td', :attributes => { :class => /line-code/},
                                            :content => /Here's the code/
                 end
                 def test_entry_not_found
                   get :entry, :id => 1, :path => ['subversion_test', 'zzz.c']
                   assert_tag :tag => 'div', :attributes => { :class => /error/ },
                                             :content => /The entry or revision was not found in the repository/
                 end
                 def test_entry_download
                   get :entry, :id => 1, :path => ['subversion_test', 'helloworld.c'], :format => 'raw'
                   assert_response :success
                 end
                 def test_directory_entry
                   get :entry, :id => 1, :path => ['subversion_test', 'folder']
                   assert_response :success
                   assert_template 'browse'
                   assert_not_nil assigns(:entry)
                   assert_equal 'folder', assigns(:entry).name
                 end
                 def test_revision
                   get :revision, :id => 1, :rev => 2
                   assert_response :success
                   assert_template 'revision'
                   assert_tag :tag => 'ul',
                              :child => { :tag => 'li',
                                          # link to the entry at rev 2
                                          :child => { :tag => 'a',
-                                                     :attributes => {:href => '/repositories/entry/ecookbook/test/some/path/in/the/repo?rev=2'},
+                                                     :attributes => {:href => '/projects/ecookbook/repository/revisions/2/entry/test/some/path/in/the/repo'},
                                                      :content => 'repo',
                                                      # link to partial diff
                                                      :sibling =>  { :tag => 'a',
-                                                                    :attributes => { :href => '/repositories/diff/ecookbook/test/some/path/in/the/repo?rev=2' }
+                                                                    :attributes => { :href => '/projects/ecookbook/repository/revisions/2/diff/test/some/path/in/the/repo' }
                                                                    }
                                                     }
                                         }
                 end
                 def test_revision_with_repository_pointing_to_a_subdirectory
                   r = Project.find(1).repository
                   # Changes repository url to a subdirectory
                   r.update_attribute :url, (r.url + '/test/some')
                   get :revision, :id => 1, :rev => 2
                   assert_response :success
                   assert_template 'revision'
                   assert_tag :tag => 'ul',
                              :child => { :tag => 'li',
                                          # link to the entry at rev 2
                                          :child => { :tag => 'a',
-                                                     :attributes => {:href => '/repositories/entry/ecookbook/path/in/the/repo?rev=2'},
+                                                     :attributes => {:href => '/projects/ecookbook/repository/revisions/2/entry/path/in/the/repo'},
                                                      :content => 'repo',
                                                      # link to partial diff
                                                      :sibling =>  { :tag => 'a',
-                                                                    :attributes => { :href => '/repositories/diff/ecookbook/path/in/the/repo?rev=2' }
+                                                                    :attributes => { :href => '/projects/ecookbook/repository/revisions/2/diff/path/in/the/repo' }
                                                                    }
                                                     }
                                         }
                 end
                 def test_diff
                   get :diff, :id => 1, :rev => 3
                   assert_response :success
                   assert_template 'diff'
                 end
                 def test_annotate
                   get :annotate, :id => 1, :path => ['subversion_test', 'helloworld.c']
                   assert_response :success
                   assert_template 'annotate'
                 end
               else
                 puts "Subversion test repository NOT FOUND. Skipping functional tests !!!"
                 def test_fake; assert true end
               end
             end

test/functional/timelog_controller_test.rb +113 -6

             # 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 'timelog_controller'
             # Re-raise errors caught by the controller.
             class TimelogController; def rescue_action(e) raise e end; end
             class TimelogControllerTest < Test::Unit::TestCase
               fixtures :projects, :enabled_modules, :roles, :members, :issues, :time_entries, :users, :trackers, :enumerations, :issue_statuses, :custom_fields, :custom_values
               def setup
                 @controller = TimelogController.new
                 @request    = ActionController::TestRequest.new
                 @response   = ActionController::TestResponse.new
               end
+              def test_edit_routing
+                assert_routing(
+                  {:method => :get, :path => '/issues/567/time_entries/new'},
+                  :controller => 'timelog', :action => 'edit', :issue_id => '567'
+                )
+                assert_routing(
+                  {:method => :get, :path => '/projects/ecookbook/time_entries/new'},
+                  :controller => 'timelog', :action => 'edit', :project_id => 'ecookbook'
+                )
+                assert_routing(
+                  {:method => :get, :path => '/projects/ecookbook/issues/567/time_entries/new'},
+                  :controller => 'timelog', :action => 'edit', :project_id => 'ecookbook', :issue_id => '567'
+                )
+                #TODO: change new form to POST to issue_time_entries_path instead of to edit action
+                #TODO: change edit form to PUT to time_entry_path
+                assert_routing(
+                  {:method => :get, :path => '/time_entries/22/edit'},
+                  :controller => 'timelog', :action => 'edit', :id => '22'
+                )
+              end
               def test_get_edit
                 @request.session[:user_id] = 3
                 get :edit, :project_id => 1
                 assert_response :success
                 assert_template 'edit'
                 # Default activity selected
                 assert_tag :tag => 'option', :attributes => { :selected => 'selected' },
                                              :content => 'Development'
               end
               def test_post_edit
+                # TODO: should POST to issues’ time log instead of project. change form
+                # and routing
                 @request.session[:user_id] = 3
                 post :edit, :project_id => 1,
                             :time_entry => {:comments => 'Some work on TimelogControllerTest',
                                             # Not the default activity
                                             :activity_id => '11',
                                             :spent_on => '2008-03-14',
                                             :issue_id => '1',
                                             :hours => '7.3'}
-                assert_redirected_to 'projects/ecookbook/timelog/details'
+                assert_redirected_to :action => 'details', :project_id => 'ecookbook'
                 i = Issue.find(1)
                 t = TimeEntry.find_by_comments('Some work on TimelogControllerTest')
                 assert_not_nil t
                 assert_equal 11, t.activity_id
                 assert_equal 7.3, t.hours
                 assert_equal 3, t.user_id
                 assert_equal i, t.issue
                 assert_equal i.project, t.project
               end
               def test_update
                 entry = TimeEntry.find(1)
                 assert_equal 1, entry.issue_id
                 assert_equal 2, entry.user_id
                 @request.session[:user_id] = 1
                 post :edit, :id => 1,
                             :time_entry => {:issue_id => '2',
                                             :hours => '8'}
-                assert_redirected_to 'projects/ecookbook/timelog/details'
+                assert_redirected_to :action => 'details', :project_id => 'ecookbook'
                 entry.reload
                 assert_equal 8, entry.hours
                 assert_equal 2, entry.issue_id
                 assert_equal 2, entry.user_id
               end
+              def test_destroy_routing
+                #TODO: use DELETE to time_entry_path
+                assert_routing(
+                  {:method => :post, :path => '/time_entries/55/destroy'},
+                  :controller => 'timelog', :action => 'destroy', :id => '55'
+                )
+              end
               def test_destroy
                 @request.session[:user_id] = 2
                 post :destroy, :id => 1
-                assert_redirected_to 'projects/ecookbook/timelog/details'
+                assert_redirected_to :action => 'details', :project_id => 'ecookbook'
                 assert_nil TimeEntry.find_by_id(1)
               end
+              def test_report_routing
+                assert_routing(
+                  {:method => :get, :path => '/projects/567/time_entries/report'},
+                  :controller => 'timelog', :action => 'report', :project_id => '567'
+                )
+                assert_routing(
+                  {:method => :get, :path => '/projects/567/time_entries/report.csv'},
+                  :controller => 'timelog', :action => 'report', :project_id => '567', :format => 'csv'
+                )
+              end
               def test_report_no_criteria
                 get :report, :project_id => 1
                 assert_response :success
                 assert_template 'report'
               end
+              def test_report_routing_for_all_projects
+                assert_routing(
+                  {:method => :get, :path => '/time_entries/report'},
+                  :controller => 'timelog', :action => 'report'
+                )
+              end
               def test_report_all_projects
                 get :report
                 assert_response :success
                 assert_template 'report'
               end
               def test_report_all_projects_denied
                 r = Role.anonymous
                 r.permissions.delete(:view_time_entries)
                 r.permissions_will_change!
                 r.save
                 get :report
-                assert_redirected_to '/login?back_url=http%3A%2F%2Ftest.host%2Ftimelog%2Freport'
+                assert_redirected_to '/login?back_url=http%3A%2F%2Ftest.host%2Ftime_entries%2Freport'
               end
               def test_report_all_projects_one_criteria
                 get :report, :columns => 'week', :from => "2007-04-01", :to => "2007-04-30", :criterias => ['project']
                 assert_response :success
                 assert_template 'report'
                 assert_not_nil assigns(:total_hours)
                 assert_equal "8.65", "%.2f" % assigns(:total_hours)
               end
               def test_report_all_time
                 get :report, :project_id => 1, :criterias => ['project', 'issue']
                 assert_response :success
                 assert_template 'report'
                 assert_not_nil assigns(:total_hours)
                 assert_equal "162.90", "%.2f" % assigns(:total_hours)
               end
               def test_report_all_time_by_day
                 get :report, :project_id => 1, :criterias => ['project', 'issue'], :columns => 'day'
                 assert_response :success
                 assert_template 'report'
                 assert_not_nil assigns(:total_hours)
                 assert_equal "162.90", "%.2f" % assigns(:total_hours)
                 assert_tag :tag => 'th', :content => '2007-03-12'
               end
               def test_report_one_criteria
                 get :report, :project_id => 1, :columns => 'week', :from => "2007-04-01", :to => "2007-04-30", :criterias => ['project']
                 assert_response :success
                 assert_template 'report'
                 assert_not_nil assigns(:total_hours)
                 assert_equal "8.65", "%.2f" % assigns(:total_hours)
               end
               def test_report_two_criterias
                 get :report, :project_id => 1, :columns => 'month', :from => "2007-01-01", :to => "2007-12-31", :criterias => ["member", "activity"]
                 assert_response :success
                 assert_template 'report'
                 assert_not_nil assigns(:total_hours)
                 assert_equal "162.90", "%.2f" % assigns(:total_hours)
               end
               def test_report_custom_field_criteria
                 get :report, :project_id => 1, :criterias => ['project', 'cf_1']
                 assert_response :success
                 assert_template 'report'
                 assert_not_nil assigns(:total_hours)
                 assert_not_nil assigns(:criterias)
                 assert_equal 2, assigns(:criterias).size
                 assert_equal "162.90", "%.2f" % assigns(:total_hours)
                 # Custom field column
                 assert_tag :tag => 'th', :content => 'Database'
                 # Custom field row
                 assert_tag :tag => 'td', :content => 'MySQL',
                                          :sibling => { :tag => 'td', :attributes => { :class => 'hours' },
                                                                      :child => { :tag => 'span', :attributes => { :class => 'hours hours-int' },
                                                                                                  :content => '1' }}
               end
               def test_report_one_criteria_no_result
                 get :report, :project_id => 1, :columns => 'week', :from => "1998-04-01", :to => "1998-04-30", :criterias => ['project']
                 assert_response :success
                 assert_template 'report'
                 assert_not_nil assigns(:total_hours)
                 assert_equal "0.00", "%.2f" % assigns(:total_hours)
               end
               def test_report_all_projects_csv_export
                 get :report, :columns => 'month', :from => "2007-01-01", :to => "2007-06-30", :criterias => ["project", "member", "activity"], :format => "csv"
                 assert_response :success
                 assert_equal 'text/csv', @response.content_type
                 lines = @response.body.chomp.split("\n")
                 # Headers
                 assert_equal 'Project,Member,Activity,2007-1,2007-2,2007-3,2007-4,2007-5,2007-6,Total', lines.first
                 # Total row
                 assert_equal 'Total,"","","","",154.25,8.65,"","",162.90', lines.last
               end
               def test_report_csv_export
                 get :report, :project_id => 1, :columns => 'month', :from => "2007-01-01", :to => "2007-06-30", :criterias => ["project", "member", "activity"], :format => "csv"
                 assert_response :success
                 assert_equal 'text/csv', @response.content_type
                 lines = @response.body.chomp.split("\n")
                 # Headers
                 assert_equal 'Project,Member,Activity,2007-1,2007-2,2007-3,2007-4,2007-5,2007-6,Total', lines.first
                 # Total row
                 assert_equal 'Total,"","","","",154.25,8.65,"","",162.90', lines.last
               end
               def test_details_all_projects
                 get :details
                 assert_response :success
                 assert_template 'details'
                 assert_not_nil assigns(:total_hours)
                 assert_equal "162.90", "%.2f" % assigns(:total_hours)
               end
+              def test_project_details_routing
+                assert_routing(
+                  {:method => :get, :path => '/projects/567/time_entries'},
+                  :controller => 'timelog', :action => 'details', :project_id => '567'
+                )
+              end
               def test_details_at_project_level
                 get :details, :project_id => 1
                 assert_response :success
                 assert_template 'details'
                 assert_not_nil assigns(:entries)
                 assert_equal 4, assigns(:entries).size
                 # project and subproject
                 assert_equal [1, 3], assigns(:entries).collect(&:project_id).uniq.sort
                 assert_not_nil assigns(:total_hours)
                 assert_equal "162.90", "%.2f" % assigns(:total_hours)
                 # display all time by default
                 assert_equal '2007-03-11'.to_date, assigns(:from)
                 assert_equal '2007-04-22'.to_date, assigns(:to)
               end
               def test_details_at_project_level_with_date_range
                 get :details, :project_id => 1, :from => '2007-03-20', :to => '2007-04-30'
                 assert_response :success
                 assert_template 'details'
                 assert_not_nil assigns(:entries)
                 assert_equal 3, assigns(:entries).size
                 assert_not_nil assigns(:total_hours)
                 assert_equal "12.90", "%.2f" % assigns(:total_hours)
                 assert_equal '2007-03-20'.to_date, assigns(:from)
                 assert_equal '2007-04-30'.to_date, assigns(:to)
               end
               def test_details_at_project_level_with_period
                 get :details, :project_id => 1, :period => '7_days'
                 assert_response :success
                 assert_template 'details'
                 assert_not_nil assigns(:entries)
                 assert_not_nil assigns(:total_hours)
                 assert_equal Date.today - 7, assigns(:from)
                 assert_equal Date.today, assigns(:to)
               end
+              def test_issue_details_routing
+                assert_routing(
+                  {:method => :get, :path => 'time_entries'},
+                  :controller => 'timelog', :action => 'details'
+                )
+                assert_routing(
+                  {:method => :get, :path => '/issues/234/time_entries'},
+                  :controller => 'timelog', :action => 'details', :issue_id => '234'
+                )
+                # TODO: issue detail page shouldnt link to project_issue_time_entries_path but to normal issues one
+                # doesnt seem to have effect on resulting page so controller can be left untouched
+                assert_routing(
+                  {:method => :get, :path => '/projects/ecookbook/issues/123/time_entries'},
+                  :controller => 'timelog', :action => 'details', :project_id => 'ecookbook', :issue_id => '123'
+                )
+              end
               def test_details_at_issue_level
                 get :details, :issue_id => 1
                 assert_response :success
                 assert_template 'details'
                 assert_not_nil assigns(:entries)
                 assert_equal 2, assigns(:entries).size
                 assert_not_nil assigns(:total_hours)
                 assert_equal 154.25, assigns(:total_hours)
                 # display all time by default
                 assert_equal '2007-03-11'.to_date, assigns(:from)
                 assert_equal '2007-04-22'.to_date, assigns(:to)
               end
+              def test_details_formatted_routing
+                assert_routing(
+                  {:method => :get, :path => 'time_entries.atom'},
+                  :controller => 'timelog', :action => 'details', :format => 'atom'
+                )
+                assert_routing(
+                  {:method => :get, :path => 'time_entries.csv'},
+                  :controller => 'timelog', :action => 'details', :format => 'csv'
+                )
+              end
+              def test_details_for_project_formatted_routing
+                assert_routing(
+                  {:method => :get, :path => '/projects/567/time_entries.atom'},
+                  :controller => 'timelog', :action => 'details', :format => 'atom', :project_id => '567'
+                )
+                assert_routing(
+                  {:method => :get, :path => '/projects/567/time_entries.csv'},
+                  :controller => 'timelog', :action => 'details', :format => 'csv', :project_id => '567'
+                )
+              end
+              def test_details_for_issue_formatted_routing
+                assert_routing(
+                  {:method => :get, :path => '/projects/ecookbook/issues/123/time_entries.atom'},
+                  :controller => 'timelog', :action => 'details', :project_id => 'ecookbook', :issue_id => '123', :format => 'atom'
+                )
+                assert_routing(
+                  {:method => :get, :path => '/projects/ecookbook/issues/123/time_entries.csv'},
+                  :controller => 'timelog', :action => 'details', :project_id => 'ecookbook', :issue_id => '123', :format => 'csv'
+                )
+              end
               def test_details_atom_feed
                 get :details, :project_id => 1, :format => 'atom'
                 assert_response :success
                 assert_equal 'application/atom+xml', @response.content_type
                 assert_not_nil assigns(:items)
                 assert assigns(:items).first.is_a?(TimeEntry)
               end
               def test_details_all_projects_csv_export
                 get :details, :format => 'csv'
                 assert_response :success
                 assert_equal 'text/csv', @response.content_type
                 assert @response.body.include?("Date,User,Activity,Project,Issue,Tracker,Subject,Hours,Comment\n")
                 assert @response.body.include?("\n04/21/2007,redMine Admin,Design,eCookbook,3,Bug,Error 281 when updating a recipe,1.0,\"\"\n")
               end
               def test_details_csv_export
                 get :details, :project_id => 1, :format => 'csv'
                 assert_response :success
                 assert_equal 'text/csv', @response.content_type
                 assert @response.body.include?("Date,User,Activity,Project,Issue,Tracker,Subject,Hours,Comment\n")
                 assert @response.body.include?("\n04/21/2007,redMine Admin,Design,eCookbook,3,Bug,Error 281 when updating a recipe,1.0,\"\"\n")
               end
             end

test/functional/users_controller_test.rb +72 -2

             # 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 'users_controller'
             # Re-raise errors caught by the controller.
             class UsersController; def rescue_action(e) raise e end; end
             class UsersControllerTest < Test::Unit::TestCase
               fixtures :users, :projects, :members
               def setup
                 @controller = UsersController.new
                 @request    = ActionController::TestRequest.new
                 @response   = ActionController::TestResponse.new
                 User.current = nil
                 @request.session[:user_id] = 1 # admin
               end
+              def test_index_routing
+                #TODO: unify with list
+                assert_generates(
+                  '/users',
+                  :controller => 'users', :action => 'index'
+                )
+              end
               def test_index
                 get :index
                 assert_response :success
                 assert_template 'list'
               end
+              def test_list_routing
+                #TODO: rename action to index
+                assert_routing(
+                  {:method => :get, :path => '/users'},
+                  :controller => 'users', :action => 'list'
+                )
+              end
               def test_list
                 get :list
                 assert_response :success
                 assert_template 'list'
                 assert_not_nil assigns(:users)
                 # active users only
                 assert_nil assigns(:users).detect {|u| !u.active?}
               end
               def test_list_with_name_filter
                 get :list, :name => 'john'
                 assert_response :success
                 assert_template 'list'
                 users = assigns(:users)
                 assert_not_nil users
                 assert_equal 1, users.size
                 assert_equal 'John', users.first.firstname
               end
+              def test_add_routing
+                assert_routing(
+                  {:method => :get, :path => '/users/new'},
+                  :controller => 'users', :action => 'add'
+                )
+                assert_recognizes(
+                #TODO: remove this and replace with POST to collection, need to modify form
+                  {:controller => 'users', :action => 'add'},
+                  {:method => :post, :path => '/users/new'}
+                )
+                assert_recognizes(
+                  {:controller => 'users', :action => 'add'},
+                  {:method => :post, :path => '/users'}
+                )
+              end
+              def test_edit_routing
+                assert_routing(
+                  {:method => :get, :path => '/users/444/edit'},
+                  :controller => 'users', :action => 'edit', :id => '444'
+                )
+                assert_routing(
+                  {:method => :get, :path => '/users/222/edit/membership'},
+                  :controller => 'users', :action => 'edit', :id => '222', :tab => 'membership'
+                )
+                assert_recognizes(
+                #TODO: use PUT on user_path, modify form
+                  {:controller => 'users', :action => 'edit', :id => '444'},
+                  {:method => :post, :path => '/users/444/edit'}
+                )
+              end
+              def test_add_membership_routing
+                assert_routing(
+                  {:method => :post, :path => '/users/123/memberships'},
+                  :controller => 'users', :action => 'edit_membership', :id => '123'
+                )
+              end
+              def test_edit_membership_routing
+                assert_routing(
+                  {:method => :post, :path => '/users/123/memberships/55'},
+                  :controller => 'users', :action => 'edit_membership', :id => '123', :membership_id => '55'
+                )
+              end
               def test_edit_membership
                 post :edit_membership, :id => 2, :membership_id => 1,
                                        :membership => { :role_id => 2}
-                assert_redirected_to '/users/edit/2?tab=memberships'
+                assert_redirected_to :action => 'edit', :id => '2', :tab => 'memberships'
                 assert_equal 2, Member.find(1).role_id
               end
               def test_destroy_membership
+                assert_routing(
+                #TODO: use DELETE method on user_membership_path, modify form
+                  {:method => :post, :path => '/users/567/memberships/12/destroy'},
+                  :controller => 'users', :action => 'destroy_membership', :id => '567', :membership_id => '12'
+                )
+              end
+              def test_destroy_membership
                 post :destroy_membership, :id => 2, :membership_id => 1
-                assert_redirected_to '/users/edit/2?tab=memberships'
+                assert_redirected_to :action => 'edit', :id => '2', :tab => 'memberships'
                 assert_nil Member.find_by_id(1)
               end
             end

test/functional/versions_controller_test.rb +2 -2

             # 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 'versions_controller'
             # Re-raise errors caught by the controller.
             class VersionsController; def rescue_action(e) raise e end; end
             class VersionsControllerTest < Test::Unit::TestCase
               fixtures :projects, :versions, :issues, :users, :roles, :members, :enabled_modules
               def setup
                 @controller = VersionsController.new
                 @request    = ActionController::TestRequest.new
                 @response   = ActionController::TestResponse.new
                 User.current = nil
               end
               def test_show
                 get :show, :id => 2
                 assert_response :success
                 assert_template 'show'
                 assert_not_nil assigns(:version)
                 assert_tag :tag => 'h2', :content => /1.0/
               end
               def test_get_edit
                 @request.session[:user_id] = 2
                 get :edit, :id => 2
                 assert_response :success
                 assert_template 'edit'
               end
               def test_post_edit
                 @request.session[:user_id] = 2
                 post :edit, :id => 2,
                             :version => { :name => 'New version name',
                                           :effective_date => Date.today.strftime("%Y-%m-%d")}
-                assert_redirected_to '/projects/settings/ecookbook?tab=versions'
+                assert_redirected_to :controller => 'projects', :action => 'settings', :tab => 'versions', :id => 'ecookbook'
                 version = Version.find(2)
                 assert_equal 'New version name', version.name
                 assert_equal Date.today, version.effective_date
               end
               def test_destroy
                 @request.session[:user_id] = 2
                 post :destroy, :id => 3
-                assert_redirected_to '/projects/settings/ecookbook?tab=versions'
+                assert_redirected_to :controller => 'projects', :action => 'settings', :tab => 'versions', :id => 'ecookbook'
                 assert_nil Version.find_by_id(3)
               end
               def test_issue_status_by
                 xhr :get, :status_by, :id => 2
                 assert_response :success
                 assert_template '_issue_counts'
               end
             end

test/functional/wiki_controller_test.rb +112 -12

             # 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 'wiki_controller'
             # Re-raise errors caught by the controller.
             class WikiController; def rescue_action(e) raise e end; end
             class WikiControllerTest < Test::Unit::TestCase
               fixtures :projects, :users, :roles, :members, :enabled_modules, :wikis, :wiki_pages, :wiki_contents, :wiki_content_versions, :attachments
               def setup
                 @controller = WikiController.new
                 @request    = ActionController::TestRequest.new
                 @response   = ActionController::TestResponse.new
                 User.current = nil
               end
+              def test_index_routing
+                assert_routing(
+                  {:method => :get, :path => '/projects/567/wiki'},
+                  :controller => 'wiki', :action => 'index', :id => '567'
+                )
+                assert_routing(
+                  {:method => :get, :path => '/projects/567/wiki/lalala'},
+                  :controller => 'wiki', :action => 'index', :id => '567', :page => 'lalala'
+                )
+                assert_generates(
+                  '/projects/567/wiki',
+                  :controller => 'wiki', :action => 'index', :id => '567', :page => nil
+                )
+              end
               def test_show_start_page
                 get :index, :id => 'ecookbook'
                 assert_response :success
                 assert_template 'show'
                 assert_tag :tag => 'h1', :content => /CookBook documentation/
                 # child_pages macro
                 assert_tag :ul, :attributes => { :class => 'pages-hierarchy' },
                            :child => { :tag => 'li',
-                                       :child => { :tag => 'a', :attributes => { :href => '/wiki/ecookbook/Page_with_an_inline_image' },
+                                       :child => { :tag => 'a', :attributes => { :href => '/projects/ecookbook/wiki/Page_with_an_inline_image' },
                                                                 :content => 'Page with an inline image' } }
               end
               def test_show_page_with_name
                 get :index, :id => 1, :page => 'Another_page'
                 assert_response :success
                 assert_template 'show'
                 assert_tag :tag => 'h1', :content => /Another page/
                 # Included page with an inline image
                 assert_tag :tag => 'p', :content => /This is an inline image/
                 assert_tag :tag => 'img', :attributes => { :src => '/attachments/download/3',
                                                            :alt => 'This is a logo' }
               end
               def test_show_unexistent_page_without_edit_right
                 get :index, :id => 1, :page => 'Unexistent page'
                 assert_response 404
               end
               def test_show_unexistent_page_with_edit_right
                 @request.session[:user_id] = 2
                 get :index, :id => 1, :page => 'Unexistent page'
                 assert_response :success
                 assert_template 'edit'
               end
+              def test_edit_routing
+                assert_routing(
+                  {:method => :get, :path => '/projects/567/wiki/my_page/edit'},
+                  :controller => 'wiki', :action => 'edit', :id => '567', :page => 'my_page'
+                )
+                assert_recognizes(#TODO: use PUT to page path, adjust forms accordingly
+                  {:controller => 'wiki', :action => 'edit', :id => '567', :page => 'my_page'},
+                  {:method => :post, :path => '/projects/567/wiki/my_page/edit'}
+                )
+              end
               def test_create_page
                 @request.session[:user_id] = 2
                 post :edit, :id => 1,
                             :page => 'New page',
                             :content => {:comments => 'Created the page',
                                          :text => "h1. New page\n\nThis is a new page",
                                          :version => 0}
-                assert_redirected_to 'wiki/ecookbook/New_page'
+                assert_redirected_to :action => 'index', :id => 'ecookbook', :page => 'New_page'
                 page = Project.find(1).wiki.find_page('New page')
                 assert !page.new_record?
                 assert_not_nil page.content
                 assert_equal 'Created the page', page.content.comments
               end
+              def test_preview_routing
+                assert_routing(
+                  {:method => :post, :path => '/projects/567/wiki/CookBook_documentation/preview'},
+                  :controller => 'wiki', :action => 'preview', :id => '567', :page => 'CookBook_documentation'
+                )
+              end
               def test_preview
                 @request.session[:user_id] = 2
                 xhr :post, :preview, :id => 1, :page => 'CookBook_documentation',
                                                :content => { :comments => '',
                                                              :text => 'this is a *previewed text*',
                                                              :version => 3 }
                 assert_response :success
                 assert_template 'common/_preview'
                 assert_tag :tag => 'strong', :content => /previewed text/
               end
               def test_preview_new_page
                 @request.session[:user_id] = 2
                 xhr :post, :preview, :id => 1, :page => 'New page',
                                                :content => { :text => 'h1. New page',
                                                              :comments => '',
                                                              :version => 0 }
                 assert_response :success
                 assert_template 'common/_preview'
                 assert_tag :tag => 'h1', :content => /New page/
               end
+              def test_history_routing
+                assert_routing(
+                  {:method => :get, :path => '/projects/1/wiki/CookBook_documentation/history'},
+                  :controller => 'wiki', :action => 'history', :id => '1', :page => 'CookBook_documentation'
+                )
+              end
               def test_history
                 get :history, :id => 1, :page => 'CookBook_documentation'
                 assert_response :success
                 assert_template 'history'
                 assert_not_nil assigns(:versions)
                 assert_equal 3, assigns(:versions).size
                 assert_select "input[type=submit][name=commit]"
               end
               def test_history_with_one_version
                 get :history, :id => 1, :page => 'Another_page'
                 assert_response :success
                 assert_template 'history'
                 assert_not_nil assigns(:versions)
                 assert_equal 1, assigns(:versions).size
                 assert_select "input[type=submit][name=commit]", false
               end
+              def test_diff_routing
+                assert_routing(
+                  {:method => :get, :path => '/projects/1/wiki/CookBook_documentation/diff/2/vs/1'},
+                  :controller => 'wiki', :action => 'diff', :id => '1', :page => 'CookBook_documentation', :version => '2', :version_from => '1'
+                )
+              end
               def test_diff
                 get :diff, :id => 1, :page => 'CookBook_documentation', :version => 2, :version_from => 1
                 assert_response :success
                 assert_template 'diff'
                 assert_tag :tag => 'span', :attributes => { :class => 'diff_in'},
                                            :content => /updated/
               end
+              def test_annotate_routing
+                assert_routing(
+                  {:method => :get, :path => '/projects/1/wiki/CookBook_documentation/annotate/2'},
+                  :controller => 'wiki', :action => 'annotate', :id => '1', :page => 'CookBook_documentation', :version => '2'
+                )
+              end
               def test_annotate
                 get :annotate, :id => 1, :page =>  'CookBook_documentation', :version => 2
                 assert_response :success
                 assert_template 'annotate'
                 # Line 1
                 assert_tag :tag => 'tr', :child => { :tag => 'th', :attributes => {:class => 'line-num'}, :content => '1' },
                                          :child => { :tag => 'td', :attributes => {:class => 'author'}, :content => /John Smith/ },
                                          :child => { :tag => 'td', :content => /h1\. CookBook documentation/ }
                 # Line 2
                 assert_tag :tag => 'tr', :child => { :tag => 'th', :attributes => {:class => 'line-num'}, :content => '2' },
                                          :child => { :tag => 'td', :attributes => {:class => 'author'}, :content => /redMine Admin/ },
                                          :child => { :tag => 'td', :content => /Some updated \[\[documentation\]\] here/ }
               end
+              def test_rename_routing
+                assert_routing(
+                  {:method => :get, :path => '/projects/22/wiki/ladida/rename'},
+                  :controller => 'wiki', :action => 'rename', :id => '22', :page => 'ladida'
+                )
+                assert_recognizes(
+                  #TODO: should be moved into a update action and use a PUT to the page URI
+                  {:controller => 'wiki', :action => 'rename', :id => '22', :page => 'ladida'},
+                  {:method => :post, :path => '/projects/22/wiki/ladida/rename'}
+                )
+              end
               def test_rename_with_redirect
                 @request.session[:user_id] = 2
                 post :rename, :id => 1, :page => 'Another_page',
                                         :wiki_page => { :title => 'Another renamed page',
                                                         :redirect_existing_links => 1 }
-                assert_redirected_to 'wiki/ecookbook/Another_renamed_page'
+                assert_redirected_to :action => 'index', :id => 'ecookbook', :page => 'Another_renamed_page'
                 wiki = Project.find(1).wiki
                 # Check redirects
                 assert_not_nil wiki.find_page('Another page')
                 assert_nil wiki.find_page('Another page', :with_redirect => false)
               end
               def test_rename_without_redirect
                 @request.session[:user_id] = 2
                 post :rename, :id => 1, :page => 'Another_page',
                                         :wiki_page => { :title => 'Another renamed page',
                                                         :redirect_existing_links => "0" }
-                assert_redirected_to 'wiki/ecookbook/Another_renamed_page'
+                assert_redirected_to :action => 'index', :id => 'ecookbook', :page => 'Another_renamed_page'
                 wiki = Project.find(1).wiki
                 # Check that there's no redirects
                 assert_nil wiki.find_page('Another page')
               end
+              def test_destroy_routing
+                assert_recognizes(
+                  #TODO: should use DELETE on page URI
+                  {:controller => 'wiki', :action => 'destroy', :id => '22', :page => 'ladida'},
+                  {:method => :post, :path => 'projects/22/wiki/ladida/destroy'}
+                )
+              end
               def test_destroy
                 @request.session[:user_id] = 2
                 post :destroy, :id => 1, :page => 'CookBook_documentation'
-                assert_redirected_to 'wiki/ecookbook/Page_index/special'
+                assert_redirected_to :action => 'special', :id => 'ecookbook', :page => 'Page_index'
+              end
+              def test_special_routing
+                assert_routing(
+                  {:method => :get, :path => '/projects/567/wiki/page_index'},
+                  :controller => 'wiki', :action => 'special', :id => '567', :page => 'page_index'
+                )
+                assert_routing(
+                  {:method => :get, :path => '/projects/567/wiki/Page_Index'},
+                  :controller => 'wiki', :action => 'special', :id => '567', :page => 'Page_Index'
+                )
+                assert_routing(
+                  {:method => :get, :path => '/projects/567/wiki/date_index'},
+                  :controller => 'wiki', :action => 'special', :id => '567', :page => 'date_index'
+                )
+                assert_routing(
+                  {:method => :get, :path => '/projects/567/wiki/export'},
+                  :controller => 'wiki', :action => 'special', :id => '567', :page => 'export'
+                )
               end
               def test_page_index
                 get :special, :id => 'ecookbook', :page => 'Page_index'
                 assert_response :success
                 assert_template 'special_page_index'
                 pages = assigns(:pages)
                 assert_not_nil pages
                 assert_equal Project.find(1).wiki.pages.size, pages.size
                 assert_tag :ul, :attributes => { :class => 'pages-hierarchy' },
-                                :child => { :tag => 'li', :child => { :tag => 'a', :attributes => { :href => '/wiki/ecookbook/CookBook_documentation' },
+                                :child => { :tag => 'li', :child => { :tag => 'a', :attributes => { :href => '/projects/ecookbook/wiki/CookBook_documentation' },
                                                           :content => 'CookBook documentation' },
                                             :child => { :tag => 'ul',
                                                         :child => { :tag => 'li',
-                                                                    :child => { :tag => 'a', :attributes => { :href => '/wiki/ecookbook/Page_with_an_inline_image' },
+                                                                    :child => { :tag => 'a', :attributes => { :href => '/projects/ecookbook/wiki/Page_with_an_inline_image' },
                                                                                              :content => 'Page with an inline image' } } } },
-                                :child => { :tag => 'li', :child => { :tag => 'a', :attributes => { :href => '/wiki/ecookbook/Another_page' },
+                                :child => { :tag => 'li', :child => { :tag => 'a', :attributes => { :href => '/projects/ecookbook/wiki/Another_page' },
                                                                                    :content => 'Another page' } }
               end
               def test_not_found
                 get :index, :id => 999
                 assert_response 404
               end
+              def test_protect_routing
+                assert_routing(
+                  {:method => :post, :path => 'projects/22/wiki/ladida/protect'},
+                  {:controller => 'wiki', :action => 'protect', :id => '22', :page => 'ladida'}
+                )
+              end
               def test_protect_page
                 page = WikiPage.find_by_wiki_id_and_title(1, 'Another_page')
                 assert !page.protected?
                 @request.session[:user_id] = 2
                 post :protect, :id => 1, :page => page.title, :protected => '1'
-                assert_redirected_to 'wiki/ecookbook/Another_page'
+                assert_redirected_to :action => 'index', :id => 'ecookbook', :page => 'Another_page'
                 assert page.reload.protected?
               end
               def test_unprotect_page
                 page = WikiPage.find_by_wiki_id_and_title(1, 'CookBook_documentation')
                 assert page.protected?
                 @request.session[:user_id] = 2
                 post :protect, :id => 1, :page => page.title, :protected => '0'
-                assert_redirected_to '/wiki/ecookbook/CookBook_documentation'
+                assert_redirected_to :action => 'index', :id => 'ecookbook', :page => 'CookBook_documentation'
                 assert !page.reload.protected?
               end
               def test_show_page_with_edit_link
                 @request.session[:user_id] = 2
                 get :index, :id => 1
                 assert_response :success
                 assert_template 'show'
-                assert_tag :tag => 'a', :attributes => { :href => '/wiki/1/CookBook_documentation/edit' }
+                assert_tag :tag => 'a', :attributes => { :href => '/projects/1/wiki/CookBook_documentation/edit' }
               end
               def test_show_page_without_edit_link
                 @request.session[:user_id] = 4
                 get :index, :id => 1
                 assert_response :success
                 assert_template 'show'
-                assert_no_tag :tag => 'a', :attributes => { :href => '/wiki/1/CookBook_documentation/edit' }
+                assert_no_tag :tag => 'a', :attributes => { :href => '/projects/1/wiki/CookBook_documentation/edit' }
               end
               def test_edit_unprotected_page
                 # Non members can edit unprotected wiki pages
                 @request.session[:user_id] = 4
                 get :edit, :id => 1, :page => 'Another_page'
                 assert_response :success
                 assert_template 'edit'
               end
               def test_edit_protected_page_by_nonmember
                 # Non members can't edit protected wiki pages
                 @request.session[:user_id] = 4
                 get :edit, :id => 1, :page => 'CookBook_documentation'
                 assert_response 403
               end
               def test_edit_protected_page_by_member
                 @request.session[:user_id] = 2
                 get :edit, :id => 1, :page => 'CookBook_documentation'
                 assert_response :success
                 assert_template 'edit'
               end
               def test_history_of_non_existing_page_should_return_404
                 get :history, :id => 1, :page => 'Unknown_page'
                 assert_response 404
               end
             end

test/functional/wikis_controller_test.rb +21 -2

             # 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 'wikis_controller'
             # Re-raise errors caught by the controller.
             class WikisController; def rescue_action(e) raise e end; end
             class WikisControllerTest < Test::Unit::TestCase
               fixtures :projects, :users, :roles, :members, :enabled_modules, :wikis
               def setup
                 @controller = WikisController.new
                 @request    = ActionController::TestRequest.new
                 @response   = ActionController::TestResponse.new
                 User.current = nil
               end
+              def test_edit_routing
+                assert_routing(
+                #TODO: use PUT
+                  {:method => :post, :path => 'projects/ladida/wiki'},
+                  :controller => 'wikis', :action => 'edit', :id => 'ladida'
+                )
+              end
               def test_create
                 @request.session[:user_id] = 1
                 assert_nil Project.find(3).wiki
                 post :edit, :id => 3, :wiki => { :start_page => 'Start page' }
                 assert_response :success
                 wiki = Project.find(3).wiki
                 assert_not_nil wiki
                 assert_equal 'Start page', wiki.start_page
               end
+              def test_destroy_routing
+                assert_routing(
+                  {:method => :get, :path => 'projects/ladida/wiki/destroy'},
+                  :controller => 'wikis', :action => 'destroy', :id => 'ladida'
+                )
+                assert_recognizes(  #TODO: use DELETE and update form
+                  {:controller => 'wikis', :action => 'destroy', :id => 'ladida'},
+                  {:method => :post, :path => 'projects/ladida/wiki/destroy'}
+                )
+              end
               def test_destroy
                 @request.session[:user_id] = 1
                 post :destroy, :id => 1, :confirm => 1
-                assert_redirected_to '/projects/settings/ecookbook?tab=wiki'
+                assert_redirected_to :action => 'settings', :id => 'ecookbook', :tab => 'wiki'
                 assert_nil Project.find(1).wiki
               end
               def test_not_found
                 @request.session[:user_id] = 1
                 post :destroy, :id => 999, :confirm => 1
                 assert_response 404
               end
             end

test/integration/admin_test.rb +2 -2

             # redMine - project management software
             # Copyright (C) 2006  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"
             class AdminTest < ActionController::IntegrationTest
               fixtures :users
               def test_add_user
                 log_user("admin", "admin")
                 get "/users/add"
                 assert_response :success
                 assert_template "users/add"
                 post "/users/add", :user => { :login => "psmith", :firstname => "Paul", :lastname => "Smith", :mail => "psmith@somenet.foo", :language => "en" }, :password => "psmith09", :password_confirmation => "psmith09"
                 assert_redirected_to "users/list"
                 user = User.find_by_login("psmith")
                 assert_kind_of User, user
                 logged_user = User.try_to_login("psmith", "psmith09")
                 assert_kind_of User, logged_user
                 assert_equal "Paul", logged_user.firstname
                 post "users/edit", :id => user.id, :user => { :status => User::STATUS_LOCKED }
                 assert_redirected_to "users/list"
                 locked_user = User.try_to_login("psmith", "psmith09")
                 assert_equal nil, locked_user
               end
               def test_add_project
                 log_user("admin", "admin")
-                get "projects/add"
+                get "projects/new"
                 assert_response :success
                 assert_template "projects/add"
-                post "projects/add", :project => { :name => "blog",
+                post "projects", :project => { :name => "blog",
                                                    :description => "weblog",
                                                    :identifier => "blog",
                                                    :is_public => 1,
                                                    :custom_field_values => { '3' => 'Beta' }
                                                    }
                 assert_redirected_to "admin/projects"
                 assert_equal 'Successful creation.', flash[:notice]
                 project = Project.find_by_name("blog")
                 assert_kind_of Project, project
                 assert_equal "weblog", project.description
                 assert_equal true, project.is_public?
                 get "admin/projects"
                 assert_response :success
                 assert_template "admin/projects"
               end
             end

test/integration/issues_test.rb +4 -4

             # redMine - project management software
             # Copyright (C) 2006-2008  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"
             class IssuesTest < ActionController::IntegrationTest
               fixtures :projects,
                        :users,
                        :roles,
                        :members,
                        :trackers,
                        :projects_trackers,
                        :enabled_modules,
                        :issue_statuses,
                        :issues,
                        :enumerations,
                        :custom_fields,
                        :custom_values,
                        :custom_fields_trackers
               # create an issue
               def test_add_issue
                 log_user('jsmith', 'jsmith')
                 get 'projects/1/issues/new', :tracker_id => '1'
                 assert_response :success
                 assert_template 'issues/new'
-                post 'projects/1/issues/new', :tracker_id => "1",
+                post 'projects/1/issues', :tracker_id => "1",
                                              :issue => { :start_date => "2006-12-26",
                                                          :priority_id => "3",
                                                          :subject => "new test issue",
                                                          :category_id => "",
                                                          :description => "new issue",
                                                          :done_ratio => "0",
                                                          :due_date => "",
                                                          :assigned_to_id => "" },
                                              :custom_fields => {'2' => 'Value for field 2'}
                 # find created issue
                 issue = Issue.find_by_subject("new test issue")
                 assert_kind_of Issue, issue
                 # check redirection
-                assert_redirected_to "issues/show"
+                assert_redirected_to :controller => 'issues', :action => 'show'
                 follow_redirect!
                 assert_equal issue, assigns(:issue)
                 # check issue attributes
                 assert_equal 'jsmith', issue.author.login
                 assert_equal 1, issue.project.id
                 assert_equal 1, issue.status.id
               end
               # add then remove 2 attachments to an issue
               def test_issue_attachements
                 log_user('jsmith', 'jsmith')
                 set_tmp_attachments_directory
-                post 'issues/edit/1',
+                post 'issues/1/edit',
                      :notes => 'Some notes',
                      :attachments => {'1' => {'file' => test_uploaded_file('testfile.txt', 'text/plain'), 'description' => 'This is an attachment'}}
-                assert_redirected_to "issues/show/1"
+                assert_redirected_to "issues/1"
                 # make sure attachment was saved
                 attachment = Issue.find(1).attachments.find_by_filename("testfile.txt")
                 assert_kind_of Attachment, attachment
                 assert_equal Issue.find(1), attachment.container
                 assert_equal 'This is an attachment', attachment.description
                 # verify the size of the attachment stored in db
                 #assert_equal file_data_1.length, attachment.filesize
                 # verify that the attachment was written to disk
                 assert File.exist?(attachment.diskfile)
                 # remove the attachments
                 Issue.find(1).attachments.each(&:destroy)
                 assert_equal 0, Issue.find(1).attachments.length
               end
             end

test/integration/projects_test.rb +5 -5

             # 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"
             class ProjectsTest < ActionController::IntegrationTest
               fixtures :projects, :users, :members
               def test_archive_project
                 subproject = Project.find(1).children.first
                 log_user("admin", "admin")
                 get "admin/projects"
                 assert_response :success
                 assert_template "admin/projects"
                 post "projects/archive", :id => 1
                 assert_redirected_to "admin/projects"
                 assert !Project.find(1).active?
-                get "projects/show", :id => 1
+                get 'projects/1'
                 assert_response 403
-                get "projects/show", :id => subproject.id
+                get "projects/#{subproject.id}"
                 assert_response 403
                 post "projects/unarchive", :id => 1
                 assert_redirected_to "admin/projects"
                 assert Project.find(1).active?
-                get "projects/show", :id => 1
+                get "projects/1"
                 assert_response :success
               end
             end

test/unit/helpers/application_helper_test.rb +16 -16

             # 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'
             class ApplicationHelperTest < HelperTestCase
               include ApplicationHelper
               include ActionView::Helpers::TextHelper
               fixtures :projects, :roles, :enabled_modules, :users,
                                   :repositories, :changesets,
                                   :trackers, :issue_statuses, :issues, :versions, :documents,
                                   :wikis, :wiki_pages, :wiki_contents,
                                   :boards, :messages,
                                   :attachments
               def setup
                 super
               end
               def test_auto_links
                 to_test = {
                   'http://foo.bar' => '<a class="external" href="http://foo.bar">http://foo.bar</a>',
                   'http://foo.bar/~user' => '<a class="external" href="http://foo.bar/~user">http://foo.bar/~user</a>',
                   'http://foo.bar.' => '<a class="external" href="http://foo.bar">http://foo.bar</a>.',
                   'https://foo.bar.' => '<a class="external" href="https://foo.bar">https://foo.bar</a>.',
                   'This is a link: http://foo.bar.' => 'This is a link: <a class="external" href="http://foo.bar">http://foo.bar</a>.',
                   'A link (eg. http://foo.bar).' => 'A link (eg. <a class="external" href="http://foo.bar">http://foo.bar</a>).',
                   'http://foo.bar/foo.bar#foo.bar.' => '<a class="external" href="http://foo.bar/foo.bar#foo.bar">http://foo.bar/foo.bar#foo.bar</a>.',
                   'http://www.foo.bar/Test_(foobar)' => '<a class="external" href="http://www.foo.bar/Test_(foobar)">http://www.foo.bar/Test_(foobar)</a>',
                   '(see inline link : http://www.foo.bar/Test_(foobar))' => '(see inline link : <a class="external" href="http://www.foo.bar/Test_(foobar)">http://www.foo.bar/Test_(foobar)</a>)',
                   '(see inline link : http://www.foo.bar/Test)' => '(see inline link : <a class="external" href="http://www.foo.bar/Test">http://www.foo.bar/Test</a>)',
                   '(see inline link : http://www.foo.bar/Test).' => '(see inline link : <a class="external" href="http://www.foo.bar/Test">http://www.foo.bar/Test</a>).',
                   '(see "inline link":http://www.foo.bar/Test_(foobar))' => '(see <a href="http://www.foo.bar/Test_(foobar)" class="external">inline link</a>)',
                   '(see "inline link":http://www.foo.bar/Test)' => '(see <a href="http://www.foo.bar/Test" class="external">inline link</a>)',
                   '(see "inline link":http://www.foo.bar/Test).' => '(see <a href="http://www.foo.bar/Test" class="external">inline link</a>).',
                   'www.foo.bar' => '<a class="external" href="http://www.foo.bar">www.foo.bar</a>',
                   'http://foo.bar/page?p=1&t=z&s=' => '<a class="external" href="http://foo.bar/page?p=1&#38;t=z&#38;s=">http://foo.bar/page?p=1&#38;t=z&#38;s=</a>',
                   'http://foo.bar/page#125' => '<a class="external" href="http://foo.bar/page#125">http://foo.bar/page#125</a>',
                   'http://foo@www.bar.com' => '<a class="external" href="http://foo@www.bar.com">http://foo@www.bar.com</a>',
                   'http://foo:bar@www.bar.com' => '<a class="external" href="http://foo:bar@www.bar.com">http://foo:bar@www.bar.com</a>',
                   'ftp://foo.bar' => '<a class="external" href="ftp://foo.bar">ftp://foo.bar</a>',
                   'ftps://foo.bar' => '<a class="external" href="ftps://foo.bar">ftps://foo.bar</a>',
                   'sftp://foo.bar' => '<a class="external" href="sftp://foo.bar">sftp://foo.bar</a>',
                 }
                 to_test.each { |text, result| assert_equal "<p>#{result}</p>", textilizable(text) }
               end
               def test_auto_mailto
                 assert_equal '<p><a href="mailto:test@foo.bar" class="email">test@foo.bar</a></p>',
                   textilizable('test@foo.bar')
               end
               def test_inline_images
                 to_test = {
                   '!http://foo.bar/image.jpg!' => '<img src="http://foo.bar/image.jpg" alt="" />',
                   'floating !>http://foo.bar/image.jpg!' => 'floating <div style="float:right"><img src="http://foo.bar/image.jpg" alt="" /></div>',
                   'with class !(some-class)http://foo.bar/image.jpg!' => 'with class <img src="http://foo.bar/image.jpg" class="some-class" alt="" />',
                   # inline styles should be stripped
                   'with style !{width:100px;height100px}http://foo.bar/image.jpg!' => 'with style <img src="http://foo.bar/image.jpg" alt="" />',
                   'with title !http://foo.bar/image.jpg(This is a title)!' => 'with title <img src="http://foo.bar/image.jpg" title="This is a title" alt="This is a title" />',
                   'with title !http://foo.bar/image.jpg(This is a double-quoted "title")!' => 'with title <img src="http://foo.bar/image.jpg" title="This is a double-quoted &quot;title&quot;" alt="This is a double-quoted &quot;title&quot;" />',
                 }
                 to_test.each { |text, result| assert_equal "<p>#{result}</p>", textilizable(text) }
               end
               def test_acronyms
                 to_test = {
                   'this is an acronym: GPL(General Public License)' => 'this is an acronym: <acronym title="General Public License">GPL</acronym>',
                   'GPL(This is a double-quoted "title")' => '<acronym title="This is a double-quoted &quot;title&quot;">GPL</acronym>',
                 }
                 to_test.each { |text, result| assert_equal "<p>#{result}</p>", textilizable(text) }
               end
               def test_attached_images
                 to_test = {
                   'Inline image: !logo.gif!' => 'Inline image: <img src="/attachments/download/3" title="This is a logo" alt="This is a logo" />',
                   'Inline image: !logo.GIF!' => 'Inline image: <img src="/attachments/download/3" title="This is a logo" alt="This is a logo" />'
                 }
                 attachments = Attachment.find(:all)
                 to_test.each { |text, result| assert_equal "<p>#{result}</p>", textilizable(text, :attachments => attachments) }
               end
               def test_textile_external_links
                 to_test = {
                   'This is a "link":http://foo.bar' => 'This is a <a href="http://foo.bar" class="external">link</a>',
                   'This is an intern "link":/foo/bar' => 'This is an intern <a href="/foo/bar">link</a>',
                   '"link (Link title)":http://foo.bar' => '<a href="http://foo.bar" title="Link title" class="external">link</a>',
                   '"link (Link title with "double-quotes")":http://foo.bar' => '<a href="http://foo.bar" title="Link title with &quot;double-quotes&quot;" class="external">link</a>',
                   "This is not a \"Link\":\n\nAnother paragraph" => "This is not a \"Link\":</p>\n\n\n\t<p>Another paragraph",
                   # no multiline link text
                   "This is a double quote \"on the first line\nand another on a second line\":test" => "This is a double quote \"on the first line<br />\nand another on a second line\":test"
                 }
                 to_test.each { |text, result| assert_equal "<p>#{result}</p>", textilizable(text) }
               end
               def test_redmine_links
                 issue_link = link_to('#3', {:controller => 'issues', :action => 'show', :id => 3},
                                            :class => 'issue', :title => 'Error 281 when updating a recipe (New)')
                 changeset_link = link_to('r1', {:controller => 'repositories', :action => 'revision', :id => 'ecookbook', :rev => 1},
                                                :class => 'changeset', :title => 'My very first commit')
                 document_link = link_to('Test document', {:controller => 'documents', :action => 'show', :id => 1},
                                                          :class => 'document')
                 version_link = link_to('1.0', {:controller => 'versions', :action => 'show', :id => 2},
                                               :class => 'version')
                 message_url = {:controller => 'messages', :action => 'show', :board_id => 1, :id => 4}
                 source_url = {:controller => 'repositories', :action => 'entry', :id => 'ecookbook', :path => ['some', 'file']}
                 source_url_with_ext = {:controller => 'repositories', :action => 'entry', :id => 'ecookbook', :path => ['some', 'file.ext']}
                 to_test = {
                   # tickets
                   '#3, #3 and #3.'              => "#{issue_link}, #{issue_link} and #{issue_link}.",
                   # changesets
                   'r1'                          => changeset_link,
                   # documents
                   'document#1'                  => document_link,
                   'document:"Test document"'    => document_link,
                   # versions
                   'version#2'                   => version_link,
                   'version:1.0'                 => version_link,
                   'version:"1.0"'               => version_link,
                   # source
                   'source:/some/file'           => link_to('source:/some/file', source_url, :class => 'source'),
                   'source:/some/file.'          => link_to('source:/some/file', source_url, :class => 'source') + ".",
                   'source:/some/file.ext.'      => link_to('source:/some/file.ext', source_url_with_ext, :class => 'source') + ".",
                   'source:/some/file. '         => link_to('source:/some/file', source_url, :class => 'source') + ".",
                   'source:/some/file.ext. '     => link_to('source:/some/file.ext', source_url_with_ext, :class => 'source') + ".",
                   'source:/some/file, '         => link_to('source:/some/file', source_url, :class => 'source') + ",",
                   'source:/some/file@52'        => link_to('source:/some/file@52', source_url.merge(:rev => 52), :class => 'source'),
                   'source:/some/file.ext@52'    => link_to('source:/some/file.ext@52', source_url_with_ext.merge(:rev => 52), :class => 'source'),
                   'source:/some/file#L110'      => link_to('source:/some/file#L110', source_url.merge(:anchor => 'L110'), :class => 'source'),
                   'source:/some/file.ext#L110'  => link_to('source:/some/file.ext#L110', source_url_with_ext.merge(:anchor => 'L110'), :class => 'source'),
                   'source:/some/file@52#L110'   => link_to('source:/some/file@52#L110', source_url.merge(:rev => 52, :anchor => 'L110'), :class => 'source'),
                   'export:/some/file'           => link_to('export:/some/file', source_url.merge(:format => 'raw'), :class => 'source download'),
                   # message
                   'message#4'                   => link_to('Post 2', message_url, :class => 'message'),
                   'message#5'                   => link_to('RE: post 2', message_url.merge(:anchor => 'message-5'), :class => 'message'),
                   # escaping
                   '!#3.'                        => '#3.',
                   '!r1'                         => 'r1',
                   '!document#1'                 => 'document#1',
                   '!document:"Test document"'   => 'document:"Test document"',
                   '!version#2'                  => 'version#2',
                   '!version:1.0'                => 'version:1.0',
                   '!version:"1.0"'              => 'version:"1.0"',
                   '!source:/some/file'          => 'source:/some/file',
                   # invalid expressions
                   'source:'                     => 'source:',
                   # url hash
                   "http://foo.bar/FAQ#3"       => '<a class="external" href="http://foo.bar/FAQ#3">http://foo.bar/FAQ#3</a>',
                 }
                 @project = Project.find(1)
                 to_test.each { |text, result| assert_equal "<p>#{result}</p>", textilizable(text) }
               end
               def test_wiki_links
                 to_test = {
-                  '[[CookBook documentation]]' => '<a href="/wiki/ecookbook/CookBook_documentation" class="wiki-page">CookBook documentation</a>',
+                  '[[CookBook documentation]]' => '<a href="/projects/ecookbook/wiki/CookBook_documentation" class="wiki-page">CookBook documentation</a>',
-                  '[[Another page|Page]]' => '<a href="/wiki/ecookbook/Another_page" class="wiki-page">Page</a>',
+                  '[[Another page|Page]]' => '<a href="/projects/ecookbook/wiki/Another_page" class="wiki-page">Page</a>',
                   # link with anchor
-                  '[[CookBook documentation#One-section]]' => '<a href="/wiki/ecookbook/CookBook_documentation#One-section" class="wiki-page">CookBook documentation</a>',
+                  '[[CookBook documentation#One-section]]' => '<a href="/projects/ecookbook/wiki/CookBook_documentation#One-section" class="wiki-page">CookBook documentation</a>',
-                  '[[Another page#anchor|Page]]' => '<a href="/wiki/ecookbook/Another_page#anchor" class="wiki-page">Page</a>',
+                  '[[Another page#anchor|Page]]' => '<a href="/projects/ecookbook/wiki/Another_page#anchor" class="wiki-page">Page</a>',
                   # page that doesn't exist
-                  '[[Unknown page]]' => '<a href="/wiki/ecookbook/Unknown_page" class="wiki-page new">Unknown page</a>',
+                  '[[Unknown page]]' => '<a href="/projects/ecookbook/wiki/Unknown_page" class="wiki-page new">Unknown page</a>',
-                  '[[Unknown page|404]]' => '<a href="/wiki/ecookbook/Unknown_page" class="wiki-page new">404</a>',
+                  '[[Unknown page|404]]' => '<a href="/projects/ecookbook/wiki/Unknown_page" class="wiki-page new">404</a>',
                   # link to another project wiki
-                  '[[onlinestore:]]' => '<a href="/wiki/onlinestore/" class="wiki-page">onlinestore</a>',
+                  '[[onlinestore:]]' => '<a href="/projects/onlinestore/wiki/" class="wiki-page">onlinestore</a>',
-                  '[[onlinestore:|Wiki]]' => '<a href="/wiki/onlinestore/" class="wiki-page">Wiki</a>',
+                  '[[onlinestore:|Wiki]]' => '<a href="/projects/onlinestore/wiki/" class="wiki-page">Wiki</a>',
-                  '[[onlinestore:Start page]]' => '<a href="/wiki/onlinestore/Start_page" class="wiki-page">Start page</a>',
+                  '[[onlinestore:Start page]]' => '<a href="/projects/onlinestore/wiki/Start_page" class="wiki-page">Start page</a>',
-                  '[[onlinestore:Start page|Text]]' => '<a href="/wiki/onlinestore/Start_page" class="wiki-page">Text</a>',
+                  '[[onlinestore:Start page|Text]]' => '<a href="/projects/onlinestore/wiki/Start_page" class="wiki-page">Text</a>',
-                  '[[onlinestore:Unknown page]]' => '<a href="/wiki/onlinestore/Unknown_page" class="wiki-page new">Unknown page</a>',
+                  '[[onlinestore:Unknown page]]' => '<a href="/projects/onlinestore/wiki/Unknown_page" class="wiki-page new">Unknown page</a>',
                   # striked through link
-                  '-[[Another page|Page]]-' => '<del><a href="/wiki/ecookbook/Another_page" class="wiki-page">Page</a></del>',
+                  '-[[Another page|Page]]-' => '<del><a href="/projects/ecookbook/wiki/Another_page" class="wiki-page">Page</a></del>',
-                  '-[[Another page|Page]] link-' => '<del><a href="/wiki/ecookbook/Another_page" class="wiki-page">Page</a> link</del>',
+                  '-[[Another page|Page]] link-' => '<del><a href="/projects/ecookbook/wiki/Another_page" class="wiki-page">Page</a> link</del>',
                   # escaping
                   '![[Another page|Page]]' => '[[Another page|Page]]',
                 }
                 @project = Project.find(1)
                 to_test.each { |text, result| assert_equal "<p>#{result}</p>", textilizable(text) }
               end
               def test_html_tags
                 to_test = {
                   "<div>content</div>" => "<p>&lt;div&gt;content&lt;/div&gt;</p>",
                   "<div class=\"bold\">content</div>" => "<p>&lt;div class=\"bold\"&gt;content&lt;/div&gt;</p>",
                   "<script>some script;</script>" => "<p>&lt;script&gt;some script;&lt;/script&gt;</p>",
                   # do not escape pre/code tags
                   "<pre>\nline 1\nline2</pre>" => "<pre>\nline 1\nline2</pre>",
                   "<pre><code>\nline 1\nline2</code></pre>" => "<pre><code>\nline 1\nline2</code></pre>",
                   "<pre><div>content</div></pre>" => "<pre>&lt;div&gt;content&lt;/div&gt;</pre>",
                   "HTML comment: <!-- no comments -->" => "<p>HTML comment: &lt;!-- no comments --&gt;</p>",
                   "<!-- opening comment" => "<p>&lt;!-- opening comment</p>",
                   # remove attributes except class
                   "<pre class='foo'>some text</pre>" => "<pre class='foo'>some text</pre>",
                   "<pre onmouseover='alert(1)'>some text</pre>" => "<pre>some text</pre>",
                 }
                 to_test.each { |text, result| assert_equal result, textilizable(text) }
               end
               def test_allowed_html_tags
                 to_test = {
                   "<pre>preformatted text</pre>" => "<pre>preformatted text</pre>",
                   "<notextile>no *textile* formatting</notextile>" => "no *textile* formatting",
                   "<notextile>this is <tag>a tag</tag></notextile>" => "this is &lt;tag&gt;a tag&lt;/tag&gt;"
                 }
                 to_test.each { |text, result| assert_equal result, textilizable(text) }
               end
               def syntax_highlight
                 raw = <<-RAW
             <pre><code class="ruby">
             # Some ruby code here
             </pre></code>
             RAW
                 expected = <<-EXPECTED
             <pre><code class="ruby CodeRay"><span class="no">1</span> <span class="c"># Some ruby code here</span>
             </pre></code>
             EXPECTED
                 assert_equal expected.gsub(%r{[\r\n\t]}, ''), textilizable(raw).gsub(%r{[\r\n\t]}, '')
               end
               def test_wiki_links_in_tables
                 to_test = {"|[[Page|Link title]]|[[Other Page|Other title]]|\n|Cell 21|[[Last page]]|" =>
-                             '<tr><td><a href="/wiki/ecookbook/Page" class="wiki-page new">Link title</a></td>' +
+                             '<tr><td><a href="/projects/ecookbook/wiki/Page" class="wiki-page new">Link title</a></td>' +
-                             '<td><a href="/wiki/ecookbook/Other_Page" class="wiki-page new">Other title</a></td>' +
+                             '<td><a href="/projects/ecookbook/wiki/Other_Page" class="wiki-page new">Other title</a></td>' +
-                             '</tr><tr><td>Cell 21</td><td><a href="/wiki/ecookbook/Last_page" class="wiki-page new">Last page</a></td></tr>'
+                             '</tr><tr><td>Cell 21</td><td><a href="/projects/ecookbook/wiki/Last_page" class="wiki-page new">Last page</a></td></tr>'
                 }
                 @project = Project.find(1)
                 to_test.each { |text, result| assert_equal "<table>#{result}</table>", textilizable(text).gsub(/[\t\n]/, '') }
               end
               def test_text_formatting
                 to_test = {'*_+bold, italic and underline+_*' => '<strong><em><ins>bold, italic and underline</ins></em></strong>',
                            '(_text within parentheses_)' => '(<em>text within parentheses</em>)',
                            'a *Humane Web* Text Generator' => 'a <strong>Humane Web</strong> Text Generator',
                            'a H *umane* W *eb* T *ext* G *enerator*' => 'a H <strong>umane</strong> W <strong>eb</strong> T <strong>ext</strong> G <strong>enerator</strong>',
                            'a *H* umane *W* eb *T* ext *G* enerator' => 'a <strong>H</strong> umane <strong>W</strong> eb <strong>T</strong> ext <strong>G</strong> enerator',
                           }
                 to_test.each { |text, result| assert_equal "<p>#{result}</p>", textilizable(text) }
               end
               def test_wiki_horizontal_rule
                 assert_equal '<hr />', textilizable('---')
                 assert_equal '<p>Dashes: ---</p>', textilizable('Dashes: ---')
               end
               def test_acronym
                 assert_equal '<p>This is an acronym: <acronym title="American Civil Liberties Union">ACLU</acronym>.</p>',
                              textilizable('This is an acronym: ACLU(American Civil Liberties Union).')
               end
               def test_footnotes
                 raw = <<-RAW
             This is some text[1].
             fn1. This is the foot note
             RAW
                 expected = <<-EXPECTED
             <p>This is some text<sup><a href=\"#fn1\">1</a></sup>.</p>
             <p id="fn1" class="footnote"><sup>1</sup> This is the foot note</p>
             EXPECTED
                 assert_equal expected.gsub(%r{[\r\n\t]}, ''), textilizable(raw).gsub(%r{[\r\n\t]}, '')
               end
               def test_table_of_content
                 raw = <<-RAW
             {{toc}}
             h1. Title
             Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Maecenas sed libero.
             h2. Subtitle
             Nullam commodo metus accumsan nulla. Curabitur lobortis dui id dolor.
             h2. Subtitle with %{color:red}red text%
             h1. Another title
             RAW
                 expected = '<ul class="toc">' +
                            '<li class="heading1"><a href="#Title">Title</a></li>' +
                            '<li class="heading2"><a href="#Subtitle">Subtitle</a></li>' +
                            '<li class="heading2"><a href="#Subtitle-with-red-text">Subtitle with red text</a></li>' +
                            '<li class="heading1"><a href="#Another-title">Another title</a></li>' +
                            '</ul>'
                 assert textilizable(raw).gsub("\n", "").include?(expected)
               end
               def test_blockquote
                 # orig raw text
                 raw = <<-RAW
             John said:
             > Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Maecenas sed libero.
             > Nullam commodo metus accumsan nulla. Curabitur lobortis dui id dolor.
             > * Donec odio lorem,
             > * sagittis ac,
             > * malesuada in,
             > * adipiscing eu, dolor.
             >
             > >Nulla varius pulvinar diam. Proin id arcu id lorem scelerisque condimentum. Proin vehicula turpis vitae lacus.
             > Proin a tellus. Nam vel neque.
             He's right.
             RAW
                 # expected html
                 expected = <<-EXPECTED
             <p>John said:</p>
             <blockquote>
             Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Maecenas sed libero.
             Nullam commodo metus accumsan nulla. Curabitur lobortis dui id dolor.
             <ul>
               <li>Donec odio lorem,</li>
               <li>sagittis ac,</li>
               <li>malesuada in,</li>
               <li>adipiscing eu, dolor.</li>
             </ul>
             <blockquote>
             <p>Nulla varius pulvinar diam. Proin id arcu id lorem scelerisque condimentum. Proin vehicula turpis vitae lacus.</p>
             </blockquote>
             <p>Proin a tellus. Nam vel neque.</p>
             </blockquote>
             <p>He's right.</p>
             EXPECTED
                 assert_equal expected.gsub(%r{\s+}, ''), textilizable(raw).gsub(%r{\s+}, '')
               end
               def test_table
                 raw = <<-RAW
             This is a table with empty cells:
             |cell11|cell12||
             |cell21||cell23|
             |cell31|cell32|cell33|
             RAW
                 expected = <<-EXPECTED
             <p>This is a table with empty cells:</p>
             <table>
               <tr><td>cell11</td><td>cell12</td><td></td></tr>
               <tr><td>cell21</td><td></td><td>cell23</td></tr>
               <tr><td>cell31</td><td>cell32</td><td>cell33</td></tr>
             </table>
             EXPECTED
                 assert_equal expected.gsub(%r{\s+}, ''), textilizable(raw).gsub(%r{\s+}, '')
               end
               def test_default_formatter
                 Setting.text_formatting = 'unknown'
                 text = 'a *link*: http://www.example.net/'
                 assert_equal '<p>a *link*: <a href="http://www.example.net/">http://www.example.net/</a></p>', textilizable(text)
                 Setting.text_formatting = 'textile'
               end
               def test_date_format_default
                 today = Date.today
                 Setting.date_format = ''
                 assert_equal l_date(today), format_date(today)
               end
               def test_date_format
                 today = Date.today
                 Setting.date_format = '%d %m %Y'
                 assert_equal today.strftime('%d %m %Y'), format_date(today)
               end
               def test_time_format_default
                 now = Time.now
                 Setting.date_format = ''
                 Setting.time_format = ''
                 assert_equal l_datetime(now), format_time(now)
                 assert_equal l_time(now), format_time(now, false)
               end
               def test_time_format
                 now = Time.now
                 Setting.date_format = '%d %m %Y'
                 Setting.time_format = '%H %M'
                 assert_equal now.strftime('%d %m %Y %H %M'), format_time(now)
                 assert_equal now.strftime('%H %M'), format_time(now, false)
               end
               def test_utc_time_format
                 now = Time.now.utc
                 Setting.date_format = '%d %m %Y'
                 Setting.time_format = '%H %M'
                 assert_equal Time.now.strftime('%d %m %Y %H %M'), format_time(now)
                 assert_equal Time.now.strftime('%H %M'), format_time(now, false)
               end
               def test_due_date_distance_in_words
                 to_test = { Date.today => 'Due in 0 days',
                             Date.today + 1 => 'Due in 1 day',
                             Date.today + 100 => 'Due in 100 days',
                             Date.today + 20000 => 'Due in 20000 days',
                             Date.today - 1 => '1 day late',
                             Date.today - 100 => '100 days late',
                             Date.today - 20000 => '20000 days late',
                            }
                 to_test.each do |date, expected|
                   assert_equal expected, due_date_distance_in_words(date)
                 end
               end
               def test_avatar
                 # turn on avatars
                 Setting.gravatar_enabled = '1'
                 assert avatar(User.find_by_mail('jsmith@somenet.foo')).include?(Digest::MD5.hexdigest('jsmith@somenet.foo'))
                 assert avatar('jsmith <jsmith@somenet.foo>').include?(Digest::MD5.hexdigest('jsmith@somenet.foo'))
                 assert_nil avatar('jsmith')
                 assert_nil avatar(nil)
                 # turn off avatars
                 Setting.gravatar_enabled = '0'
                 assert_nil avatar(User.find_by_mail('jsmith@somenet.foo'))
               end
             end

test/unit/lib/redmine/wiki_formatting/macros_test.rb +5 -5

             # Redmine - project management software
             # Copyright (C) 2006-2008  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'
             class Redmine::WikiFormatting::MacrosTest < HelperTestCase
               include ApplicationHelper
               include ActionView::Helpers::TextHelper
               fixtures :projects, :roles, :enabled_modules, :users,
                                   :repositories, :changesets,
                                   :trackers, :issue_statuses, :issues,
                                   :versions, :documents,
                                   :wikis, :wiki_pages, :wiki_contents,
                                   :boards, :messages,
                                   :attachments
               def setup
                 super
                 @project = nil
               end
               def teardown
               end
               def test_macro_hello_world
                 text = "{{hello_world}}"
                 assert textilizable(text).match(/Hello world!/)
                 # escaping
                 text = "!{{hello_world}}"
                 assert_equal '<p>{{hello_world}}</p>', textilizable(text)
               end
               def test_macro_include
                 @project = Project.find(1)
                 # include a page of the current project wiki
                 text = "{{include(Another page)}}"
                 assert textilizable(text).match(/This is a link to a ticket/)
                 @project = nil
                 # include a page of a specific project wiki
                 text = "{{include(ecookbook:Another page)}}"
                 assert textilizable(text).match(/This is a link to a ticket/)
                 text = "{{include(ecookbook:)}}"
                 assert textilizable(text).match(/CookBook documentation/)
                 text = "{{include(unknowidentifier:somepage)}}"
                 assert textilizable(text).match(/Page not found/)
               end
               def test_macro_child_pages
                 expected =  "<p><ul class=\"pages-hierarchy\">\n" +
-                             "<li><a href=\"/wiki/ecookbook/Child_1\">Child 1</a></li>\n" +
+                             "<li><a href=\"/projects/ecookbook/wiki/Child_1\">Child 1</a></li>\n" +
-                             "<li><a href=\"/wiki/ecookbook/Child_2\">Child 2</a></li>\n" +
+                             "<li><a href=\"/projects/ecookbook/wiki/Child_2\">Child 2</a></li>\n" +
                              "</ul>\n</p>"
                 @project = Project.find(1)
                 # child pages of the current wiki page
                 assert_equal expected, textilizable("{{child_pages}}", :object => WikiPage.find(2).content)
                 # child pages of another page
                 assert_equal expected, textilizable("{{child_pages(Another_page)}}", :object => WikiPage.find(1).content)
                 @project = Project.find(2)
                 assert_equal expected, textilizable("{{child_pages(ecookbook:Another_page)}}", :object => WikiPage.find(1).content)
               end
               def test_macro_child_pages_with_option
                 expected =  "<p><ul class=\"pages-hierarchy\">\n" +
-                             "<li><a href=\"/wiki/ecookbook/Another_page\">Another page</a>\n" +
+                             "<li><a href=\"/projects/ecookbook/wiki/Another_page\">Another page</a>\n" +
                              "<ul class=\"pages-hierarchy\">\n" +
-                             "<li><a href=\"/wiki/ecookbook/Child_1\">Child 1</a></li>\n" +
+                             "<li><a href=\"/projects/ecookbook/wiki/Child_1\">Child 1</a></li>\n" +
-                             "<li><a href=\"/wiki/ecookbook/Child_2\">Child 2</a></li>\n" +
+                             "<li><a href=\"/projects/ecookbook/wiki/Child_2\">Child 2</a></li>\n" +
                              "</ul>\n</li>\n</ul>\n</p>"
                 @project = Project.find(1)
                 # child pages of the current wiki page
                 assert_equal expected, textilizable("{{child_pages(parent=1)}}", :object => WikiPage.find(2).content)
                 # child pages of another page
                 assert_equal expected, textilizable("{{child_pages(Another_page, parent=1)}}", :object => WikiPage.find(1).content)
                 @project = Project.find(2)
                 assert_equal expected, textilizable("{{child_pages(ecookbook:Another_page, parent=1)}}", :object => WikiPage.find(1).content)
               end
             end

test/unit/mailer_test.rb +11 -11

             # 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'
             class MailerTest < Test::Unit::TestCase
               fixtures :projects, :issues, :users, :members, :documents, :attachments, :news, :tokens, :journals, :journal_details, :changesets, :trackers, :issue_statuses, :enumerations, :messages, :boards, :repositories
               def test_generated_links_in_emails
                 ActionMailer::Base.deliveries.clear
                 Setting.host_name = 'mydomain.foo'
                 Setting.protocol = 'https'
                 journal = Journal.find(2)
                 assert Mailer.deliver_issue_edit(journal)
                 mail = ActionMailer::Base.deliveries.last
                 assert_kind_of TMail::Mail, mail
                 # link to the main ticket
-                assert mail.body.include?('<a href="https://mydomain.foo/issues/show/1">Bug #1: Can\'t print recipes</a>')
+                assert mail.body.include?('<a href="https://mydomain.foo/issues/1">Bug #1: Can\'t print recipes</a>')
                 # link to a referenced ticket
-                assert mail.body.include?('<a href="https://mydomain.foo/issues/show/2" class="issue" title="Add ingredients categories (Assigned)">#2</a>')
+                assert mail.body.include?('<a href="https://mydomain.foo/issues/2" class="issue" title="Add ingredients categories (Assigned)">#2</a>')
                 # link to a changeset
-                assert mail.body.include?('<a href="https://mydomain.foo/repositories/revision/ecookbook/2" class="changeset" title="This commit fixes #1, #2 and references #1 &amp; #3">r2</a>')
+                assert mail.body.include?('<a href="https://mydomain.foo/projects/ecookbook/repository/revisions/2" class="changeset" title="This commit fixes #1, #2 and references #1 &amp; #3">r2</a>')
               end
               def test_generated_links_with_prefix
                 relative_url_root = Redmine::Utils.relative_url_root
                 ActionMailer::Base.deliveries.clear
                 Setting.host_name = 'mydomain.foo/rdm'
                 Setting.protocol = 'http'
                 Redmine::Utils.relative_url_root = '/rdm'
                 journal = Journal.find(2)
                 assert Mailer.deliver_issue_edit(journal)
                 mail = ActionMailer::Base.deliveries.last
                 assert_kind_of TMail::Mail, mail
                 # link to the main ticket
-                assert mail.body.include?('<a href="http://mydomain.foo/rdm/issues/show/1">Bug #1: Can\'t print recipes</a>')
+                assert mail.body.include?('<a href="http://mydomain.foo/rdm/issues/1">Bug #1: Can\'t print recipes</a>')
                 # link to a referenced ticket
-                assert mail.body.include?('<a href="http://mydomain.foo/rdm/issues/show/2" class="issue" title="Add ingredients categories (Assigned)">#2</a>')
+                assert mail.body.include?('<a href="http://mydomain.foo/rdm/issues/2" class="issue" title="Add ingredients categories (Assigned)">#2</a>')
                 # link to a changeset
-                assert mail.body.include?('<a href="http://mydomain.foo/rdm/repositories/revision/ecookbook/2" class="changeset" title="This commit fixes #1, #2 and references #1 &amp; #3">r2</a>')
+                assert mail.body.include?('<a href="http://mydomain.foo/rdm/projects/ecookbook/repository/revisions/2" class="changeset" title="This commit fixes #1, #2 and references #1 &amp; #3">r2</a>')
               ensure
                 # restore it
                 Redmine::Utils.relative_url_root = relative_url_root
               end
               def test_generated_links_with_prefix_and_no_relative_url_root
                 relative_url_root = Redmine::Utils.relative_url_root
                 ActionMailer::Base.deliveries.clear
                 Setting.host_name = 'mydomain.foo/rdm'
                 Setting.protocol = 'http'
                 Redmine::Utils.relative_url_root = nil
                 journal = Journal.find(2)
                 assert Mailer.deliver_issue_edit(journal)
                 mail = ActionMailer::Base.deliveries.last
                 assert_kind_of TMail::Mail, mail
                 # link to the main ticket
-                assert mail.body.include?('<a href="http://mydomain.foo/rdm/issues/show/1">Bug #1: Can\'t print recipes</a>')
+                assert mail.body.include?('<a href="http://mydomain.foo/rdm/issues/1">Bug #1: Can\'t print recipes</a>')
                 # link to a referenced ticket
-                assert mail.body.include?('<a href="http://mydomain.foo/rdm/issues/show/2" class="issue" title="Add ingredients categories (Assigned)">#2</a>')
+                assert mail.body.include?('<a href="http://mydomain.foo/rdm/issues/2" class="issue" title="Add ingredients categories (Assigned)">#2</a>')
                 # link to a changeset
-                assert mail.body.include?('<a href="http://mydomain.foo/rdm/repositories/revision/ecookbook/2" class="changeset" title="This commit fixes #1, #2 and references #1 &amp; #3">r2</a>')
+                assert mail.body.include?('<a href="http://mydomain.foo/rdm/projects/ecookbook/repository/revisions/2" class="changeset" title="This commit fixes #1, #2 and references #1 &amp; #3">r2</a>')
               ensure
                 # restore it
                 Redmine::Utils.relative_url_root = relative_url_root
               end
               def test_plain_text_mail
                 Setting.plain_text_mail = 1
                 journal = Journal.find(2)
                 Mailer.deliver_issue_edit(journal)
                 mail = ActionMailer::Base.deliveries.last
-                assert !mail.body.include?('<a href="https://mydomain.foo/issues/show/1">Bug #1: Can\'t print recipes</a>')
+                assert !mail.body.include?('<a href="https://mydomain.foo/issues/1">Bug #1: Can\'t print recipes</a>')
               end
               def test_issue_add_message_id
                 ActionMailer::Base.deliveries.clear
                 issue = Issue.find(1)
                 Mailer.deliver_issue_add(issue)
                 mail = ActionMailer::Base.deliveries.last
                 assert_not_nil mail
                 assert_equal Mailer.message_id_for(issue), mail.message_id
                 assert_nil mail.references
               end
               def test_issue_edit_message_id
                 ActionMailer::Base.deliveries.clear
                 journal = Journal.find(1)
                 Mailer.deliver_issue_edit(journal)
                 mail = ActionMailer::Base.deliveries.last
                 assert_not_nil mail
                 assert_equal Mailer.message_id_for(journal), mail.message_id
                 assert_equal Mailer.message_id_for(journal.issue), mail.references.to_s
               end
               def test_message_posted_message_id
                 ActionMailer::Base.deliveries.clear
                 message = Message.find(1)
                 Mailer.deliver_message_posted(message, message.author.mail)
                 mail = ActionMailer::Base.deliveries.last
                 assert_not_nil mail
                 assert_equal Mailer.message_id_for(message), mail.message_id
                 assert_nil mail.references
               end
               def test_reply_posted_message_id
                 ActionMailer::Base.deliveries.clear
                 message = Message.find(3)
                 Mailer.deliver_message_posted(message, message.author.mail)
                 mail = ActionMailer::Base.deliveries.last
                 assert_not_nil mail
                 assert_equal Mailer.message_id_for(message), mail.message_id
                 assert_equal Mailer.message_id_for(message.parent), mail.references.to_s
               end
               # test mailer methods for each language
               def test_issue_add
                 issue = Issue.find(1)
                 GLoc.valid_languages.each do |lang|
                   Setting.default_language = lang.to_s
                   assert Mailer.deliver_issue_add(issue)
                 end
               end
               def test_issue_edit
                 journal = Journal.find(1)
                 GLoc.valid_languages.each do |lang|
                   Setting.default_language = lang.to_s
                   assert Mailer.deliver_issue_edit(journal)
                 end
               end
               def test_document_added
                 document = Document.find(1)
                 GLoc.valid_languages.each do |lang|
                   Setting.default_language = lang.to_s
                   assert Mailer.deliver_document_added(document)
                 end
               end
               def test_attachments_added
                 attachements = [ Attachment.find_by_container_type('Document') ]
                 GLoc.valid_languages.each do |lang|
                   Setting.default_language = lang.to_s
                   assert Mailer.deliver_attachments_added(attachements)
                 end
               end
               def test_news_added
                 news = News.find(:first)
                 GLoc.valid_languages.each do |lang|
                   Setting.default_language = lang.to_s
                   assert Mailer.deliver_news_added(news)
                 end
               end
               def test_message_posted
                 message = Message.find(:first)
                 recipients = ([message.root] + message.root.children).collect {|m| m.author.mail if m.author}
                 recipients = recipients.compact.uniq
                 GLoc.valid_languages.each do |lang|
                   Setting.default_language = lang.to_s
                   assert Mailer.deliver_message_posted(message, recipients)
                 end
               end
               def test_account_information
                 user = User.find(:first)
                 GLoc.valid_languages.each do |lang|
                   user.update_attribute :language, lang.to_s
                   user.reload
                   assert Mailer.deliver_account_information(user, 'pAsswORd')
                 end
               end
               def test_lost_password
                 token = Token.find(2)
                 GLoc.valid_languages.each do |lang|
                   token.user.update_attribute :language, lang.to_s
                   token.reload
                   assert Mailer.deliver_lost_password(token)
                 end
               end
               def test_register
                 token = Token.find(1)
                 GLoc.valid_languages.each do |lang|
                   token.user.update_attribute :language, lang.to_s
                   token.reload
                   assert Mailer.deliver_register(token)
                 end
               end
               def test_reminders
                 ActionMailer::Base.deliveries.clear
                 Mailer.reminders(:days => 42)
                 assert_equal 1, ActionMailer::Base.deliveries.size
                 mail = ActionMailer::Base.deliveries.last
                 assert mail.bcc.include?('dlopper@somenet.foo')
                 assert mail.body.include?('Bug #3: Error 281 when updating a recipe')
               end
             end

General Comments 0

Write
Preview

You need to be logged in to leave comments. Login now

No TODOs yet

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
g 0-9	Goto bookmarked items from 0-9
n r	New repository page
n g	New gist page

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages