jro_apps/redmine Commit - r13060:2e9b28906db6

Removes routes for time entries nested under project/issues....

Jean-Philippe Lang -

r13060:2e9b28906db6

parent child

Context file:

r13060:2e9b28906db6

Collapse all files

test/unit/helpers/routes_helper_test.rb created 644 +45 0

@@ -0,0 +1,45
	1	# encoding: utf-8
	2	#
	3	# Redmine - project management software
	4	# Copyright (C) 2006-2014 Jean-Philippe Lang
	5	#
	6	# This program is free software; you can redistribute it and/or
	7	# modify it under the terms of the GNU General Public License
	8	# as published by the Free Software Foundation; either version 2
	9	# of the License, or (at your option) any later version.
	10	#
	11	# This program is distributed in the hope that it will be useful,
	12	# but WITHOUT ANY WARRANTY; without even the implied warranty of
	13	# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
	14	# GNU General Public License for more details.
	15	#
	16	# You should have received a copy of the GNU General Public License
	17	# along with this program; if not, write to the Free Software
	18	# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
	19
	20	require File.expand_path('../../../test_helper', __FILE__)
	21
	22	class RoutesHelperTest < ActionView::TestCase
	23	include Rails.application.routes.url_helpers
	24
	25	def test_time_entries_path
	26	assert_equal '/projects/ecookbook/time_entries', _time_entries_path(Project.find(1), nil)
	27	assert_equal '/issues/1/time_entries', _time_entries_path(Project.find(1), Issue.find(1))
	28	assert_equal '/issues/1/time_entries', _time_entries_path(nil, Issue.find(1))
	29	assert_equal '/time_entries', _time_entries_path(nil, nil)
	30	end
	31
	32	def test_report_time_entries_path
	33	assert_equal '/projects/ecookbook/time_entries/report', _report_time_entries_path(Project.find(1), nil)
	34	assert_equal '/issues/1/time_entries/report', _report_time_entries_path(Project.find(1), Issue.find(1))
	35	assert_equal '/issues/1/time_entries/report', _report_time_entries_path(nil, Issue.find(1))
	36	assert_equal '/time_entries/report', _report_time_entries_path(nil, nil)
	37	end
	38
	39	def test_new_time_entry_path
	40	assert_equal '/projects/ecookbook/time_entries/new', _new_time_entry_path(Project.find(1), nil)
	41	assert_equal '/issues/1/time_entries/new', _new_time_entry_path(Project.find(1), Issue.find(1))
	42	assert_equal '/issues/1/time_entries/new', _new_time_entry_path(nil, Issue.find(1))
	43	assert_equal '/time_entries/new', _new_time_entry_path(nil, nil)
	44	end
	45	end

app/helpers/routes_helper.rb +30 0

             # encoding: utf-8
             #
             # Redmine - project management software
             # Copyright (C) 2006-2014  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.
             module RoutesHelper
               # Returns the path to project issues or to the cross-project
               # issue list if project is nil
               def _project_issues_path(project, *args)
                 if project
                   project_issues_path(project, *args)
                 else
                   issues_path(*args)
                 end
               end
               def _project_calendar_path(project, *args)
                 project ? project_calendar_path(project, *args) : issues_calendar_path(*args)
               end
               def _project_gantt_path(project, *args)
                 project ? project_gantt_path(project, *args) : issues_gantt_path(*args)
               end
+              def _time_entries_path(project, issue, *args)
+                if issue
+                  issue_time_entries_path(issue, *args)
+                elsif project
+                  project_time_entries_path(project, *args)
+                else
+                  time_entries_path(*args)
+                end
+              end
+              def _report_time_entries_path(project, issue, *args)
+                if issue
+                  report_issue_time_entries_path(issue, *args)
+                elsif project
+                  report_project_time_entries_path(project, *args)
+                else
+                  report_time_entries_path(*args)
+                end
+              end
+              def _new_time_entry_path(project, issue, *args)
+                if issue
+                  new_issue_time_entry_path(issue, *args)
+                elsif project
+                  new_project_time_entry_path(project, *args)
+                else
+                  new_time_entry_path(*args)
+                end
+              end
             end

app/views/timelog/_date_range.html.erb +2 -2

             <div id="query_form_with_buttons" class="hide-when-print">
             <div id="query_form_content">
               <fieldset id="filters" class="collapsible <%= @query.new_record? ? "" : "collapsed" %>">
                 <legend onclick="toggleFieldset(this);"><%= l(:label_filter_plural) %></legend>
                 <div style="<%= @query.new_record? ? "" : "display: none;" %>">
                   <%= render :partial => 'queries/filters', :locals => {:query => @query} %>
                 </div>
               </fieldset>
               <fieldset class="collapsible collapsed">
                 <legend onclick="toggleFieldset(this);"><%= l(:label_options) %></legend>
                 <div style="display: none;">
                   <table>
                     <tr>
                       <td><%= l(:field_column_names) %></td>
                       <td><%= render_query_columns_selection(@query) %></td>
                     </tr>
                   </table>
                 </div>
               </fieldset>
             </div>
             <p class="buttons">
               <%= link_to_function l(:button_apply), 'submit_query_form("query_form")', :class => 'icon icon-checked' %>
               <%= link_to l(:button_clear), {:project_id => @project, :issue_id => @issue}, :class => 'icon icon-reload'  %>
             </p>
             </div>
             <div class="tabs hide-when-print">
             <% query_params = params.slice(:f, :op, :v, :sort) %>
             <ul>
-                <li><%= link_to(l(:label_details), query_params.merge({:controller => 'timelog', :action => 'index', :project_id => @project, :issue_id => @issue }),
+                <li><%= link_to(l(:label_details), _time_entries_path(@project, @issue, query_params),
                                                    :class => (action_name == 'index' ? 'selected' : nil)) %></li>
-                <li><%= link_to(l(:label_report), query_params.merge({:controller => 'timelog', :action => 'report', :project_id => @project, :issue_id => @issue}),
+                <li><%= link_to(l(:label_report), _report_time_entries_path(@project, @issue, query_params),
                                                    :class => (action_name == 'report' ? 'selected' : nil)) %></li>
             </ul>
             </div>

app/views/timelog/index.html.erb +2 -2

             <div class="contextual">
             <%= link_to l(:button_log_time),
-                        {:controller => 'timelog', :action => 'new', :project_id => @project, :issue_id => @issue},
+                        _new_time_entry_path(@project, @issue),
                         :class => 'icon icon-time-add' if User.current.allowed_to?(:log_time, @project, :global => true) %>
             </div>
             <%= render_timelog_breadcrumb %>
             <h2><%= l(:label_spent_time) %></h2>
-            <%= form_tag({:controller => 'timelog', :action => 'index', :project_id => @project, :issue_id => @issue}, :method => :get, :id => 'query_form') do %>
+            <%= form_tag(params.slice(:project_id, :issue_id), :method => :get, :id => 'query_form') do %>
             <%= render :partial => 'date_range' %>
             <% end %>
             <div class="total-hours">
             <p><%= l(:label_total_time) %>: <%= html_hours(l_hours(@total_hours)) %></p>
             </div>
             <% unless @entries.empty? %>
             <%= render :partial => 'list', :locals => { :entries => @entries }%>
             <p class="pagination"><%= pagination_links_full @entry_pages, @entry_count %></p>
             <% other_formats_links do |f| %>
               <%= f.link_to 'Atom', :url => params.merge({:issue_id => @issue, :key => User.current.rss_key}) %>
               <%= f.link_to 'CSV', :url => params, :onclick => "showModal('csv-export-options', '330px'); return false;" %>
             <% end %>
             <div id="csv-export-options" style="display:none;">
               <h3 class="title"><%= l(:label_export_options, :export_format => 'CSV') %></h3>
               <%= form_tag(params.slice(:project_id, :issue_id).merge(:format => 'csv', :page=>nil), :method => :get, :id => 'csv-export-form') do %>
               <%= query_hidden_tags @query %>
               <p>
                 <label><%= radio_button_tag 'columns', '', true %> <%= l(:description_selected_columns) %></label><br />
                 <label><%= radio_button_tag 'columns', 'all' %> <%= l(:description_all_columns) %></label>
               </p>
               <p class="buttons">
                 <%= submit_tag l(:button_export), :name => nil, :onclick => "hideModal(this);" %>
                 <%= submit_tag l(:button_cancel), :name => nil, :onclick => "hideModal(this);", :type => 'button' %>
               </p>
               <% end %>
             </div>
             <% 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.html.erb +4 -4

             <div class="contextual">
-            <%= link_to_if_authorized l(:button_log_time), {:controller => 'timelog', :action => 'new', :project_id => @project, :issue_id => @issue}, :class => 'icon icon-time-add' %>
+            <%= link_to l(:button_log_time),
+                        _new_time_entry_path(@project, @issue),
+                        :class => 'icon icon-time-add' if User.current.allowed_to?(:log_time, @project, :global => true) %>
             </div>
             <%= render_timelog_breadcrumb %>
             <h2><%= l(:label_spent_time) %></h2>
-            <%= form_tag({:controller => 'timelog', :action => 'report',
+            <%= form_tag(params.slice(:project_id, :issue_id), :method => :get, :id => 'query_form') do %>
-                          :project_id => @project, :issue_id => @issue},
-                        :method => :get, :id => 'query_form') do %>
               <% @report.criteria.each do |criterion| %>
                 <%= hidden_field_tag 'criteria[]', criterion, :id => nil %>
               <% end %>
               <%= render :partial => 'timelog/date_range' %>
               <p><label for='columns'><%= l(:label_details) %></label>: <%= select_tag 'columns', options_for_select([[l(:label_year), 'year'],
                                                                                         [l(:label_month), 'month'],
                                                                                         [l(:label_week), 'week'],
                                                                                         [l(:label_day_plural).titleize, 'day']], @report.columns),
                                                                     :onchange => "this.form.submit();" %>
               <label for='criterias'><%= l(:button_add) %></label>: <%= select_tag('criteria[]', options_for_select([[]] + (@report.available_criteria.keys - @report.criteria).collect{|k| [l_or_humanize(@report.available_criteria[k][:label]), k]}),
                                                                       :onchange => "this.form.submit();",
                                                                       :style => 'width: 200px',
                                                                       :id => nil,
                                                                       :disabled => (@report.criteria.length >= 3), :id => "criterias") %>
                  <%= link_to l(:button_clear), {:project_id => @project, :issue_id => @issue, :period_type => params[:period_type], :period => params[:period], :from => @from, :to => @to, :columns => @report.columns}, :class => 'icon icon-reload' %></p>
             <% end %>
             <% unless @report.criteria.empty? %>
             <div class="total-hours">
             <p><%= l(:label_total_time) %>: <%= html_hours(l_hours(@report.total_hours)) %></p>
             </div>
             <% unless @report.hours.empty? %>
             <div class="autoscroll">
             <table class="list" id="time-report">
             <thead>
             <tr>
             <% @report.criteria.each do |criteria| %>
               <th><%= l_or_humanize(@report.available_criteria[criteria][:label]) %></th>
             <% end %>
             <% columns_width = (40 / (@report.periods.length+1)).to_i %>
             <% @report.periods.each do |period| %>
               <th class="period" style="width:<%= columns_width %>%;"><%= period %></th>
             <% end %>
               <th class="total" style="width:<%= columns_width %>%;"><%= l(:label_total_time) %></th>
             </tr>
             </thead>
             <tbody>
             <%= render :partial => 'report_criteria', :locals => {:criterias => @report.criteria, :hours => @report.hours, :level => 0} %>
               <tr class="total">
               <td><%= l(:label_total_time) %></td>
               <%= ('<td></td>' * (@report.criteria.size - 1)).html_safe %>
               <% total = 0 -%>
               <% @report.periods.each do |period| -%>
                 <% sum = sum_hours(select_hours(@report.hours, @report.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>
             </div>
             <% other_formats_links do |f| %>
               <%= f.link_to 'CSV', :url => params %>
             <% end %>
             <% end %>
             <% end %>
             <% html_title l(:label_spent_time), l(:label_report) %>

config/routes.rb +1 -7

             # Redmine - project management software
             # Copyright (C) 2006-2014  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.
             RedmineApp::Application.routes.draw do
               root :to => 'welcome#index', :as => 'home'
               match 'login', :to => 'account#login', :as => 'signin', :via => [:get, :post]
               match 'logout', :to => 'account#logout', :as => 'signout', :via => [:get, :post]
               match 'account/register', :to => 'account#register', :via => [:get, :post], :as => 'register'
               match 'account/lost_password', :to => 'account#lost_password', :via => [:get, :post], :as => 'lost_password'
               match 'account/activate', :to => 'account#activate', :via => :get
               get 'account/activation_email', :to => 'account#activation_email', :as => 'activation_email'
               match '/news/preview', :controller => 'previews', :action => 'news', :as => 'preview_news', :via => [:get, :post, :put]
               match '/issues/preview/new/:project_id', :to => 'previews#issue', :as => 'preview_new_issue', :via => [:get, :post, :put]
               match '/issues/preview/edit/:id', :to => 'previews#issue', :as => 'preview_edit_issue', :via => [:get, :post, :put]
               match '/issues/preview', :to => 'previews#issue', :as => 'preview_issue', :via => [:get, :post, :put]
               match 'projects/:id/wiki', :to => 'wikis#edit', :via => :post
               match 'projects/:id/wiki/destroy', :to => 'wikis#destroy', :via => [:get, :post]
               match 'boards/:board_id/topics/new', :to => 'messages#new', :via => [:get, :post], :as => 'new_board_message'
               get 'boards/:board_id/topics/:id', :to => 'messages#show', :as => 'board_message'
               match 'boards/:board_id/topics/quote/:id', :to => 'messages#quote', :via => [:get, :post]
               get 'boards/:board_id/topics/:id/edit', :to => 'messages#edit'
               post 'boards/:board_id/topics/preview', :to => 'messages#preview', :as => 'preview_board_message'
               post 'boards/:board_id/topics/:id/replies', :to => 'messages#reply'
               post 'boards/:board_id/topics/:id/edit', :to => 'messages#edit'
               post 'boards/:board_id/topics/:id/destroy', :to => 'messages#destroy'
               # Misc issue routes. TODO: move into resources
               match '/issues/auto_complete', :to => 'auto_completes#issues', :via => :get, :as => 'auto_complete_issues'
               match '/issues/context_menu', :to => 'context_menus#issues', :as => 'issues_context_menu', :via => [:get, :post]
               match '/issues/changes', :to => 'journals#index', :as => 'issue_changes', :via => :get
               match '/issues/:id/quoted', :to => 'journals#new', :id => /\d+/, :via => :post, :as => 'quoted_issue'
               match '/journals/diff/:id', :to => 'journals#diff', :id => /\d+/, :via => :get
               match '/journals/edit/:id', :to => 'journals#edit', :id => /\d+/, :via => [:get, :post]
               get '/projects/:project_id/issues/gantt', :to => 'gantts#show', :as => 'project_gantt'
               get '/issues/gantt', :to => 'gantts#show'
               get '/projects/:project_id/issues/calendar', :to => 'calendars#show', :as => 'project_calendar'
               get '/issues/calendar', :to => 'calendars#show'
               get 'projects/:id/issues/report', :to => 'reports#issue_report', :as => 'project_issues_report'
               get 'projects/:id/issues/report/:detail', :to => 'reports#issue_report_details', :as => 'project_issues_report_details'
               match 'my/account', :controller => 'my', :action => 'account', :via => [:get, :post]
               match 'my/account/destroy', :controller => 'my', :action => 'destroy', :via => [:get, :post]
               match 'my/page', :controller => 'my', :action => 'page', :via => :get
               match 'my', :controller => 'my', :action => 'index', :via => :get # Redirects to my/page
               match 'my/reset_rss_key', :controller => 'my', :action => 'reset_rss_key', :via => :post
               match 'my/reset_api_key', :controller => 'my', :action => 'reset_api_key', :via => :post
               match 'my/password', :controller => 'my', :action => 'password', :via => [:get, :post]
               match 'my/page_layout', :controller => 'my', :action => 'page_layout', :via => :get
               match 'my/add_block', :controller => 'my', :action => 'add_block', :via => :post
               match 'my/remove_block', :controller => 'my', :action => 'remove_block', :via => :post
               match 'my/order_blocks', :controller => 'my', :action => 'order_blocks', :via => :post
               resources :users
               match 'users/:id/memberships/:membership_id', :to => 'users#edit_membership', :via => :put, :as => 'user_membership'
               match 'users/:id/memberships/:membership_id', :to => 'users#destroy_membership', :via => :delete
               match 'users/:id/memberships', :to => 'users#edit_membership', :via => :post, :as => 'user_memberships'
               post 'watchers/watch', :to => 'watchers#watch', :as => 'watch'
               delete 'watchers/watch', :to => 'watchers#unwatch'
               get 'watchers/new', :to => 'watchers#new'
               post 'watchers', :to => 'watchers#create'
               post 'watchers/append', :to => 'watchers#append'
               delete 'watchers', :to => 'watchers#destroy'
               get 'watchers/autocomplete_for_user', :to => 'watchers#autocomplete_for_user'
               # Specific routes for issue watchers API
               post 'issues/:object_id/watchers', :to => 'watchers#create', :object_type => 'issue'
               delete 'issues/:object_id/watchers/:user_id' => 'watchers#destroy', :object_type => 'issue'
               resources :projects do
                 member do
                   get 'settings(/:tab)', :action => 'settings', :as => 'settings'
                   post 'modules'
                   post 'archive'
                   post 'unarchive'
                   post 'close'
                   post 'reopen'
                   match 'copy', :via => [:get, :post]
                 end
                 shallow do
                   resources :memberships, :controller => 'members', :only => [:index, :show, :new, :create, :update, :destroy] do
                     collection do
                       get 'autocomplete'
                     end
                   end
                 end
                 resource :enumerations, :controller => 'project_enumerations', :only => [:update, :destroy]
                 get 'issues/:copy_from/copy', :to => 'issues#new', :as => 'copy_issue'
-                resources :issues, :only => [:index, :new, :create] do
+                resources :issues, :only => [:index, :new, :create]
-                  resources :time_entries, :controller => 'timelog' do
-                    collection do
-                      get 'report'
-                    end
-                  end
-                end
                 # issue form update
                 match 'issues/update_form', :controller => 'issues', :action => 'update_form', :via => [:put, :post], :as => 'issue_form'
                 resources :files, :only => [:index, :new, :create]
                 resources :versions, :except => [:index, :show, :edit, :update, :destroy] do
                   collection do
                     put 'close_completed'
                   end
                 end
                 get 'versions.:format', :to => 'versions#index'
                 get 'roadmap', :to => 'versions#index', :format => false
                 get 'versions', :to => 'versions#index'
                 resources :news, :except => [:show, :edit, :update, :destroy]
                 resources :time_entries, :controller => 'timelog' do
                   get 'report', :on => :collection
                 end
                 resources :queries, :only => [:new, :create]
                 shallow do
                   resources :issue_categories
                 end
                 resources :documents, :except => [:show, :edit, :update, :destroy]
                 resources :boards
                 shallow do
                   resources :repositories, :except => [:index, :show] do
                     member do
                       match 'committers', :via => [:get, :post]
                     end
                   end
                 end
                 match 'wiki/index', :controller => 'wiki', :action => 'index', :via => :get
                 resources :wiki, :except => [:index, :new, :create], :as => 'wiki_page' do
                   member do
                     get 'rename'
                     post 'rename'
                     get 'history'
                     get 'diff'
                     match 'preview', :via => [:post, :put]
                     post 'protect'
                     post 'add_attachment'
                   end
                   collection do
                     get 'export'
                     get 'date_index'
                   end
                 end
                 match 'wiki', :controller => 'wiki', :action => 'show', :via => :get
                 get 'wiki/:id/:version', :to => 'wiki#show', :constraints => {:version => /\d+/}
                 delete 'wiki/:id/:version', :to => 'wiki#destroy_version'
                 get 'wiki/:id/:version/annotate', :to => 'wiki#annotate'
                 get 'wiki/:id/:version/diff', :to => 'wiki#diff'
               end
               resources :issues do
                 collection do
                   match 'bulk_edit', :via => [:get, :post]
                   post 'bulk_update'
                 end
                 resources :time_entries, :controller => 'timelog' do
                   collection do
                     get 'report'
                   end
                 end
                 shallow do
                   resources :relations, :controller => 'issue_relations', :only => [:index, :show, :create, :destroy]
                 end
               end
               match '/issues', :controller => 'issues', :action => 'destroy', :via => :delete
               resources :queries, :except => [:show]
               resources :news, :only => [:index, :show, :edit, :update, :destroy]
               match '/news/:id/comments', :to => 'comments#create', :via => :post
               match '/news/:id/comments/:comment_id', :to => 'comments#destroy', :via => :delete
               resources :versions, :only => [:show, :edit, :update, :destroy] do
                 post 'status_by', :on => :member
               end
               resources :documents, :only => [:show, :edit, :update, :destroy] do
                 post 'add_attachment', :on => :member
               end
               match '/time_entries/context_menu', :to => 'context_menus#time_entries', :as => :time_entries_context_menu, :via => [:get, :post]
               resources :time_entries, :controller => 'timelog', :except => :destroy do
                 collection do
                   get 'report'
                   get 'bulk_edit'
                   post 'bulk_update'
                 end
               end
               match '/time_entries/:id', :to => 'timelog#destroy', :via => :delete, :id => /\d+/
               # TODO: delete /time_entries for bulk deletion
               match '/time_entries/destroy', :to => 'timelog#destroy', :via => :delete
               get 'projects/:id/activity', :to => 'activities#index'
               get 'projects/:id/activity.:format', :to => 'activities#index'
               get 'activity', :to => 'activities#index'
               # repositories routes
               get 'projects/:id/repository/:repository_id/statistics', :to => 'repositories#stats'
               get 'projects/:id/repository/:repository_id/graph', :to => 'repositories#graph'
               get 'projects/:id/repository/:repository_id/changes(/*path(.:ext))',
                   :to => 'repositories#changes'
               get 'projects/:id/repository/:repository_id/revisions/:rev', :to => 'repositories#revision'
               get 'projects/:id/repository/:repository_id/revision', :to => 'repositories#revision'
               post   'projects/:id/repository/:repository_id/revisions/:rev/issues', :to => 'repositories#add_related_issue'
               delete 'projects/:id/repository/:repository_id/revisions/:rev/issues/:issue_id', :to => 'repositories#remove_related_issue'
               get 'projects/:id/repository/:repository_id/revisions', :to => 'repositories#revisions'
               get 'projects/:id/repository/:repository_id/revisions/:rev/:action(/*path(.:ext))',
                   :controller => 'repositories',
                   :format => false,
                   :constraints => {
                         :action => /(browse|show|entry|raw|annotate|diff)/,
                         :rev    => /[a-z0-9\.\-_]+/
                       }
               get 'projects/:id/repository/statistics', :to => 'repositories#stats'
               get 'projects/:id/repository/graph', :to => 'repositories#graph'
               get 'projects/:id/repository/changes(/*path(.:ext))',
                   :to => 'repositories#changes'
               get 'projects/:id/repository/revisions', :to => 'repositories#revisions'
               get 'projects/:id/repository/revisions/:rev', :to => 'repositories#revision'
               get 'projects/:id/repository/revision', :to => 'repositories#revision'
               post   'projects/:id/repository/revisions/:rev/issues', :to => 'repositories#add_related_issue'
               delete 'projects/:id/repository/revisions/:rev/issues/:issue_id', :to => 'repositories#remove_related_issue'
               get 'projects/:id/repository/revisions/:rev/:action(/*path(.:ext))',
                   :controller => 'repositories',
                   :format => false,
                   :constraints => {
                         :action => /(browse|show|entry|raw|annotate|diff)/,
                         :rev    => /[a-z0-9\.\-_]+/
                       }
               get 'projects/:id/repository/:repository_id/:action(/*path(.:ext))',
                   :controller => 'repositories',
                   :action => /(browse|show|entry|raw|changes|annotate|diff)/
               get 'projects/:id/repository/:action(/*path(.:ext))',
                   :controller => 'repositories',
                   :action => /(browse|show|entry|raw|changes|annotate|diff)/
               get 'projects/:id/repository/:repository_id', :to => 'repositories#show', :path => nil
               get 'projects/:id/repository', :to => 'repositories#show', :path => nil
               # additional routes for having the file name at the end of url
               get 'attachments/:id/:filename', :to => 'attachments#show', :id => /\d+/, :filename => /.*/, :as => 'named_attachment'
               get 'attachments/download/:id/:filename', :to => 'attachments#download', :id => /\d+/, :filename => /.*/, :as => 'download_named_attachment'
               get 'attachments/download/:id', :to => 'attachments#download', :id => /\d+/
               get 'attachments/thumbnail/:id(/:size)', :to => 'attachments#thumbnail', :id => /\d+/, :size => /\d+/, :as => 'thumbnail'
               resources :attachments, :only => [:show, :destroy]
               resources :groups do
                 member do
                   get 'autocomplete_for_user'
                 end
               end
               match 'groups/:id/users', :controller => 'groups', :action => 'add_users', :id => /\d+/, :via => :post, :as => 'group_users'
               match 'groups/:id/users/:user_id', :controller => 'groups', :action => 'remove_user', :id => /\d+/, :via => :delete, :as => 'group_user'
               match 'groups/destroy_membership/:id', :controller => 'groups', :action => 'destroy_membership', :id => /\d+/, :via => :post
               match 'groups/edit_membership/:id', :controller => 'groups', :action => 'edit_membership', :id => /\d+/, :via => :post
               resources :trackers, :except => :show do
                 collection do
                   match 'fields', :via => [:get, :post]
                 end
               end
               resources :issue_statuses, :except => :show do
                 collection do
                   post 'update_issue_done_ratio'
                 end
               end
               resources :custom_fields, :except => :show
               resources :roles do
                 collection do
                   match 'permissions', :via => [:get, :post]
                 end
               end
               resources :enumerations, :except => :show
               match 'enumerations/:type', :to => 'enumerations#index', :via => :get
               get 'projects/:id/search', :controller => 'search', :action => 'index'
               get 'search', :controller => 'search', :action => 'index'
               match 'mail_handler', :controller => 'mail_handler', :action => 'index', :via => :post
               match 'admin', :controller => 'admin', :action => 'index', :via => :get
               match 'admin/projects', :controller => 'admin', :action => 'projects', :via => :get
               match 'admin/plugins', :controller => 'admin', :action => 'plugins', :via => :get
               match 'admin/info', :controller => 'admin', :action => 'info', :via => :get
               match 'admin/test_email', :controller => 'admin', :action => 'test_email', :via => :get
               match 'admin/default_configuration', :controller => 'admin', :action => 'default_configuration', :via => :post
               resources :auth_sources do
                 member do
                   get 'test_connection', :as => 'try_connection'
                 end
                 collection do
                   get 'autocomplete_for_new_user'
                 end
               end
               match 'workflows', :controller => 'workflows', :action => 'index', :via => :get
               match 'workflows/edit', :controller => 'workflows', :action => 'edit', :via => [:get, :post]
               match 'workflows/permissions', :controller => 'workflows', :action => 'permissions', :via => [:get, :post]
               match 'workflows/copy', :controller => 'workflows', :action => 'copy', :via => [:get, :post]
               match 'settings', :controller => 'settings', :action => 'index', :via => :get
               match 'settings/edit', :controller => 'settings', :action => 'edit', :via => [:get, :post]
               match 'settings/plugin/:id', :controller => 'settings', :action => 'plugin', :via => [:get, :post], :as => 'plugin_settings'
               match 'sys/projects', :to => 'sys#projects', :via => :get
               match 'sys/projects/:id/repository', :to => 'sys#create_project_repository', :via => :post
               match 'sys/fetch_changesets', :to => 'sys#fetch_changesets', :via => [:get, :post]
               match 'uploads', :to => 'attachments#upload', :via => :post
               get 'robots.txt', :to => 'welcome#robots'
               Dir.glob File.expand_path("plugins/*", Rails.root) do |plugin_dir|
                 file = File.join(plugin_dir, "config/routes.rb")
                 if File.exists?(file)
                   begin
                     instance_eval File.read(file)
                   rescue Exception => e
                     puts "An error occurred while loading the routes definition of #{File.basename(plugin_dir)} plugin (#{file}): #{e.message}."
                     exit 1
                   end
                 end
               end
             end

test/functional/time_entry_reports_controller_test.rb +2 -2

             # -*- coding: utf-8 -*-
             # Redmine - project management software
             # Copyright (C) 2006-2014  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.expand_path('../../test_helper', __FILE__)
             class TimeEntryReportsControllerTest < ActionController::TestCase
               tests TimelogController
               fixtures :projects, :enabled_modules, :roles, :members, :member_roles,
                        :issues, :time_entries, :users, :trackers, :enumerations,
                        :issue_statuses, :custom_fields, :custom_values,
                        :projects_trackers, :custom_fields_trackers,
                        :custom_fields_projects
               include Redmine::I18n
               def setup
                 Setting.default_language = "en"
               end
               def test_report_at_project_level
                 get :report, :project_id => 'ecookbook'
                 assert_response :success
                 assert_template 'report'
                 assert_tag :form,
                   :attributes => {:action => "/projects/ecookbook/time_entries/report", :id => 'query_form'}
               end
               def test_report_all_projects
                 get :report
                 assert_response :success
                 assert_template 'report'
                 assert_tag :form,
                   :attributes => {:action => "/time_entries/report", :id => 'query_form'}
               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%2Ftime_entries%2Freport'
               end
               def test_report_all_projects_one_criteria
                 get :report, :columns => 'week', :from => "2007-04-01", :to => "2007-04-30", :criteria => ['project']
                 assert_response :success
                 assert_template 'report'
                 assert_not_nil assigns(:report)
                 assert_equal "8.65", "%.2f" % assigns(:report).total_hours
               end
               def test_report_all_time
                 get :report, :project_id => 1, :criteria => ['project', 'issue']
                 assert_response :success
                 assert_template 'report'
                 assert_not_nil assigns(:report)
                 assert_equal "162.90", "%.2f" % assigns(:report).total_hours
               end
               def test_report_all_time_by_day
                 get :report, :project_id => 1, :criteria => ['project', 'issue'], :columns => 'day'
                 assert_response :success
                 assert_template 'report'
                 assert_not_nil assigns(:report)
                 assert_equal "162.90", "%.2f" % assigns(:report).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", :criteria => ['project']
                 assert_response :success
                 assert_template 'report'
                 assert_not_nil assigns(:report)
                 assert_equal "8.65", "%.2f" % assigns(:report).total_hours
               end
               def test_report_two_criteria
                 get :report, :project_id => 1, :columns => 'month', :from => "2007-01-01", :to => "2007-12-31", :criteria => ["user", "activity"]
                 assert_response :success
                 assert_template 'report'
                 assert_not_nil assigns(:report)
                 assert_equal "162.90", "%.2f" % assigns(:report).total_hours
               end
               def test_report_custom_field_criteria_with_multiple_values_on_single_value_custom_field_should_not_fail
                 field = TimeEntryCustomField.create!(:name => 'multi', :field_format => 'list', :possible_values => ['value1', 'value2'])
                 entry = TimeEntry.create!(:project => Project.find(1), :hours => 1, :activity_id => 10, :user => User.find(2), :spent_on => Date.today)
                 CustomValue.create!(:customized => entry, :custom_field => field, :value => 'value1')
                 CustomValue.create!(:customized => entry, :custom_field => field, :value => 'value2')
                 get :report, :project_id => 1, :columns => 'day', :criteria => ["cf_#{field.id}"]
                 assert_response :success
               end
               def test_report_multiple_values_custom_fields_should_not_be_proposed
                 TimeEntryCustomField.create!(:name => 'Single', :field_format => 'list', :possible_values => ['value1', 'value2'])
                 TimeEntryCustomField.create!(:name => 'Multi', :field_format => 'list', :multiple => true, :possible_values => ['value1', 'value2'])
                 get :report, :project_id => 1
                 assert_response :success
                 assert_select 'select[name=?]', 'criteria[]' do
                   assert_select 'option', :text => 'Single'
                   assert_select 'option', :text => 'Multi', :count => 0
                 end
               end
               def test_report_one_day
                 get :report, :project_id => 1, :columns => 'day', :from => "2007-03-23", :to => "2007-03-23", :criteria => ["user", "activity"]
                 assert_response :success
                 assert_template 'report'
                 assert_not_nil assigns(:report)
                 assert_equal "4.25", "%.2f" % assigns(:report).total_hours
               end
               def test_report_at_issue_level
-                get :report, :project_id => 1, :issue_id => 1, :columns => 'month', :from => "2007-01-01", :to => "2007-12-31", :criteria => ["user", "activity"]
+                get :report, :issue_id => 1, :columns => 'month', :from => "2007-01-01", :to => "2007-12-31", :criteria => ["user", "activity"]
                 assert_response :success
                 assert_template 'report'
                 assert_not_nil assigns(:report)
                 assert_equal "154.25", "%.2f" % assigns(:report).total_hours
                 assert_tag :form,
-                  :attributes => {:action => "/projects/ecookbook/issues/1/time_entries/report", :id => 'query_form'}
+                  :attributes => {:action => "/issues/1/time_entries/report", :id => 'query_form'}
               end
               def test_report_by_week_should_use_commercial_year
                 TimeEntry.delete_all
                 TimeEntry.generate!(:hours => '2', :spent_on => '2009-12-25') # 2009-52
                 TimeEntry.generate!(:hours => '4', :spent_on => '2009-12-31') # 2009-53
                 TimeEntry.generate!(:hours => '8', :spent_on => '2010-01-01') # 2009-53
                 TimeEntry.generate!(:hours => '16', :spent_on => '2010-01-05') # 2010-1
                 get :report, :columns => 'week', :from => "2009-12-25", :to => "2010-01-05", :criteria => ["project"]
                 assert_response :success
                 assert_select '#time-report thead tr' do
                   assert_select 'th:nth-child(1)', :text => 'Project'
                   assert_select 'th:nth-child(2)', :text => '2009-52'
                   assert_select 'th:nth-child(3)', :text => '2009-53'
                   assert_select 'th:nth-child(4)', :text => '2010-1'
                   assert_select 'th:nth-child(5)', :text => 'Total time'
                 end
                 assert_select '#time-report tbody tr' do
                   assert_select 'td:nth-child(1)', :text => 'eCookbook'
                   assert_select 'td:nth-child(2)', :text => '2.00'
                   assert_select 'td:nth-child(3)', :text => '12.00'
                   assert_select 'td:nth-child(4)', :text => '16.00'
                   assert_select 'td:nth-child(5)', :text => '30.00' # Total
                 end
               end
               def test_report_should_propose_association_custom_fields
                 get :report
                 assert_response :success
                 assert_template 'report'
                 assert_select 'select[name=?]', 'criteria[]' do
                   assert_select 'option[value=cf_1]', {:text => 'Database'}, 'Issue custom field not found'
                   assert_select 'option[value=cf_3]', {:text => 'Development status'}, 'Project custom field not found'
                   assert_select 'option[value=cf_7]', {:text => 'Billable'}, 'TimeEntryActivity custom field not found'
                 end
               end
               def test_report_with_association_custom_fields
                 get :report, :criteria => ['cf_1', 'cf_3', 'cf_7']
                 assert_response :success
                 assert_template 'report'
                 assert_not_nil assigns(:report)
                 assert_equal 3, assigns(:report).criteria.size
                 assert_equal "162.90", "%.2f" % assigns(:report).total_hours
                 # Custom fields columns
                 assert_select 'th', :text => 'Database'
                 assert_select 'th', :text => 'Development status'
                 assert_select 'th', :text => 'Billable'
                 # Custom field row
                 assert_select 'tr' do
                   assert_select 'td', :text => 'MySQL'
                   assert_select 'td.hours', :text => '1.00'
                 end
               end
               def test_report_one_criteria_no_result
                 get :report, :project_id => 1, :columns => 'week', :from => "1998-04-01", :to => "1998-04-30", :criteria => ['project']
                 assert_response :success
                 assert_template 'report'
                 assert_not_nil assigns(:report)
                 assert_equal "0.00", "%.2f" % assigns(:report).total_hours
               end
               def test_report_status_criterion
                 get :report, :project_id => 1, :criteria => ['status']
                 assert_response :success
                 assert_template 'report'
                 assert_tag :tag => 'th', :content => 'Status'
                 assert_tag :tag => 'td', :content => 'New'
               end
               def test_report_all_projects_csv_export
                 get :report, :columns => 'month', :from => "2007-01-01", :to => "2007-06-30",
                     :criteria => ["project", "user", "activity"], :format => "csv"
                 assert_response :success
                 assert_equal 'text/csv; header=present', @response.content_type
                 lines = @response.body.chomp.split("\n")
                 # Headers
                 assert_equal 'Project,User,Activity,2007-3,2007-4,Total time', lines.first
                 # Total row
                 assert_equal 'Total time,"","",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",
                     :criteria => ["project", "user", "activity"], :format => "csv"
                 assert_response :success
                 assert_equal 'text/csv; header=present', @response.content_type
                 lines = @response.body.chomp.split("\n")
                 # Headers
                 assert_equal 'Project,User,Activity,2007-3,2007-4,Total time', lines.first
                 # Total row
                 assert_equal 'Total time,"","",154.25,8.65,162.90', lines.last
               end
               def test_csv_big_5
                 Setting.default_language = "zh-TW"
                 str_utf8  = "\xe4\xb8\x80\xe6\x9c\x88"
                 str_big5  = "\xa4@\xa4\xeb"
                 if str_utf8.respond_to?(:force_encoding)
                   str_utf8.force_encoding('UTF-8')
                   str_big5.force_encoding('Big5')
                 end
                 user = User.find_by_id(3)
                 user.firstname = str_utf8
                 user.lastname  = "test-lastname"
                 assert user.save
                 comments = "test_csv_big_5"
                 te1 = TimeEntry.create(:spent_on => '2011-11-11',
                                        :hours    => 7.3,
                                        :project  => Project.find(1),
                                        :user     => user,
                                        :activity => TimeEntryActivity.find_by_name('Design'),
                                        :comments => comments)
                 te2 = TimeEntry.find_by_comments(comments)
                 assert_not_nil te2
                 assert_equal 7.3, te2.hours
                 assert_equal 3, te2.user_id
                 get :report, :project_id => 1, :columns => 'day',
                     :from => "2011-11-11", :to => "2011-11-11",
                     :criteria => ["user"], :format => "csv"
                 assert_response :success
                 assert_equal 'text/csv; header=present', @response.content_type
                 lines = @response.body.chomp.split("\n")
                 # Headers
                 s1 = "\xa5\xce\xa4\xe1,2011-11-11,\xa4u\xae\xc9\xc1`\xadp"
                 s2 = "\xa4u\xae\xc9\xc1`\xadp"
                 if s1.respond_to?(:force_encoding)
                   s1.force_encoding('Big5')
                   s2.force_encoding('Big5')
                 end
                 assert_equal s1, lines.first
                 # Total row
                 assert_equal "#{str_big5} #{user.lastname},7.30,7.30", lines[1]
                 assert_equal "#{s2},7.30,7.30", lines[2]
                 str_tw = "Traditional Chinese (\xe7\xb9\x81\xe9\xab\x94\xe4\xb8\xad\xe6\x96\x87)"
                 if str_tw.respond_to?(:force_encoding)
                   str_tw.force_encoding('UTF-8')
                 end
                 assert_equal str_tw, l(:general_lang_name)
                 assert_equal 'Big5', l(:general_csv_encoding)
                 assert_equal ',', l(:general_csv_separator)
                 assert_equal '.', l(:general_csv_decimal_separator)
               end
               def test_csv_cannot_convert_should_be_replaced_big_5
                 Setting.default_language = "zh-TW"
                 str_utf8  = "\xe4\xbb\xa5\xe5\x86\x85"
                 if str_utf8.respond_to?(:force_encoding)
                   str_utf8.force_encoding('UTF-8')
                 end
                 user = User.find_by_id(3)
                 user.firstname = str_utf8
                 user.lastname  = "test-lastname"
                 assert user.save
                 comments = "test_replaced"
                 te1 = TimeEntry.create(:spent_on => '2011-11-11',
                                        :hours    => 7.3,
                                        :project  => Project.find(1),
                                        :user     => user,
                                        :activity => TimeEntryActivity.find_by_name('Design'),
                                        :comments => comments)
                 te2 = TimeEntry.find_by_comments(comments)
                 assert_not_nil te2
                 assert_equal 7.3, te2.hours
                 assert_equal 3, te2.user_id
                 get :report, :project_id => 1, :columns => 'day',
                     :from => "2011-11-11", :to => "2011-11-11",
                     :criteria => ["user"], :format => "csv"
                 assert_response :success
                 assert_equal 'text/csv; header=present', @response.content_type
                 lines = @response.body.chomp.split("\n")
                 # Headers
                 s1 = "\xa5\xce\xa4\xe1,2011-11-11,\xa4u\xae\xc9\xc1`\xadp"
                 if s1.respond_to?(:force_encoding)
                   s1.force_encoding('Big5')
                 end
                 assert_equal s1, lines.first
                 # Total row
                 s2 = ""
                 if s2.respond_to?(:force_encoding)
                   s2 = "\xa5H?"
                   s2.force_encoding('Big5')
                 elsif RUBY_PLATFORM == 'java'
                   s2 = "??"
                 else
                   s2 = "\xa5H???"
                 end
                 assert_equal "#{s2} #{user.lastname},7.30,7.30", lines[1]
               end
               def test_csv_fr
                 with_settings :default_language => "fr" do
                   str1  = "test_csv_fr"
                   user = User.find_by_id(3)
                   te1 = TimeEntry.create(:spent_on => '2011-11-11',
                                          :hours    => 7.3,
                                          :project  => Project.find(1),
                                          :user     => user,
                                          :activity => TimeEntryActivity.find_by_name('Design'),
                                          :comments => str1)
                   te2 = TimeEntry.find_by_comments(str1)
                   assert_not_nil te2
                   assert_equal 7.3, te2.hours
                   assert_equal 3, te2.user_id
                   get :report, :project_id => 1, :columns => 'day',
                       :from => "2011-11-11", :to => "2011-11-11",
                       :criteria => ["user"], :format => "csv"
                   assert_response :success
                   assert_equal 'text/csv; header=present', @response.content_type
                   lines = @response.body.chomp.split("\n")
                   # Headers
                   s1 = "Utilisateur;2011-11-11;Temps total"
                   s2 = "Temps total"
                   if s1.respond_to?(:force_encoding)
                     s1.force_encoding('ISO-8859-1')
                     s2.force_encoding('ISO-8859-1')
                   end
                   assert_equal s1, lines.first
                   # Total row
                   assert_equal "#{user.firstname} #{user.lastname};7,30;7,30", lines[1]
                   assert_equal "#{s2};7,30;7,30", lines[2]
                   str_fr = "Fran\xc3\xa7ais"
                   if str_fr.respond_to?(:force_encoding)
                     str_fr.force_encoding('UTF-8')
                   end
                   assert_equal str_fr, l(:general_lang_name)
                   assert_equal 'ISO-8859-1', l(:general_csv_encoding)
                   assert_equal ';', l(:general_csv_separator)
                   assert_equal ',', l(:general_csv_decimal_separator)
                 end
               end
             end

test/functional/timelog_controller_test.rb +3 -3

             # -*- coding: utf-8 -*-
             # Redmine - project management software
             # Copyright (C) 2006-2014  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.expand_path('../../test_helper', __FILE__)
             class TimelogControllerTest < ActionController::TestCase
               fixtures :projects, :enabled_modules, :roles, :members,
                        :member_roles, :issues, :time_entries, :users,
                        :trackers, :enumerations, :issue_statuses,
                        :custom_fields, :custom_values,
                        :projects_trackers, :custom_fields_trackers,
                        :custom_fields_projects
               include Redmine::I18n
               def test_new
                 @request.session[:user_id] = 3
                 get :new
                 assert_response :success
                 assert_template 'new'
                 assert_select 'input[name=?][type=hidden]', 'project_id', 0
                 assert_select 'input[name=?][type=hidden]', 'issue_id', 0
                 assert_select 'select[name=?]', 'time_entry[project_id]' do
                   # blank option for project
                   assert_select 'option[value=]'
                 end
               end
               def test_new_with_project_id
                 @request.session[:user_id] = 3
                 get :new, :project_id => 1
                 assert_response :success
                 assert_template 'new'
                 assert_select 'input[name=?][type=hidden]', 'project_id'
                 assert_select 'input[name=?][type=hidden]', 'issue_id', 0
                 assert_select 'select[name=?]', 'time_entry[project_id]', 0
               end
               def test_new_with_issue_id
                 @request.session[:user_id] = 3
                 get :new, :issue_id => 2
                 assert_response :success
                 assert_template 'new'
                 assert_select 'input[name=?][type=hidden]', 'project_id', 0
                 assert_select 'input[name=?][type=hidden]', 'issue_id'
                 assert_select 'select[name=?]', 'time_entry[project_id]', 0
               end
               def test_new_without_project_should_prefill_the_form
                 @request.session[:user_id] = 3
                 get :new, :time_entry => {:project_id => '1'}
                 assert_response :success
                 assert_template 'new'
                 assert_select 'select[name=?]', 'time_entry[project_id]' do
                   assert_select 'option[value=1][selected=selected]'
                 end
               end
               def test_new_without_project_should_deny_without_permission
                 Role.all.each {|role| role.remove_permission! :log_time}
                 @request.session[:user_id] = 3
                 get :new
                 assert_response 403
               end
               def test_new_should_select_default_activity
                 @request.session[:user_id] = 3
                 get :new, :project_id => 1
                 assert_response :success
                 assert_select 'select[name=?]', 'time_entry[activity_id]' do
                   assert_select 'option[selected=selected]', :text => 'Development'
                 end
               end
               def test_new_should_only_show_active_time_entry_activities
                 @request.session[:user_id] = 3
                 get :new, :project_id => 1
                 assert_response :success
                 assert_no_tag 'option', :content => 'Inactive Activity'
               end
               def test_get_edit_existing_time
                 @request.session[:user_id] = 2
                 get :edit, :id => 2, :project_id => nil
                 assert_response :success
                 assert_template 'edit'
                 # Default activity selected
                 assert_tag :tag => 'form', :attributes => { :action => '/projects/ecookbook/time_entries/2' }
               end
               def test_get_edit_with_an_existing_time_entry_with_inactive_activity
                 te = TimeEntry.find(1)
                 te.activity = TimeEntryActivity.find_by_name("Inactive Activity")
                 te.save!
                 @request.session[:user_id] = 1
                 get :edit, :project_id => 1, :id => 1
                 assert_response :success
                 assert_template 'edit'
                 # Blank option since nothing is pre-selected
                 assert_tag :tag => 'option', :content => '--- Please select ---'
               end
               def test_post_create
                 @request.session[:user_id] = 3
                 assert_difference 'TimeEntry.count' do
                   post :create, :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/time_entries'
                 end
                 t = TimeEntry.order('id DESC').first
                 assert_not_nil t
                 assert_equal 'Some work on TimelogControllerTest', t.comments
                 assert_equal 1, t.project_id
                 assert_equal 1, t.issue_id
                 assert_equal 11, t.activity_id
                 assert_equal 7.3, t.hours
                 assert_equal 3, t.user_id
               end
               def test_post_create_with_blank_issue
                 @request.session[:user_id] = 3
                 assert_difference 'TimeEntry.count' do
                   post :create, :project_id => 1,
                             :time_entry => {:comments => 'Some work on TimelogControllerTest',
                                             # Not the default activity
                                             :activity_id => '11',
                                             :issue_id => '',
                                             :spent_on => '2008-03-14',
                                             :hours => '7.3'}
                   assert_redirected_to '/projects/ecookbook/time_entries'
                 end
                 t = TimeEntry.order('id DESC').first
                 assert_not_nil t
                 assert_equal 'Some work on TimelogControllerTest', t.comments
                 assert_equal 1, t.project_id
                 assert_nil t.issue_id
                 assert_equal 11, t.activity_id
                 assert_equal 7.3, t.hours
                 assert_equal 3, t.user_id
               end
               def test_create_and_continue_at_project_level
                 @request.session[:user_id] = 2
                 assert_difference 'TimeEntry.count' do
                   post :create, :time_entry => {:project_id => '1',
                                                 :activity_id => '11',
                                                 :issue_id => '',
                                                 :spent_on => '2008-03-14',
                                                 :hours => '7.3'},
                                 :continue => '1'
                   assert_redirected_to '/time_entries/new?time_entry%5Bactivity_id%5D=11&time_entry%5Bissue_id%5D=&time_entry%5Bproject_id%5D=1'
                 end
               end
               def test_create_and_continue_at_issue_level
                 @request.session[:user_id] = 2
                 assert_difference 'TimeEntry.count' do
                   post :create, :time_entry => {:project_id => '',
                                                 :activity_id => '11',
                                                 :issue_id => '1',
                                                 :spent_on => '2008-03-14',
                                                 :hours => '7.3'},
                                 :continue => '1'
                   assert_redirected_to '/time_entries/new?time_entry%5Bactivity_id%5D=11&time_entry%5Bissue_id%5D=1&time_entry%5Bproject_id%5D='
                 end
               end
               def test_create_and_continue_with_project_id
                 @request.session[:user_id] = 2
                 assert_difference 'TimeEntry.count' do
                   post :create, :project_id => 1,
                                 :time_entry => {:activity_id => '11',
                                                 :issue_id => '',
                                                 :spent_on => '2008-03-14',
                                                 :hours => '7.3'},
                                 :continue => '1'
                   assert_redirected_to '/projects/ecookbook/time_entries/new?time_entry%5Bactivity_id%5D=11&time_entry%5Bissue_id%5D=&time_entry%5Bproject_id%5D='
                 end
               end
               def test_create_and_continue_with_issue_id
                 @request.session[:user_id] = 2
                 assert_difference 'TimeEntry.count' do
                   post :create, :issue_id => 1,
                                 :time_entry => {:activity_id => '11',
                                                 :issue_id => '1',
                                                 :spent_on => '2008-03-14',
                                                 :hours => '7.3'},
                                 :continue => '1'
                   assert_redirected_to '/issues/1/time_entries/new?time_entry%5Bactivity_id%5D=11&time_entry%5Bissue_id%5D=1&time_entry%5Bproject_id%5D='
                 end
               end
               def test_create_without_log_time_permission_should_be_denied
                 @request.session[:user_id] = 2
                 Role.find_by_name('Manager').remove_permission! :log_time
                 post :create, :project_id => 1,
                             :time_entry => {:activity_id => '11',
                                             :issue_id => '',
                                             :spent_on => '2008-03-14',
                                             :hours => '7.3'}
                 assert_response 403
               end
               def test_create_without_project_and_issue_should_fail
                 @request.session[:user_id] = 2
                 post :create, :time_entry => {:issue_id => ''}
                 assert_response :success
                 assert_template 'new'
               end
               def test_create_with_failure
                 @request.session[:user_id] = 2
                 post :create, :project_id => 1,
                             :time_entry => {:activity_id => '',
                                             :issue_id => '',
                                             :spent_on => '2008-03-14',
                                             :hours => '7.3'}
                 assert_response :success
                 assert_template 'new'
               end
               def test_create_without_project
                 @request.session[:user_id] = 2
                 assert_difference 'TimeEntry.count' do
                   post :create, :time_entry => {:project_id => '1',
                                               :activity_id => '11',
                                               :issue_id => '',
                                               :spent_on => '2008-03-14',
                                               :hours => '7.3'}
                 end
                 assert_redirected_to '/projects/ecookbook/time_entries'
                 time_entry = TimeEntry.order('id DESC').first
                 assert_equal 1, time_entry.project_id
               end
               def test_create_without_project_should_fail_with_issue_not_inside_project
                 @request.session[:user_id] = 2
                 assert_no_difference 'TimeEntry.count' do
                   post :create, :time_entry => {:project_id => '1',
                                               :activity_id => '11',
                                               :issue_id => '5',
                                               :spent_on => '2008-03-14',
                                               :hours => '7.3'}
                 end
                 assert_response :success
                 assert assigns(:time_entry).errors[:issue_id].present?
               end
               def test_create_without_project_should_deny_without_permission
                 @request.session[:user_id] = 2
                 Project.find(3).disable_module!(:time_tracking)
                 assert_no_difference 'TimeEntry.count' do
                   post :create, :time_entry => {:project_id => '3',
                                               :activity_id => '11',
                                               :issue_id => '',
                                               :spent_on => '2008-03-14',
                                               :hours => '7.3'}
                 end
                 assert_response 403
               end
               def test_create_without_project_with_failure
                 @request.session[:user_id] = 2
                 assert_no_difference 'TimeEntry.count' do
                   post :create, :time_entry => {:project_id => '1',
                                               :activity_id => '11',
                                               :issue_id => '',
                                               :spent_on => '2008-03-14',
                                               :hours => ''}
                 end
                 assert_response :success
                 assert_tag 'select', :attributes => {:name => 'time_entry[project_id]'},
                   :child => {:tag => 'option', :attributes => {:value => '1', :selected => 'selected'}}
               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
                 put :update, :id => 1,
                             :time_entry => {:issue_id => '2',
                                             :hours => '8'}
                 assert_redirected_to :action => 'index', :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_update_should_allow_to_change_issue_to_another_project
                 entry = TimeEntry.generate!(:issue_id => 1)
                 @request.session[:user_id] = 1
                 put :update, :id => entry.id, :time_entry => {:issue_id => '5'}
                 assert_response 302
                 entry.reload
                 assert_equal 5, entry.issue_id
                 assert_equal 3, entry.project_id
               end
               def test_update_should_not_allow_to_change_issue_to_an_invalid_project
                 entry = TimeEntry.generate!(:issue_id => 1)
                 Project.find(3).disable_module!(:time_tracking)
                 @request.session[:user_id] = 1
                 put :update, :id => entry.id, :time_entry => {:issue_id => '5'}
                 assert_response 200
                 assert_include "Issue is invalid", assigns(:time_entry).errors.full_messages
               end
               def test_get_bulk_edit
                 @request.session[:user_id] = 2
                 get :bulk_edit, :ids => [1, 2]
                 assert_response :success
                 assert_template 'bulk_edit'
                 assert_select 'ul#bulk-selection' do
                   assert_select 'li', 2
                   assert_select 'li a', :text => '03/23/2007 - eCookbook: 4.25 hours'
                 end
                 assert_select 'form#bulk_edit_form[action=?]', '/time_entries/bulk_update' do
                   # System wide custom field
                   assert_select 'select[name=?]', 'time_entry[custom_field_values][10]'
                   # Activities
                   assert_select 'select[name=?]', 'time_entry[activity_id]' do
                     assert_select 'option[value=]', :text => '(No change)'
                     assert_select 'option[value=9]', :text => 'Design'
                   end
                 end
               end
               def test_get_bulk_edit_on_different_projects
                 @request.session[:user_id] = 2
                 get :bulk_edit, :ids => [1, 2, 6]
                 assert_response :success
                 assert_template 'bulk_edit'
               end
               def test_bulk_update
                 @request.session[:user_id] = 2
                 # update time entry activity
                 post :bulk_update, :ids => [1, 2], :time_entry => { :activity_id => 9}
                 assert_response 302
                 # check that the issues were updated
                 assert_equal [9, 9], TimeEntry.where(:id => [1, 2]).collect {|i| i.activity_id}
               end
               def test_bulk_update_with_failure
                 @request.session[:user_id] = 2
                 post :bulk_update, :ids => [1, 2], :time_entry => { :hours => 'A'}
                 assert_response 302
                 assert_match /Failed to save 2 time entrie/, flash[:error]
               end
               def test_bulk_update_on_different_projects
                 @request.session[:user_id] = 2
                 # makes user a manager on the other project
                 Member.create!(:user_id => 2, :project_id => 3, :role_ids => [1])
                 # update time entry activity
                 post :bulk_update, :ids => [1, 2, 4], :time_entry => { :activity_id => 9 }
                 assert_response 302
                 # check that the issues were updated
                 assert_equal [9, 9, 9], TimeEntry.where(:id => [1, 2, 4]).collect {|i| i.activity_id}
               end
               def test_bulk_update_on_different_projects_without_rights
                 @request.session[:user_id] = 3
                 user = User.find(3)
                 action = { :controller => "timelog", :action => "bulk_update" }
                 assert user.allowed_to?(action, TimeEntry.find(1).project)
                 assert ! user.allowed_to?(action, TimeEntry.find(5).project)
                 post :bulk_update, :ids => [1, 5], :time_entry => { :activity_id => 9 }
                 assert_response 403
               end
               def test_bulk_update_custom_field
                 @request.session[:user_id] = 2
                 post :bulk_update, :ids => [1, 2], :time_entry => { :custom_field_values => {'10' => '0'} }
                 assert_response 302
                 assert_equal ["0", "0"], TimeEntry.where(:id => [1, 2]).collect {|i| i.custom_value_for(10).value}
               end
               def test_post_bulk_update_should_redirect_back_using_the_back_url_parameter
                 @request.session[:user_id] = 2
                 post :bulk_update, :ids => [1,2], :back_url => '/time_entries'
                 assert_response :redirect
                 assert_redirected_to '/time_entries'
               end
               def test_post_bulk_update_should_not_redirect_back_using_the_back_url_parameter_off_the_host
                 @request.session[:user_id] = 2
                 post :bulk_update, :ids => [1,2], :back_url => 'http://google.com'
                 assert_response :redirect
                 assert_redirected_to :controller => 'timelog', :action => 'index', :project_id => Project.find(1).identifier
               end
               def test_post_bulk_update_without_edit_permission_should_be_denied
                 @request.session[:user_id] = 2
                 Role.find_by_name('Manager').remove_permission! :edit_time_entries
                 post :bulk_update, :ids => [1,2]
                 assert_response 403
               end
               def test_destroy
                 @request.session[:user_id] = 2
                 delete :destroy, :id => 1
                 assert_redirected_to :action => 'index', :project_id => 'ecookbook'
                 assert_equal I18n.t(:notice_successful_delete), flash[:notice]
                 assert_nil TimeEntry.find_by_id(1)
               end
               def test_destroy_should_fail
                 # simulate that this fails (e.g. due to a plugin), see #5700
                 TimeEntry.any_instance.expects(:destroy).returns(false)
                 @request.session[:user_id] = 2
                 delete :destroy, :id => 1
                 assert_redirected_to :action => 'index', :project_id => 'ecookbook'
                 assert_equal I18n.t(:notice_unable_delete_time_entry), flash[:error]
                 assert_not_nil TimeEntry.find_by_id(1)
               end
               def test_index_all_projects
                 get :index
                 assert_response :success
                 assert_template 'index'
                 assert_not_nil assigns(:total_hours)
                 assert_equal "162.90", "%.2f" % assigns(:total_hours)
                 assert_tag :form,
                   :attributes => {:action => "/time_entries", :id => 'query_form'}
               end
               def test_index_all_projects_should_show_log_time_link
                 @request.session[:user_id] = 2
                 get :index
                 assert_response :success
                 assert_template 'index'
                 assert_tag 'a', :attributes => {:href => '/time_entries/new'}, :content => /Log time/
               end
               def test_index_my_spent_time
                 @request.session[:user_id] = 2
                 get :index, :user_id => 'me'
                 assert_response :success
                 assert_template 'index'
                 assert assigns(:entries).all? {|entry| entry.user_id == 2}
               end
               def test_index_at_project_level
                 get :index, :project_id => 'ecookbook'
                 assert_response :success
                 assert_template 'index'
                 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)
                 assert_tag :form,
                   :attributes => {:action => "/projects/ecookbook/time_entries", :id => 'query_form'}
               end
               def test_index_with_display_subprojects_issues_to_false_should_not_include_subproject_entries
                 entry = TimeEntry.generate!(:project => Project.find(3))
                 with_settings :display_subprojects_issues => '0' do
                   get :index, :project_id => 'ecookbook'
                   assert_response :success
                   assert_template 'index'
                   assert_not_include entry, assigns(:entries)
                 end
               end
               def test_index_with_display_subprojects_issues_to_false_and_subproject_filter_should_include_subproject_entries
                 entry = TimeEntry.generate!(:project => Project.find(3))
                 with_settings :display_subprojects_issues => '0' do
                   get :index, :project_id => 'ecookbook', :subproject_id => 3
                   assert_response :success
                   assert_template 'index'
                   assert_include entry, assigns(:entries)
                 end
               end
               def test_index_at_project_level_with_date_range
                 get :index, :project_id => 'ecookbook',
                   :f => ['spent_on'],
                   :op => {'spent_on' => '><'},
                   :v => {'spent_on' => ['2007-03-20', '2007-04-30']}
                 assert_response :success
                 assert_template 'index'
                 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_tag :form,
                   :attributes => {:action => "/projects/ecookbook/time_entries", :id => 'query_form'}
               end
               def test_index_at_project_level_with_date_range_using_from_and_to_params
                 get :index, :project_id => 'ecookbook', :from => '2007-03-20', :to => '2007-04-30'
                 assert_response :success
                 assert_template 'index'
                 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_tag :form,
                   :attributes => {:action => "/projects/ecookbook/time_entries", :id => 'query_form'}
               end
               def test_index_at_project_level_with_period
                 get :index, :project_id => 'ecookbook',
                   :f => ['spent_on'],
                   :op => {'spent_on' => '>t-'},
                   :v => {'spent_on' => ['7']}
                 assert_response :success
                 assert_template 'index'
                 assert_not_nil assigns(:entries)
                 assert_not_nil assigns(:total_hours)
                 assert_tag :form,
                   :attributes => {:action => "/projects/ecookbook/time_entries", :id => 'query_form'}
               end
               def test_index_at_issue_level
                 get :index, :issue_id => 1
                 assert_response :success
                 assert_template 'index'
                 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
                 assert_nil assigns(:from)
                 assert_nil assigns(:to)
                 assert_tag :form,
-                  :attributes => {:action => "/projects/ecookbook/issues/1/time_entries", :id => 'query_form'}
+                  :attributes => {:action => "/issues/1/time_entries", :id => 'query_form'}
               end
               def test_index_should_sort_by_spent_on_and_created_on
                 t1 = TimeEntry.create!(:user => User.find(1), :project => Project.find(1), :hours => 1, :spent_on => '2012-06-16', :created_on => '2012-06-16 20:00:00', :activity_id => 10)
                 t2 = TimeEntry.create!(:user => User.find(1), :project => Project.find(1), :hours => 1, :spent_on => '2012-06-16', :created_on => '2012-06-16 20:05:00', :activity_id => 10)
                 t3 = TimeEntry.create!(:user => User.find(1), :project => Project.find(1), :hours => 1, :spent_on => '2012-06-15', :created_on => '2012-06-16 20:10:00', :activity_id => 10)
                 get :index, :project_id => 1,
                   :f => ['spent_on'],
                   :op => {'spent_on' => '><'},
                   :v => {'spent_on' => ['2012-06-15', '2012-06-16']}
                 assert_response :success
                 assert_equal [t2, t1, t3], assigns(:entries)
                 get :index, :project_id => 1,
                   :f => ['spent_on'],
                   :op => {'spent_on' => '><'},
                   :v => {'spent_on' => ['2012-06-15', '2012-06-16']},
                   :sort => 'spent_on'
                 assert_response :success
                 assert_equal [t3, t1, t2], assigns(:entries)
               end
               def test_index_with_filter_on_issue_custom_field
                 issue = Issue.generate!(:project_id => 1, :tracker_id => 1, :custom_field_values => {2 => 'filter_on_issue_custom_field'})
                 entry = TimeEntry.generate!(:issue => issue, :hours => 2.5)
                 get :index, :f => ['issue.cf_2'], :op => {'issue.cf_2' => '='}, :v => {'issue.cf_2' => ['filter_on_issue_custom_field']}
                 assert_response :success
                 assert_equal [entry], assigns(:entries)
               end
               def test_index_with_issue_custom_field_column
                 issue = Issue.generate!(:project_id => 1, :tracker_id => 1, :custom_field_values => {2 => 'filter_on_issue_custom_field'})
                 entry = TimeEntry.generate!(:issue => issue, :hours => 2.5)
                 get :index, :c => %w(project spent_on issue comments hours issue.cf_2)
                 assert_response :success
                 assert_include :'issue.cf_2', assigns(:query).column_names
                 assert_select 'td.issue_cf_2', :text => 'filter_on_issue_custom_field'
               end
               def test_index_with_time_entry_custom_field_column
                 field = TimeEntryCustomField.generate!(:field_format => 'string')
                 entry = TimeEntry.generate!(:hours => 2.5, :custom_field_values => {field.id => 'CF Value'})
                 field_name = "cf_#{field.id}"
                 get :index, :c => ["hours", field_name]
                 assert_response :success
                 assert_include field_name.to_sym, assigns(:query).column_names
                 assert_select "td.#{field_name}", :text => 'CF Value'
               end
               def test_index_with_time_entry_custom_field_sorting
                 field = TimeEntryCustomField.generate!(:field_format => 'string', :name => 'String Field')
                 TimeEntry.generate!(:hours => 2.5, :custom_field_values => {field.id => 'CF Value 1'})
                 TimeEntry.generate!(:hours => 2.5, :custom_field_values => {field.id => 'CF Value 3'})
                 TimeEntry.generate!(:hours => 2.5, :custom_field_values => {field.id => 'CF Value 2'})
                 field_name = "cf_#{field.id}"
                 get :index, :c => ["hours", field_name], :sort => field_name
                 assert_response :success
                 assert_include field_name.to_sym, assigns(:query).column_names
                 assert_select "th a.sort", :text => 'String Field'
                 # Make sure that values are properly sorted
                 values = assigns(:entries).map {|e| e.custom_field_value(field)}.compact
                 assert_equal 3, values.size
                 assert_equal values.sort, values
               end
               def test_index_atom_feed
                 get :index, :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_index_at_project_level_should_include_csv_export_dialog
                 get :index, :project_id => 'ecookbook',
                   :f => ['spent_on'],
                   :op => {'spent_on' => '>='},
                   :v => {'spent_on' => ['2007-04-01']},
                   :c => ['spent_on', 'user']
                 assert_response :success
                 assert_select '#csv-export-options' do
                   assert_select 'form[action=?][method=get]', '/projects/ecookbook/time_entries.csv' do
                     # filter
                     assert_select 'input[name=?][value=?]', 'f[]', 'spent_on'
                     assert_select 'input[name=?][value=?]', 'op[spent_on]', '&gt;='
                     assert_select 'input[name=?][value=?]', 'v[spent_on][]', '2007-04-01'
                     # columns
                     assert_select 'input[name=?][value=?]', 'c[]', 'spent_on'
                     assert_select 'input[name=?][value=?]', 'c[]', 'user'
                     assert_select 'input[name=?]', 'c[]', 2
                   end
                 end
               end
               def test_index_cross_project_should_include_csv_export_dialog
                 get :index
                 assert_response :success
                 assert_select '#csv-export-options' do
                   assert_select 'form[action=?][method=get]', '/time_entries.csv'
                 end
               end
               def test_index_at_issue_level_should_include_csv_export_dialog
-                get :index, :project_id => 'ecookbook', :issue_id => 3
+                get :index, :issue_id => 3
                 assert_response :success
                 assert_select '#csv-export-options' do
-                  assert_select 'form[action=?][method=get]', '/projects/ecookbook/issues/3/time_entries.csv'
+                  assert_select 'form[action=?][method=get]', '/issues/3/time_entries.csv'
                 end
               end
               def test_index_csv_all_projects
                 Setting.date_format = '%m/%d/%Y'
                 get :index, :format => 'csv'
                 assert_response :success
                 assert_equal 'text/csv; header=present', response.content_type
               end
               def test_index_csv
                 Setting.date_format = '%m/%d/%Y'
                 get :index, :project_id => 1, :format => 'csv'
                 assert_response :success
                 assert_equal 'text/csv; header=present', response.content_type
               end
             end

test/integration/routing/timelog_test.rb 0 -51

             # Redmine - project management software
             # Copyright (C) 2006-2014  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.expand_path('../../../test_helper', __FILE__)
             class RoutingTimelogsTest < ActionController::IntegrationTest
               def test_timelogs_global
                 assert_routing(
                     { :method => 'get', :path => "/time_entries" },
                     { :controller => 'timelog', :action => 'index' }
                   )
                 assert_routing(
                     { :method => 'get', :path => "/time_entries.csv" },
                     { :controller => 'timelog', :action => 'index', :format => 'csv' }
                   )
                 assert_routing(
                     { :method => 'get', :path => "/time_entries.atom" },
                     { :controller => 'timelog', :action => 'index', :format => 'atom' }
                   )
                 assert_routing(
                     { :method => 'get', :path => "/time_entries/new" },
                     { :controller => 'timelog', :action => 'new' }
                   )
                 assert_routing(
                     { :method => 'get', :path => "/time_entries/22/edit" },
                     { :controller => 'timelog', :action => 'edit', :id => '22' }
                   )
                 assert_routing(
                     { :method => 'post', :path => "/time_entries" },
                     { :controller => 'timelog', :action => 'create' }
                   )
                 assert_routing(
                     { :method => 'put', :path => "/time_entries/22" },
                     { :controller => 'timelog', :action => 'update', :id => '22' }
                   )
                 assert_routing(
                     { :method => 'delete', :path => "/time_entries/55" },
                     { :controller => 'timelog', :action => 'destroy', :id => '55' }
                   )
               end
               def test_timelogs_scoped_under_project
                 assert_routing(
                     { :method => 'get', :path => "/projects/567/time_entries" },
                     { :controller => 'timelog', :action => 'index', :project_id => '567' }
                   )
                 assert_routing(
                     { :method => 'get', :path => "/projects/567/time_entries.csv" },
                     { :controller => 'timelog', :action => 'index', :project_id => '567',
                       :format => 'csv' }
                   )
                 assert_routing(
                     { :method => 'get', :path => "/projects/567/time_entries.atom" },
                     { :controller => 'timelog', :action => 'index', :project_id => '567',
                       :format => 'atom' }
                   )
                 assert_routing(
                     { :method => 'get', :path => "/projects/567/time_entries/new" },
                     { :controller => 'timelog', :action => 'new', :project_id => '567' }
                   )
                 assert_routing(
                     { :method => 'get', :path => "/projects/567/time_entries/22/edit" },
                     { :controller => 'timelog', :action => 'edit',
                       :id => '22', :project_id => '567' }
                   )
                 assert_routing(
                     { :method => 'post', :path => "/projects/567/time_entries" },
                     { :controller => 'timelog', :action => 'create',
                       :project_id => '567' }
                   )
                 assert_routing(
                     { :method => 'put', :path => "/projects/567/time_entries/22" },
                     { :controller => 'timelog', :action => 'update',
                       :id => '22', :project_id => '567' }
                   )
                 assert_routing(
                     { :method => 'delete', :path => "/projects/567/time_entries/55" },
                     { :controller => 'timelog', :action => 'destroy',
                       :id => '55', :project_id => '567' }
                   )
               end
               def test_timelogs_scoped_under_issues
                 assert_routing(
                     { :method => 'get', :path => "/issues/234/time_entries" },
                     { :controller => 'timelog', :action => 'index', :issue_id => '234' }
                   )
                 assert_routing(
                     { :method => 'get', :path => "/issues/234/time_entries.csv" },
                     { :controller => 'timelog', :action => 'index', :issue_id => '234',
                       :format => 'csv' }
                   )
                 assert_routing(
                     { :method => 'get', :path => "/issues/234/time_entries.atom" },
                     { :controller => 'timelog', :action => 'index', :issue_id => '234',
                       :format => 'atom' }
                   )
                 assert_routing(
                     { :method => 'get', :path => "/issues/234/time_entries/new" },
                     { :controller => 'timelog', :action => 'new', :issue_id => '234' }
                   )
                 assert_routing(
                     { :method => 'get', :path => "/issues/234/time_entries/22/edit" },
                     { :controller => 'timelog', :action => 'edit', :id => '22',
                       :issue_id => '234' }
                   )
                 assert_routing(
                     { :method => 'post', :path => "/issues/234/time_entries" },
                     { :controller => 'timelog', :action => 'create', :issue_id => '234' }
                   )
                 assert_routing(
                     { :method => 'put', :path => "/issues/234/time_entries/22" },
                     { :controller => 'timelog', :action => 'update', :id => '22',
                       :issue_id => '234' }
                   )
                 assert_routing(
                     { :method => 'delete', :path => "/issues/234/time_entries/55" },
                     { :controller => 'timelog', :action => 'destroy', :id => '55',
                       :issue_id => '234' }
                   )
               end
-              def test_timelogs_scoped_under_project_and_issues
-                assert_routing(
-                    { :method => 'get',
-                      :path => "/projects/ecookbook/issues/234/time_entries" },
-                    { :controller => 'timelog', :action => 'index',
-                      :issue_id => '234', :project_id => 'ecookbook' }
-                assert_routing(
-                    { :method => 'get',
-                      :path => "/projects/ecookbook/issues/234/time_entries.csv" },
-                    { :controller => 'timelog', :action => 'index',
-                      :issue_id => '234', :project_id => 'ecookbook', :format => 'csv' }
-                assert_routing(
-                    { :method => 'get',
-                      :path => "/projects/ecookbook/issues/234/time_entries.atom" },
-                    { :controller => 'timelog', :action => 'index',
-                      :issue_id => '234', :project_id => 'ecookbook', :format => 'atom' }
-                assert_routing(
-                    { :method => 'get',
-                      :path => "/projects/ecookbook/issues/234/time_entries/new" },
-                    { :controller => 'timelog', :action => 'new',
-                      :issue_id => '234', :project_id => 'ecookbook' }
-                assert_routing(
-                    { :method => 'get',
-                      :path => "/projects/ecookbook/issues/234/time_entries/22/edit" },
-                    { :controller => 'timelog', :action => 'edit', :id => '22',
-                      :issue_id => '234', :project_id => 'ecookbook' }
-                assert_routing(
-                    { :method => 'post',
-                      :path => "/projects/ecookbook/issues/234/time_entries" },
-                    { :controller => 'timelog', :action => 'create',
-                      :issue_id => '234', :project_id => 'ecookbook' }
-                assert_routing(
-                    { :method => 'put',
-                      :path => "/projects/ecookbook/issues/234/time_entries/22" },
-                    { :controller => 'timelog', :action => 'update', :id => '22',
-                      :issue_id => '234', :project_id => 'ecookbook' }
-                assert_routing(
-                    { :method => 'delete',
-                      :path => "/projects/ecookbook/issues/234/time_entries/55" },
-                    { :controller => 'timelog', :action => 'destroy', :id => '55',
-                      :issue_id => '234', :project_id => 'ecookbook' }
-              end
               def test_timelogs_report
                 assert_routing(
                     { :method => 'get',
                       :path => "/time_entries/report" },
                     { :controller => 'timelog', :action => 'report' }
                   )
                 assert_routing(
                     { :method => 'get',
                       :path => "/time_entries/report.csv" },
                     { :controller => 'timelog', :action => 'report', :format => 'csv' }
                   )
                 assert_routing(
                     { :method => 'get',
                       :path => "/issues/234/time_entries/report" },
                     { :controller => 'timelog', :action => 'report', :issue_id => '234' }
                   )
                 assert_routing(
                     { :method => 'get',
                       :path => "/issues/234/time_entries/report.csv" },
                     { :controller => 'timelog', :action => 'report', :issue_id => '234',
                       :format => 'csv' }
                   )
                 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_timelogs_bulk_edit
                 assert_routing(
                     { :method => 'delete',
                       :path => "/time_entries/destroy" },
                     { :controller => 'timelog', :action => 'destroy' }
                   )
                 assert_routing(
                     { :method => 'post',
                       :path => "/time_entries/bulk_update" },
                     { :controller => 'timelog', :action => 'bulk_update' }
                   )
                 assert_routing(
                     { :method => 'get',
                       :path => "/time_entries/bulk_edit" },
                     { :controller => 'timelog', :action => 'bulk_edit' }
                   )
               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