Skip to content

O
OHR Support
Commit 765f7abc authored by Eric Davis's avatar Eric Davis
Browse files
Options

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
parent bcc90071
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 1306 additions and 154 deletions
app/helpers/application_helper.rb
View file @ 765f7abc
......@@ -243,39 +243,36 @@ module ApplicationHelper
url_param.clear if url_param.has_key?(:set_filter)
html = ''
html << link_to_remote(('&#171; ' + l(:label_previous)),
{:update => 'content',
:url => url_param.merge(page_param => paginator.current.previous),
:complete => 'window.scrollTo(0,0)'},
{:href => url_for(:params => url_param.merge(page_param => paginator.current.previous))}) + ' ' if paginator.current.previous
if paginator.current.previous
html << link_to_remote_content_update('&#171; ' + l(:label_previous), url_param.merge(page_param => paginator.current.previous)) + ' '
end
html << (pagination_links_each(paginator, options) do |n|
link_to_remote(n.to_s,
{: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))})
link_to_remote_content_update(n.to_s, url_param.merge(page_param => n))
end || '')
html << ' ' + link_to_remote((l(:label_next) + ' &#187;'),
{:update => 'content',
:url => url_param.merge(page_param => paginator.current.next),
:complete => 'window.scrollTo(0,0)'},
{:href => url_for(:params => url_param.merge(page_param => paginator.current.next))}) if paginator.current.next
if paginator.current.next
html << ' ' + link_to_remote_content_update((l(:label_next) + ' &#187;'), url_param.merge(page_param => paginator.current.next))
end
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
......@@ -664,4 +661,12 @@ module ApplicationHelper
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
View file @ 765f7abc
......@@ -121,7 +121,7 @@ module SortHelper
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
......
app/views/projects/changelog.rhtml
View file @ 765f7abc
......@@ -26,7 +26,7 @@
<% 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) %>
......
app/views/timelog/details.rhtml
View file @ 765f7abc
......@@ -6,7 +6,9 @@
<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' %>
......
app/views/timelog/report.rhtml
View file @ 765f7abc
......@@ -6,10 +6,11 @@
<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' %>
......@@ -25,6 +26,7 @@
: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 %>
......
app/views/users/_general.rhtml
View file @ 765f7abc
<% 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
View file @ 765f7abc
This diff is collapsed.
test/functional/admin_controller_test.rb
View file @ 765f7abc
......@@ -38,6 +38,13 @@ class AdminControllerTest < Test::Unit::TestCase
: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
......
test/functional/boards_controller_test.rb
View file @ 765f7abc
......@@ -31,6 +31,13 @@ class BoardsControllerTest < Test::Unit::TestCase
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
......@@ -39,6 +46,24 @@ class BoardsControllerTest < Test::Unit::TestCase
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
......@@ -47,4 +72,22 @@ class BoardsControllerTest < Test::Unit::TestCase
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
View file @ 765f7abc
......@@ -30,7 +30,14 @@ class DocumentsControllerTest < Test::Unit::TestCase
@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')
......@@ -47,6 +54,17 @@ class DocumentsControllerTest < Test::Unit::TestCase
: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
......@@ -66,6 +84,31 @@ class DocumentsControllerTest < Test::Unit::TestCase
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
......
test/functional/issue_relations_controller_test.rb 0 → 100644
View file @ 765f7abc
require File.dirname(__FILE__) + '/../test_helper'
require 'issue_relations_controller'
# Re-raise errors caught by the controller.
class IssueRelationsController; def rescue_action(e) raise e end; end
class IssueRelationsControllerTest < Test::Unit::TestCase
def test_new_routing
assert_routing(
{:method => :post, :path => '/issues/1/relations'},
{:controller => 'issue_relations', :action => 'new', :issue_id => '1'}
)
end
def test_destroy_routing
assert_recognizes( #TODO: use DELETE on issue URI
{:controller => 'issue_relations', :action => 'destroy', :issue_id => '1', :id => '23'},
{:method => :post, :path => '/issues/1/relations/23/destroy'}
)
end
end
test/functional/issues_controller_test.rb
View file @ 765f7abc
This diff is collapsed.
test/functional/members_controller_test.rb 0 → 100644
View file @ 765f7abc
require File.dirname(__FILE__) + '/../test_helper'
require 'members_controller'
# Re-raise errors caught by the controller.
class MembersController; def rescue_action(e) raise e end; end
class MembersControllerTest < Test::Unit::TestCase
def test_members_routing
assert_routing(
{:method => :post, :path => 'projects/5234/members/new'},
:controller => 'members', :action => 'new', :id => '5234'
)
end
end
test/functional/messages_controller_test.rb
View file @ 765f7abc
......@@ -31,6 +31,13 @@ class MessagesControllerTest < Test::Unit::TestCase
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
......@@ -54,6 +61,17 @@ class MessagesControllerTest < Test::Unit::TestCase
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
......@@ -86,6 +104,17 @@ class MessagesControllerTest < Test::Unit::TestCase
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
......@@ -104,6 +133,13 @@ class MessagesControllerTest < Test::Unit::TestCase
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' }
......@@ -111,6 +147,13 @@ class MessagesControllerTest < Test::Unit::TestCase
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
......
test/functional/news_controller_test.rb
View file @ 765f7abc
......@@ -31,6 +31,20 @@ class NewsControllerTest < Test::Unit::TestCase
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
......@@ -38,6 +52,20 @@ class NewsControllerTest < Test::Unit::TestCase
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
......@@ -46,6 +74,13 @@ class NewsControllerTest < Test::Unit::TestCase
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
......@@ -58,6 +93,17 @@ class NewsControllerTest < Test::Unit::TestCase
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
......@@ -79,6 +125,17 @@ class NewsControllerTest < Test::Unit::TestCase
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
......@@ -127,6 +184,13 @@ class NewsControllerTest < Test::Unit::TestCase
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
......
test/functional/projects_controller_test.rb
View file @ 765f7abc
......@@ -33,7 +33,14 @@ class ProjectsControllerTest < Test::Unit::TestCase
@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
......@@ -50,7 +57,14 @@ class ProjectsControllerTest < Test::Unit::TestCase
}
assert_no_tag :a, :content => /Private child of eCookbook/
end
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'
......@@ -59,12 +73,34 @@ class ProjectsControllerTest < Test::Unit::TestCase
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
get :show, :id => 1
def test_add_routing
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)
assert_template 'show'
assert_not_nil assigns(:project)
end
def test_show_by_identifier
......@@ -90,6 +126,17 @@ class ProjectsControllerTest < Test::Unit::TestCase
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
......@@ -106,13 +153,49 @@ class ProjectsControllerTest < Test::Unit::TestCase
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
end
def test_post_destroy
@request.session[:user_id] = 1 # admin
......@@ -142,6 +225,17 @@ class ProjectsControllerTest < Test::Unit::TestCase
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
......@@ -156,27 +250,48 @@ class ProjectsControllerTest < Test::Unit::TestCase
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'
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
get :changelog, :id => 1
assert_response :success
assert_template 'changelog'
assert_not_nil assigns(:versions)
end
def test_list_files_routing
assert_routing(
{:method => :get, :path => '/projects/33/files'},
:controller => 'projects', :action => 'list_files', :id => '33'
)
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
......@@ -200,7 +315,21 @@ class ProjectsControllerTest < Test::Unit::TestCase
# 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
......@@ -237,6 +366,10 @@ class ProjectsControllerTest < Test::Unit::TestCase
}
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
......@@ -273,19 +406,39 @@ class ProjectsControllerTest < Test::Unit::TestCase
}
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
......
test/functional/reports_controller_test.rb 0 → 100644
View file @ 765f7abc
require File.dirname(__FILE__) + '/../test_helper'
require 'reports_controller'
# Re-raise errors caught by the controller.
class ReportsController; def rescue_action(e) raise e end; end
class ReportsControllerTest < Test::Unit::TestCase
def test_issue_report_routing
assert_routing(
{:method => :get, :path => '/projects/567/issues/report'},
:controller => 'reports', :action => 'issue_report', :id => '567'
)
assert_routing(
{:method => :get, :path => '/projects/567/issues/report/assigned_to'},
:controller => 'reports', :action => 'issue_report', :id => '567', :detail => 'assigned_to'
)
end
end
test/functional/repositories_controller_test.rb
View file @ 765f7abc
......@@ -31,25 +31,134 @@ class RepositoriesControllerTest < Test::Unit::TestCase
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
......
test/functional/repositories_subversion_controller_test.rb
View file @ 765f7abc
......@@ -131,11 +131,11 @@ class RepositoriesSubversionControllerTest < Test::Unit::TestCase
: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' }
}
}
}
......@@ -153,11 +153,11 @@ class RepositoriesSubversionControllerTest < Test::Unit::TestCase
: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' }
}
}
}
......
test/functional/timelog_controller_test.rb
View file @ 765f7abc
......@@ -30,6 +30,28 @@ class TimelogControllerTest < Test::Unit::TestCase
@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
......@@ -41,6 +63,8 @@ class TimelogControllerTest < Test::Unit::TestCase
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',
......@@ -49,7 +73,7 @@ class TimelogControllerTest < Test::Unit::TestCase
: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')
......@@ -70,7 +94,7 @@ class TimelogControllerTest < Test::Unit::TestCase
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
......@@ -78,18 +102,44 @@ class TimelogControllerTest < Test::Unit::TestCase
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
......@@ -103,7 +153,7 @@ class TimelogControllerTest < Test::Unit::TestCase
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
......@@ -201,7 +251,14 @@ class TimelogControllerTest < Test::Unit::TestCase
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
......@@ -239,6 +296,23 @@ class TimelogControllerTest < Test::Unit::TestCase
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
......@@ -252,6 +326,39 @@ class TimelogControllerTest < Test::Unit::TestCase
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
......
test/functional/users_controller_test.rb
View file @ 765f7abc
......@@ -32,11 +32,27 @@ class UsersControllerTest < Test::Unit::TestCase
@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
......@@ -56,17 +72,71 @@ class UsersControllerTest < Test::Unit::TestCase
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
View file @ 765f7abc
......@@ -52,7 +52,7 @@ class VersionsControllerTest < Test::Unit::TestCase
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
......@@ -61,7 +61,7 @@ class VersionsControllerTest < Test::Unit::TestCase
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
......
test/functional/wiki_controller_test.rb
View file @ 765f7abc
This diff is collapsed.
test/functional/wikis_controller_test.rb
View file @ 765f7abc
......@@ -31,6 +31,14 @@ class WikisControllerTest < Test::Unit::TestCase
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
......@@ -41,10 +49,21 @@ class WikisControllerTest < Test::Unit::TestCase
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
......@@ -53,4 +72,4 @@ class WikisControllerTest < Test::Unit::TestCase
post :destroy, :id => 999, :confirm => 1
assert_response 404
end
end
end
test/integration/admin_test.rb
View file @ 765f7abc
......@@ -42,10 +42,10 @@ class AdminTest < ActionController::IntegrationTest
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,
......
test/integration/issues_test.rb
View file @ 765f7abc
......@@ -39,7 +39,7 @@ class IssuesTest < ActionController::IntegrationTest
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",
......@@ -54,7 +54,7 @@ class IssuesTest < ActionController::IntegrationTest
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)
......@@ -69,10 +69,10 @@ class IssuesTest < ActionController::IntegrationTest
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")
......
test/integration/projects_test.rb
View file @ 765f7abc
......@@ -27,18 +27,18 @@ class ProjectsTest < ActionController::IntegrationTest
assert_response :success
assert_template "admin/projects"
post "projects/archive", :id => 1
assert_redirected_to "admin/projects"
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_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
View file @ 765f7abc
......@@ -174,23 +174,23 @@ class ApplicationHelperTest < HelperTestCase
def test_wiki_links
to_test = {
'[[CookBook documentation]]' => '<a href="/wiki/ecookbook/CookBook_documentation" class="wiki-page">CookBook documentation</a>',
'[[Another page|Page]]' => '<a href="/wiki/ecookbook/Another_page" class="wiki-page">Page</a>',
'[[CookBook documentation]]' => '<a href="/projects/ecookbook/wiki/CookBook_documentation" class="wiki-page">CookBook documentation</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>',
'[[Another page#anchor|Page]]' => '<a href="/wiki/ecookbook/Another_page#anchor" class="wiki-page">Page</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="/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|404]]' => '<a href="/wiki/ecookbook/Unknown_page" class="wiki-page new">404</a>',
'[[Unknown page]]' => '<a href="/projects/ecookbook/wiki/Unknown_page" class="wiki-page new">Unknown page</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:|Wiki]]' => '<a href="/wiki/onlinestore/" class="wiki-page">Wiki</a>',
'[[onlinestore:Start page]]' => '<a href="/wiki/onlinestore/Start_page" class="wiki-page">Start page</a>',
'[[onlinestore:Start page|Text]]' => '<a href="/wiki/onlinestore/Start_page" class="wiki-page">Text</a>',
'[[onlinestore:Unknown page]]' => '<a href="/wiki/onlinestore/Unknown_page" class="wiki-page new">Unknown page</a>',
'[[onlinestore:]]' => '<a href="/projects/onlinestore/wiki/" class="wiki-page">onlinestore</a>',
'[[onlinestore:|Wiki]]' => '<a href="/projects/onlinestore/wiki/" class="wiki-page">Wiki</a>',
'[[onlinestore:Start page]]' => '<a href="/projects/onlinestore/wiki/Start_page" class="wiki-page">Start page</a>',
'[[onlinestore:Start page|Text]]' => '<a href="/projects/onlinestore/wiki/Start_page" class="wiki-page">Text</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]] link-' => '<del><a href="/wiki/ecookbook/Another_page" class="wiki-page">Page</a> link</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="/projects/ecookbook/wiki/Another_page" class="wiki-page">Page</a> link</del>',
# escaping
'![[Another page|Page]]' => '[[Another page|Page]]',
}
......@@ -242,9 +242,9 @@ EXPECTED
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>' +
'<td><a href="/wiki/ecookbook/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><td><a href="/projects/ecookbook/wiki/Page" class="wiki-page new">Link 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="/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]/, '') }
......
test/unit/lib/redmine/wiki_formatting/macros_test.rb
View file @ 765f7abc
......@@ -64,8 +64,8 @@ class Redmine::WikiFormatting::MacrosTest < HelperTestCase
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=\"/wiki/ecookbook/Child_2\">Child 2</a></li>\n" +
"<li><a href=\"/projects/ecookbook/wiki/Child_1\">Child 1</a></li>\n" +
"<li><a href=\"/projects/ecookbook/wiki/Child_2\">Child 2</a></li>\n" +
"</ul>\n</p>"
@project = Project.find(1)
......@@ -80,10 +80,10 @@ class Redmine::WikiFormatting::MacrosTest < HelperTestCase
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=\"/wiki/ecookbook/Child_2\">Child 2</a></li>\n" +
"<li><a href=\"/projects/ecookbook/wiki/Child_1\">Child 1</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)
......
test/unit/mailer_test.rb
View file @ 765f7abc
......@@ -31,12 +31,12 @@ class MailerTest < Test::Unit::TestCase
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
......@@ -52,12 +52,12 @@ class MailerTest < Test::Unit::TestCase
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
......@@ -76,12 +76,12 @@ class MailerTest < Test::Unit::TestCase
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
......@@ -92,7 +92,7 @@ class MailerTest < Test::Unit::TestCase
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
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment