jro_apps/redmine Commit - r15569:2544fe6e15d4

Issue subject is not updated when you select another issue on time entry form (#24041)....

Jean-Philippe Lang -

r15569:2544fe6e15d4

parent child

Context file:

r15569:2544fe6e15d4

Collapse all files

app/views/timelog/edit.js.erb created 644 +1 0

	@@ -0,0 +1,1
				1	$('#time_entry_issue').html('<%= escape_javascript link_to_issue(@time_entry.issue) if @time_entry.issue.try(:visible?) %>');

app/views/timelog/_form.html.erb +7 -9

             <%= error_messages_for 'time_entry' %>
             <%= back_url_hidden_field_tag %>
             <div class="box tabular">
               <% if @time_entry.new_record? %>
                 <% if params[:project_id] %>
                   <%= hidden_field_tag 'project_id', params[:project_id] %>
                 <% elsif params[:issue_id] %>
                   <%= hidden_field_tag 'issue_id', params[:issue_id] %>
                 <% else %>
                   <p><%= f.select :project_id, project_tree_options_for_select(Project.allowed_to(:log_time).to_a, :selected => @time_entry.project, :include_blank => true), :required => true %></p>
                 <% end %>
               <% end %>
               <p>
                 <%= f.text_field :issue_id, :size => 6 %>
-                <% if @time_entry.issue.try(:visible?) %>
+                <span id="time_entry_issue">
-                  <span id="time_entry_issue"><%= "#{@time_entry.issue.tracker.name} ##{@time_entry.issue.id}: #{@time_entry.issue.subject}" %></span>
+                  <%=  link_to_issue(@time_entry.issue) if @time_entry.issue.try(:visible?) %>
-                <% end %>
+                </span>
               </p>
               <p><%= f.date_field :spent_on, :size => 10, :required => true %><%= calendar_for('time_entry_spent_on') %></p>
               <p><%= f.text_field :hours, :size => 6, :required => true %></p>
               <p><%= f.text_field :comments, :size => 100, :maxlength => 1024 %></p>
               <p><%= f.select :activity_id, activity_collection_for_select_options(@time_entry), :required => true %></p>
               <% @time_entry.custom_field_values.each do |value| %>
                 <p><%= custom_field_tag_with_label :time_entry, value %></p>
               <% end %>
               <%= call_hook(:view_timelog_edit_form_bottom, { :time_entry => @time_entry, :form => f }) %>
             </div>
             <%= javascript_tag do %>
-            <% if @time_entry.new_record? %>
               $(document).ready(function(){
                 $('#time_entry_project_id, #time_entry_issue_id').change(function(){
                   $.ajax({
-                    url: '<%= escape_javascript new_time_entry_path(:format => 'js') %>',
+                    url: '<%= escape_javascript(@time_entry.new_record? ? new_time_entry_path(:format => 'js') : edit_time_entry_path(:format => 'js')) %>',
                     type: 'post',
-                    data: $('#new_time_entry').serialize()
+                    data: $(this).closest('form').serialize()
                   });
                 });
               });
-            <% end %>
               observeAutocompleteField('time_entry_issue_id', '<%= escape_javascript auto_complete_issues_path(:project_id => @project, :scope => (@project ? nil : 'all'))%>', {
                 select: function(event, ui) {
-                  $('#time_entry_issue').text(ui.item.label);
+                  $('#time_entry_issue').text('');
-                  $('#time_entry_issue_id').blur();
+                  $('#time_entry_issue_id').val(ui.item.value).change();
                 }
               });
             <% end %>

app/views/timelog/new.js.erb +1 0

@@ -1,1 +1,2
1	$('#time_entry_activity_id').html('<%= escape_javascript options_for_select(activity_collection_for_select_options(@time_entry), @time_entry.activity_id) %>');	1	$('#time_entry_activity_id').html('<%= escape_javascript options_for_select(activity_collection_for_select_options(@time_entry), @time_entry.activity_id) %>');
		2	$('#time_entry_issue').html('<%= escape_javascript link_to_issue(@time_entry.issue) if @time_entry.issue.try(:visible?) %>');

config/routes.rb +4 0

             # Redmine - project management software
             # Copyright (C) 2006-2016  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.
             Rails.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, :patch]
               match '/issues/preview/new/:project_id', :to => 'previews#issue', :as => 'preview_new_issue', :via => [:get, :post, :put, :patch]
               match '/issues/preview/edit/:id', :to => 'previews#issue', :as => 'preview_edit_issue', :via => [:get, :post, :put, :patch]
               match '/issues/preview', :to => 'previews#issue', :as => 'preview_issue', :via => [:get, :post, :put, :patch]
               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'
               resources :journals, :only => [:edit, :update] do
                 member do
                   get 'diff'
                 end
               end
               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'
               get   '/issues/imports/new', :to => 'imports#new', :as => 'new_issues_import'
               post  '/imports', :to => 'imports#create', :as => 'imports'
               get   '/imports/:id', :to => 'imports#show', :as => 'import'
               match '/imports/:id/settings', :to => 'imports#settings', :via => [:get, :post], :as => 'import_settings'
               match '/imports/:id/mapping', :to => 'imports#mapping', :via => [:get, :post], :as => 'import_mapping'
               match '/imports/:id/run', :to => 'imports#run', :via => [:get, :post], :as => 'import_run'
               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
               post 'my/page', :to => 'my#update_page'
               match 'my', :controller => 'my', :action => 'index', :via => :get # Redirects to my/page
               get 'my/api_key', :to => 'my#show_api_key', :as => 'my_api_key'
               post 'my/api_key', :to => 'my#reset_api_key'
               post 'my/rss_key', :to => 'my#reset_rss_key', :as => 'my_rss_key'
               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 do
                 resources :memberships, :controller => 'principal_memberships'
                 resources :email_addresses, :only => [:index, :create, :update, :destroy]
               end
               post 'watchers/watch', :to => 'watchers#watch', :as => 'watch'
               delete 'watchers/watch', :to => 'watchers#unwatch'
               get 'watchers/new', :to => 'watchers#new', :as => 'new_watchers'
               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]
                 # Used when updating the form of a new issue
                 post 'issues/new', :to => 'issues#new'
                 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', :except => [:show, :edit, :update, :destroy] 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, :create], :as => 'wiki_page' do
                   member do
                     get 'rename'
                     post 'rename'
                     get 'history'
                     get 'diff'
                     match 'preview', :via => [:post, :put, :patch]
                     post 'protect'
                     post 'add_attachment'
                   end
                   collection do
                     get 'export'
                     get 'date_index'
                     post 'new'
                   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
                 member do
                   # Used when updating the form of an existing issue
                   patch 'edit', :to => 'issues#edit'
                 end
                 collection do
                   match 'bulk_edit', :via => [:get, :post]
                   post 'bulk_update'
                 end
                 resources :time_entries, :controller => 'timelog', :only => [:new, :create]
                 shallow do
                   resources :relations, :controller => 'issue_relations', :only => [:index, :show, :create, :destroy]
                 end
               end
               # Used when updating the form of a new issue outside a project
               post '/issues/new', :to => 'issues#new'
               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
+                member do
+                  # Used when updating the edit form of an existing time entry
+                  patch 'edit', :to => 'timelog#edit'
+                end
                 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
               # Used to update the new time entry form
               post '/time_entries/new', :to => 'timelog#new'
               get 'projects/:id/activity', :to => 'activities#index', :as => :project_activity
               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)',
                   :to => 'repositories#changes',
                   :format => false
               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'
               %w(browse show entry raw annotate diff).each do |action|
                 get "projects/:id/repository/:repository_id/revisions/:rev/#{action}(/*path)",
                     :controller => 'repositories',
                     :action => action,
                     :format => false,
                     :constraints => {:rev => /[a-z0-9\.\-_]+/}
               end
               get 'projects/:id/repository/statistics', :to => 'repositories#stats'
               get 'projects/:id/repository/graph', :to => 'repositories#graph'
               get 'projects/:id/repository/changes(/*path)',
                   :to => 'repositories#changes',
                   :format => false
               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'
               %w(browse show entry raw annotate diff).each do |action|
                 get "projects/:id/repository/revisions/:rev/#{action}(/*path)",
                     :controller => 'repositories',
                     :action => action,
                     :format => false,
                     :constraints => {:rev => /[a-z0-9\.\-_]+/}
               end
               %w(browse entry raw changes annotate diff).each do |action|
                 get "projects/:id/repository/:repository_id/#{action}(/*path)",
                     :controller => 'repositories',
                     :action => action,
                     :format => false
               end
               %w(browse entry raw changes annotate diff).each do |action|
                 get "projects/:id/repository/#{action}(/*path)",
                     :controller => 'repositories',
                     :action => action,
                     :format => false
               end
               get 'projects/:id/repository/:repository_id/show/*path', :to => 'repositories#show', :format => false
               get 'projects/:id/repository/show/*path', :to => 'repositories#show', :format => false
               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, :update, :destroy]
               get 'attachments/:object_type/:object_id/edit', :to => 'attachments#edit_all', :as => :object_attachments_edit
               patch 'attachments/:object_type/:object_id', :to => 'attachments#update_all', :as => :object_attachments
               resources :groups do
                 resources :memberships, :controller => 'principal_memberships'
                 member do
                   get 'autocomplete_for_user'
                 end
               end
               get 'groups/:id/users/new', :to => 'groups#new_users', :id => /\d+/, :as => 'new_group_users'
               post 'groups/:id/users', :to => 'groups#add_users', :id => /\d+/, :as => 'group_users'
               delete 'groups/:id/users/:user_id', :to => 'groups#remove_user', :id => /\d+/, :as => 'group_user'
               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 do
                 resources :enumerations, :controller => 'custom_field_enumerations', :except => [:show, :new, :edit]
                 put 'enumerations', :to => 'custom_field_enumerations#update_each'
               end
               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'
               get  'mail_handler', :to => 'mail_handler#new'
               post 'mail_handler', :to => 'mail_handler#index'
               get 'admin', :to => 'admin#index'
               get 'admin/projects', :to => 'admin#projects'
               get 'admin/plugins', :to => 'admin#plugins'
               get 'admin/info', :to => 'admin#info'
               post 'admin/test_email', :to => 'admin#test_email', :as => 'test_email'
               post 'admin/default_configuration', :to => 'admin#default_configuration'
               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/timelog_controller_test.rb +8 -6

             # -*- coding: utf-8 -*-
             # Redmine - project management software
             # Copyright (C) 2006-2016  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 < Redmine::ControllerTest
               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_select 'input[name=?][type=hidden]', 'project_id', 0
                 assert_select 'input[name=?][type=hidden]', 'issue_id', 0
+                assert_select 'span[id=?]', 'time_entry_issue'
                 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, :params => {:project_id => 1}
                 assert_response :success
                 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, :params => {:issue_id => 2}
                 assert_response :success
                 assert_select 'input[name=?][type=hidden]', 'project_id', 0
                 assert_select 'input[name=?][type=hidden]', 'issue_id'
+                assert_select 'a[href=?]', '/issues/2', :text => /Feature request #2/
                 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, :params => {:time_entry => {:project_id => '1'}}
                 assert_response :success
                 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, :params => {: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, :params => {:project_id => 1}
                 assert_response :success
                 assert_select 'option', :text => 'Inactive Activity', :count => 0
               end
               def test_post_new_as_js_should_update_activity_options
                 @request.session[:user_id] = 3
                 post :new, :params => {:time_entry => {:project_id => 1}, :format => 'js'}
                 assert_response :success
                 assert_include '#time_entry_activity_id', response.body
               end
               def test_get_edit_existing_time
                 @request.session[:user_id] = 2
                 get :edit, :params => {:id => 2, :project_id => nil}
                 assert_response :success
                 assert_select 'form[action=?]', '/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!(:validate => false)
                 @request.session[:user_id] = 1
                 get :edit, :params => {:project_id => 1, :id => 1}
                 assert_response :success
                 # Blank option since nothing is pre-selected
                 assert_select 'option', :text => '--- Please select ---'
               end
               def test_post_create
                 @request.session[:user_id] = 3
                 assert_difference 'TimeEntry.count' do
                   post :create, :params => {
                     :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, :params => {
                     :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_on_project_with_time_tracking_disabled_should_fail
                 Project.find(1).disable_module! :time_tracking
                 @request.session[:user_id] = 2
                 assert_no_difference 'TimeEntry.count' do
                   post :create, :params => {
                     :time_entry => {
                       :project_id => '1', :issue_id => '',
                       :activity_id => '11', :spent_on => '2008-03-14', :hours => '7.3'
                     }
                   }
                 end
               end
               def test_create_on_project_without_permission_should_fail
                 Role.find(1).remove_permission! :log_time
                 @request.session[:user_id] = 2
                 assert_no_difference 'TimeEntry.count' do
                   post :create, :params => {
                     :time_entry => {
                       :project_id => '1', :issue_id => '',
                       :activity_id => '11', :spent_on => '2008-03-14', :hours => '7.3'
                     }
                   }
                 end
               end
               def test_create_on_issue_in_project_with_time_tracking_disabled_should_fail
                 Project.find(1).disable_module! :time_tracking
                 @request.session[:user_id] = 2
                 assert_no_difference 'TimeEntry.count' do
                   post :create, :params => {
                     :time_entry => {
                       :project_id => '', :issue_id => '1',
                       :activity_id => '11', :spent_on => '2008-03-14', :hours => '7.3'
                     }
                   }
                   assert_select_error /Issue is invalid/
                 end
               end
               def test_create_on_issue_in_project_without_permission_should_fail
                 Role.find(1).remove_permission! :log_time
                 @request.session[:user_id] = 2
                 assert_no_difference 'TimeEntry.count' do
                   post :create, :params => {
                     :time_entry => {
                       :project_id => '', :issue_id => '1',
                       :activity_id => '11', :spent_on => '2008-03-14', :hours => '7.3'
                     }
                   }
                   assert_select_error /Issue is invalid/
                 end
               end
               def test_create_on_issue_that_is_not_visible_should_not_disclose_subject
                 issue = Issue.generate!(:subject => "issue_that_is_not_visible", :is_private => true)
                 assert !issue.visible?(User.find(3))
                 @request.session[:user_id] = 3
                 assert_no_difference 'TimeEntry.count' do
                   post :create, :params => {
                     :time_entry => {
                       :project_id => '', :issue_id => issue.id.to_s,
                       :activity_id => '11', :spent_on => '2008-03-14', :hours => '7.3'
                     }
                   }
                 end
                 assert_select_error /Issue is invalid/
                 assert_select "input[name=?][value=?]", "time_entry[issue_id]", issue.id.to_s
-                assert_select "#time_entry_issue", 0
+                assert_select "#time_entry_issue a", 0
                 assert !response.body.include?('issue_that_is_not_visible')
               end
               def test_create_and_continue_at_project_level
                 @request.session[:user_id] = 2
                 assert_difference 'TimeEntry.count' do
                   post :create, :params => {
                     :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, :params => {
                     :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, :params => {
                     :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, :params => {
                     :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, :params => {
                   :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, :params => {:time_entry => {:issue_id => ''}}
                 assert_response :success
                 assert_select_error /Project cannot be blank/
               end
               def test_create_with_failure
                 @request.session[:user_id] = 2
                 post :create, :params => {
                   :project_id => 1,
                   :time_entry => {
                     :activity_id => '',
                     :issue_id => '',
                     :spent_on => '2008-03-14',
                     :hours => '7.3'
                   }
                 }
                 assert_response :success
               end
               def test_create_without_project
                 @request.session[:user_id] = 2
                 assert_difference 'TimeEntry.count' do
                   post :create, :params => {
                     :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, :params => {
                     :time_entry => {
                       :project_id => '1',
                       :activity_id => '11',
                       :issue_id => '5',
                       :spent_on => '2008-03-14',
                       :hours => '7.3'
                     }
                   }
                 end
                 assert_response :success
                 assert_select_error /Issue is invalid/
               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, :params => {
                     :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, :params => {
                     :time_entry => {
                       :project_id => '1',
                       :activity_id => '11',
                       :issue_id => '',
                       :spent_on => '2008-03-14',
                       :hours => ''
                     }
                   }
                 end
                 assert_response :success
                 assert_select 'select[name=?]', 'time_entry[project_id]' do
                   assert_select 'option[value="1"][selected=selected]'
                 end
               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, :params => {
                   :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, :params => {
                   :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, :params => {
                   :id => entry.id,
                   :time_entry => {
                     :issue_id => '5'
                   }
                 }
                 assert_response :success
                 assert_select_error /Issue is invalid/
               end
               def test_get_bulk_edit
                 @request.session[:user_id] = 2
                 get :bulk_edit, :params => {:ids => [1, 2]}
                 assert_response :success
                 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, :params => {:ids => [1, 2, 6]}
                 assert_response :success
               end
               def test_bulk_edit_with_edit_own_time_entries_permission
                 @request.session[:user_id] = 2
                 Role.find_by_name('Manager').remove_permission! :edit_time_entries
                 Role.find_by_name('Manager').add_permission! :edit_own_time_entries
                 ids = (0..1).map {TimeEntry.generate!(:user => User.find(2)).id}
                 get :bulk_edit, :params => {:ids => ids}
                 assert_response :success
               end
               def test_bulk_update
                 @request.session[:user_id] = 2
                 # update time entry activity
                 post :bulk_update, :params => {: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, :params => {: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, :params => {: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, :params => {:ids => [1, 5], :time_entry => { :activity_id => 9 }}
                 assert_response 403
               end
               def test_bulk_update_with_edit_own_time_entries_permission
                 @request.session[:user_id] = 2
                 Role.find_by_name('Manager').remove_permission! :edit_time_entries
                 Role.find_by_name('Manager').add_permission! :edit_own_time_entries
                 ids = (0..1).map {TimeEntry.generate!(:user => User.find(2)).id}
                 post :bulk_update, :params => {:ids => ids, :time_entry => { :activity_id => 9 }}
                 assert_response 302
               end
               def test_bulk_update_with_edit_own_time_entries_permissions_should_be_denied_for_time_entries_of_other_user
                 @request.session[:user_id] = 2
                 Role.find_by_name('Manager').remove_permission! :edit_time_entries
                 Role.find_by_name('Manager').add_permission! :edit_own_time_entries
                 post :bulk_update, :params => {:ids => [1, 2], :time_entry => { :activity_id => 9 }}
                 assert_response 403
               end
               def test_bulk_update_custom_field
                 @request.session[:user_id] = 2
                 post :bulk_update, :params => {: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_bulk_update_clear_custom_field
                 field = TimeEntryCustomField.generate!(:field_format => 'string')
                 @request.session[:user_id] = 2
                 post :bulk_update, :params => {:ids => [1, 2], :time_entry => { :custom_field_values => {field.id.to_s => '__none__'} }}
                 assert_response 302
                 assert_equal ["", ""], TimeEntry.where(:id => [1, 2]).collect {|i| i.custom_value_for(field).value}
               end
               def test_post_bulk_update_should_redirect_back_using_the_back_url_parameter
                 @request.session[:user_id] = 2
                 post :bulk_update, :params => {: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, :params => {: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, :params => {:ids => [1,2]}
                 assert_response 403
               end
               def test_destroy
                 @request.session[:user_id] = 2
                 delete :destroy, :params => {: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, :params => {: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_select '.total-for-hours', :text => 'Hours: 162.90'
                 assert_select 'form#query_form[action=?]', '/time_entries'
               end
               def test_index_all_projects_should_show_log_time_link
                 @request.session[:user_id] = 2
                 get :index
                 assert_response :success
                 assert_select 'a[href=?]', '/time_entries/new', :text => /Log time/
               end
               def test_index_my_spent_time
                 @request.session[:user_id] = 2
                 get :index, :params => {:user_id => 'me', :c => ['user']}
                 assert_response :success
                 users = css_select('table.time-entries tbody td.user').map(&:text).uniq
                 assert_equal ["John Smith"], users
               end
               def test_index_at_project_level
                 get :index, :params => {:project_id => 'ecookbook', :c => ['project']}
                 assert_response :success
                 assert_select 'tr.time-entry', 4
                 # project and subproject
                 projects = css_select('table.time-entries tbody td.project').map(&:text).uniq.sort
                 assert_equal ["eCookbook", "eCookbook Subproject 1"], projects
                 assert_select '.total-for-hours', :text => 'Hours: 162.90'
                 assert_select 'form#query_form[action=?]', '/projects/ecookbook/time_entries'
               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, :params => {:project_id => 'ecookbook', :c => ['project']}
                   assert_response :success
                   projects = css_select('table.time-entries tbody td.project').map(&:text).uniq.sort
                   assert_equal ["eCookbook"], projects
                 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, :params => {:project_id => 'ecookbook', :c => ['project'], :subproject_id => 3}
                   assert_response :success
                   projects = css_select('table.time-entries tbody td.project').map(&:text).uniq.sort
                   assert_equal ["eCookbook", "eCookbook Subproject 1"], projects
                 end
               end
               def test_index_at_project_level_with_issue_id_short_filter
                 issue = Issue.generate!(:project_id => 1)
                 TimeEntry.generate!(:issue => issue, :hours => 4)
                 TimeEntry.generate!(:issue => issue, :hours => 3)
                 @request.session[:user_id] = 2
                 get :index, :params => {:project_id => 'ecookbook', :issue_id => issue.id.to_s, :set_filter => 1}
                 assert_select '.total-for-hours', :text => 'Hours: 7.00'
               end
               def test_index_at_project_level_with_issue_fixed_version_id_short_filter
                 version = Version.generate!(:project_id => 1)
                 issue = Issue.generate!(:project_id => 1, :fixed_version => version)
                 TimeEntry.generate!(:issue => issue, :hours => 2)
                 TimeEntry.generate!(:issue => issue, :hours => 3)
                 @request.session[:user_id] = 2
                 get :index, :params => {:project_id => 'ecookbook', :"issue.fixed_version_id" => version.id.to_s, :set_filter => 1}
                 assert_select '.total-for-hours', :text => 'Hours: 5.00'
               end
               def test_index_at_project_level_with_date_range
                 get :index, :params => {
                   :project_id => 'ecookbook',
                   :f => ['spent_on'],
                   :op => {'spent_on' => '><'},
                   :v => {'spent_on' => ['2007-03-20', '2007-04-30']}
                 }
                 assert_response :success
                 assert_select 'tr.time-entry', 3
                 assert_select '.total-for-hours', :text => 'Hours: 12.90'
                 assert_select 'form#query_form[action=?]', '/projects/ecookbook/time_entries'
               end
               def test_index_at_project_level_with_date_range_using_from_and_to_params
                 get :index, :params => {
                   :project_id => 'ecookbook',
                   :from => '2007-03-20',
                   :to => '2007-04-30'
                 }
                 assert_response :success
                 assert_select 'tr.time-entry', 3
                 assert_select '.total-for-hours', :text => 'Hours: 12.90'
                 assert_select 'form#query_form[action=?]', '/projects/ecookbook/time_entries'
               end
               def test_index_at_project_level_with_period
                 get :index, :params => {
                   :project_id => 'ecookbook',
                   :f => ['spent_on'],
                   :op => {'spent_on' => '>t-'},
                   :v => {'spent_on' => ['7']}
                 }
                 assert_response :success
                 assert_select 'form#query_form[action=?]', '/projects/ecookbook/time_entries'
               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, :params => {
                   :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].map(&:id).map(&:to_s), css_select('input[name="ids[]"]').map {|e| e.attr('value')}
                 get :index, :params => {
                   :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].map(&:id).map(&:to_s), css_select('input[name="ids[]"]').map {|e| e.attr('value')}
               end
               def test_index_with_issue_status_filter
                 Issue.where(:status_id => 4).update_all(:status_id => 2)
                 issue = Issue.generate!(:project_id => 1, :tracker_id => 1, :status_id => 4)
                 entry = TimeEntry.generate!(:issue => issue, :hours => 4.5)
                 get :index, :params => {
                   :f => ['issue.status_id'],
                   :op => {'issue.status_id' => '='},
                   :v => {'issue.status_id' => ['4']}
                 }
                 assert_response :success
                 assert_equal [entry].map(&:id).map(&:to_s), css_select('input[name="ids[]"]').map {|e| e.attr('value')}
               end
               def test_index_with_issue_status_column
                 issue = Issue.generate!(:project_id => 1, :tracker_id => 1, :status_id => 4)
                 entry = TimeEntry.generate!(:issue => issue)
                 get :index, :params => {
                   :c => %w(project spent_on issue comments hours issue.status)
                 }
                 assert_response :success
                 assert_select 'td.issue-status', :text => issue.status.name
               end
               def test_index_with_issue_status_sort
                 TimeEntry.delete_all
                 TimeEntry.generate!(:issue => Issue.generate!(:project_id => 1, :tracker_id => 1, :status_id => 1))
                 TimeEntry.generate!(:issue => Issue.generate!(:project_id => 1, :tracker_id => 1, :status_id => 5))
                 TimeEntry.generate!(:issue => Issue.generate!(:project_id => 1, :tracker_id => 1, :status_id => 3))
                 TimeEntry.generate!(:project_id => 1)
                 get :index, :params => {
                   :c => ["hours", 'issue.status'],
                   :sort => 'issue.status'
                 }
                 assert_response :success
                 # Make sure that values are properly sorted
                 values = css_select("td.issue-status").map(&:text).reject(&:blank?)
                 assert_equal IssueStatus.where(:id => [1, 5, 3]).sorted.pluck(:name), values
               end
               def test_index_with_issue_tracker_filter
                 Issue.where(:tracker_id => 2).update_all(:tracker_id => 1)
                 issue = Issue.generate!(:project_id => 1, :tracker_id => 2)
                 entry = TimeEntry.generate!(:issue => issue, :hours => 4.5)
                 get :index, :params => {
                   :f => ['issue.tracker_id'],
                   :op => {'issue.tracker_id' => '='},
                   :v => {'issue.tracker_id' => ['2']}
                 }
                 assert_response :success
                 assert_equal [entry].map(&:id).map(&:to_s), css_select('input[name="ids[]"]').map {|e| e.attr('value')}
               end
               def test_index_with_issue_tracker_column
                 issue = Issue.generate!(:project_id => 1, :tracker_id => 2)
                 entry = TimeEntry.generate!(:issue => issue)
                 get :index, :params => {
                   :c => %w(project spent_on issue comments hours issue.tracker)
                 }
                 assert_response :success
                 assert_select 'td.issue-tracker', :text => issue.tracker.name
               end
               def test_index_with_issue_tracker_sort
                 TimeEntry.delete_all
                 TimeEntry.generate!(:issue => Issue.generate!(:tracker_id => 1))
                 TimeEntry.generate!(:issue => Issue.generate!(:tracker_id => 3))
                 TimeEntry.generate!(:issue => Issue.generate!(:tracker_id => 2))
                 TimeEntry.generate!(:project_id => 1)
                 get :index, :params => {
                   :c => ["hours", 'issue.tracker'],
                   :sort => 'issue.tracker'
                 }
                 assert_response :success
                 # Make sure that values are properly sorted
                 values = css_select("td.issue-tracker").map(&:text).reject(&:blank?)
                 assert_equal Tracker.where(:id => [1, 2, 3]).sorted.pluck(:name), values
               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, :params => {
                   :f => ['issue.cf_2'],
                   :op => {'issue.cf_2' => '='},
                   :v => {'issue.cf_2' => ['filter_on_issue_custom_field']}
                 }
                 assert_response :success
                 assert_equal [entry].map(&:id).map(&:to_s), css_select('input[name="ids[]"]').map {|e| e.attr('value')}
               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, :params => {
                   :c => %w(project spent_on issue comments hours issue.cf_2)
                 }
                 assert_response :success
                 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, :params => {
                   :c => ["hours", field_name]
                 }
                 assert_response :success
                 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, :params => {
                   :c => ["hours", field_name],
                   :sort => field_name
                 }
                 assert_response :success
                 assert_select "th a.sort", :text => 'String Field'
                 # Make sure that values are properly sorted
                 values = css_select("td.#{field_name}").map(&:text).reject(&:blank?)
                 assert_equal values.sort, values
                 assert_equal 3, values.size
               end
               def test_index_with_query
                 query = TimeEntryQuery.new(:project_id => 1, :name => 'Time Entry Query', :visibility => 2)
                 query.save!
                 @request.session[:user_id] = 2
                 get :index, :params => {:project_id => 'ecookbook', :query_id => query.id}
                 assert_response :success
                 assert_select 'h2', :text => query.name
                 assert_select '#sidebar a.selected', :text => query.name
               end
               def test_index_atom_feed
                 get :index, :params => {:project_id => 1, :format => 'atom'}
                 assert_response :success
                 assert_equal 'application/atom+xml', @response.content_type
                 assert_select 'entry > title', :text => /7\.65 hours/
               end
               def test_index_at_project_level_should_include_csv_export_dialog
                 get :index, :params => {
                   :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]', '>='
                     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_csv_all_projects
                 with_settings :date_format => '%m/%d/%Y' do
                   get :index, :params => {:format => 'csv'}
                   assert_response :success
                   assert_equal 'text/csv; header=present', response.content_type
                 end
               end
               def test_index_csv
                 with_settings :date_format => '%m/%d/%Y' do
                   get :index, :params => {:project_id => 1, :format => 'csv'}
                   assert_response :success
                   assert_equal 'text/csv; header=present', response.content_type
                 end
               end
               def test_index_csv_should_fill_issue_column_with_tracker_id_and_subject
                 issue = Issue.find(1)
                 entry = TimeEntry.generate!(:issue => issue, :comments => "Issue column content test")
                 get :index, :params => {:format => 'csv'}
                 line = response.body.split("\n").detect {|l| l.include?(entry.comments)}
                 assert_not_nil line
                 assert_include "#{issue.tracker} #1: #{issue.subject}", line
               end
             end

test/integration/routing/timelog_test.rb +2 -1

             # Redmine - project management software
             # Copyright (C) 2006-2016  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 < Redmine::RoutingTest
               def test_timelogs_global
                 should_route 'GET /time_entries' => 'timelog#index'
                 should_route 'GET /time_entries.csv' => 'timelog#index', :format => 'csv'
                 should_route 'GET /time_entries.atom' => 'timelog#index', :format => 'atom'
                 should_route 'GET /time_entries/new' => 'timelog#new'
                 should_route 'POST /time_entries/new' => 'timelog#new'
                 should_route 'POST /time_entries' => 'timelog#create'
                 should_route 'GET /time_entries/22/edit' => 'timelog#edit', :id => '22'
-                should_route 'PUT /time_entries/22' => 'timelog#update', :id => '22'
+                should_route 'PATCH /time_entries/22/edit' => 'timelog#edit', :id => '22'
+                should_route 'PATCH /time_entries/22' => 'timelog#update', :id => '22'
                 should_route 'DELETE /time_entries/22' => 'timelog#destroy', :id => '22'
               end
               def test_timelogs_scoped_under_project
                 should_route 'GET /projects/foo/time_entries' => 'timelog#index', :project_id => 'foo'
                 should_route 'GET /projects/foo/time_entries.csv' => 'timelog#index', :project_id => 'foo', :format => 'csv'
                 should_route 'GET /projects/foo/time_entries.atom' => 'timelog#index', :project_id => 'foo', :format => 'atom'
                 should_route 'GET /projects/foo/time_entries/new' => 'timelog#new', :project_id => 'foo'
                 should_route 'POST /projects/foo/time_entries' => 'timelog#create', :project_id => 'foo'
               end
               def test_timelogs_scoped_under_issues
                 should_route 'GET  /issues/234/time_entries/new' => 'timelog#new', :issue_id => '234'
                 should_route 'POST /issues/234/time_entries' => 'timelog#create', :issue_id => '234'
               end
               def test_timelogs_report
                 should_route 'GET /time_entries/report' => 'timelog#report'
                 should_route 'GET /time_entries/report.csv' => 'timelog#report', :format => 'csv'
                 should_route 'GET /projects/foo/time_entries/report' => 'timelog#report', :project_id => 'foo'
                 should_route 'GET /projects/foo/time_entries/report.csv' => 'timelog#report', :project_id => 'foo', :format => 'csv'
               end
               def test_timelogs_bulk_edit
                 should_route 'GET /time_entries/bulk_edit' => 'timelog#bulk_edit'
                 should_route 'POST /time_entries/bulk_update' => 'timelog#bulk_update'
                 should_route 'DELETE /time_entries/destroy' => 'timelog#destroy'
               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