##// END OF EJS Templates
jro_apps » redmine
RSS
Spent time details and report should ignore 'Setting.display_subprojects_issues?' (#14415)....
Jean-Philippe Lang -
r11827:76e48c391454
parent child
Show More
Side by Side Unified
Context file:
r11827:76e48c391454 Loading diff...:
Show file before | Show file after | Hide comments
@@ -1,299 +1,297
1 1 # Redmine - project management software
2 2 # Copyright (C) 2006-2013 Jean-Philippe Lang
3 3 #
4 4 # This program is free software; you can redistribute it and/or
5 5 # modify it under the terms of the GNU General Public License
6 6 # as published by the Free Software Foundation; either version 2
7 7 # of the License, or (at your option) any later version.
8 8 #
9 9 # This program is distributed in the hope that it will be useful,
10 10 # but WITHOUT ANY WARRANTY; without even the implied warranty of
11 11 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
12 12 # GNU General Public License for more details.
13 13 #
14 14 # You should have received a copy of the GNU General Public License
15 15 # along with this program; if not, write to the Free Software
16 16 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
17 17
18 18 class TimelogController < ApplicationController
19 19 menu_item :issues
20 20
21 21 before_filter :find_project_for_new_time_entry, :only => [:create]
22 22 before_filter :find_time_entry, :only => [:show, :edit, :update]
23 23 before_filter :find_time_entries, :only => [:bulk_edit, :bulk_update, :destroy]
24 24 before_filter :authorize, :except => [:new, :index, :report]
25 25
26 26 before_filter :find_optional_project, :only => [:index, :report]
27 27 before_filter :find_optional_project_for_new_time_entry, :only => [:new]
28 28 before_filter :authorize_global, :only => [:new, :index, :report]
29 29
30 30 accept_rss_auth :index
31 31 accept_api_auth :index, :show, :create, :update, :destroy
32 32
33 33 rescue_from Query::StatementInvalid, :with => :query_statement_invalid
34 34
35 35 helper :sort
36 36 include SortHelper
37 37 helper :issues
38 38 include TimelogHelper
39 39 helper :custom_fields
40 40 include CustomFieldsHelper
41 41 helper :queries
42 42 include QueriesHelper
43 43
44 44 def index
45 45 @query = TimeEntryQuery.build_from_params(params, :project => @project, :name => '_')
46 46
47 47 sort_init(@query.sort_criteria.empty? ? [['spent_on', 'desc']] : @query.sort_criteria)
48 48 sort_update(@query.sortable_columns)
49 49 scope = time_entry_scope(:order => sort_clause).
50 50 includes(:project, :activity, :user, :issue).
51 51 preload(:issue => [:project, :tracker, :status, :assigned_to, :priority])
52 52
53 53 respond_to do |format|
54 54 format.html {
55 55 @entry_count = scope.count
56 56 @entry_pages = Paginator.new @entry_count, per_page_option, params['page']
57 57 @entries = scope.offset(@entry_pages.offset).limit(@entry_pages.per_page).all
58 58 @total_hours = scope.sum(:hours).to_f
59 59
60 60 render :layout => !request.xhr?
61 61 }
62 62 format.api {
63 63 @entry_count = scope.count
64 64 @offset, @limit = api_offset_and_limit
65 65 @entries = scope.offset(@offset).limit(@limit).preload(:custom_values => :custom_field).all
66 66 }
67 67 format.atom {
68 68 entries = scope.limit(Setting.feeds_limit.to_i).reorder("#{TimeEntry.table_name}.created_on DESC").all
69 69 render_feed(entries, :title => l(:label_spent_time))
70 70 }
71 71 format.csv {
72 72 # Export all entries
73 73 @entries = scope.all
74 74 send_data(query_to_csv(@entries, @query, params), :type => 'text/csv; header=present', :filename => 'timelog.csv')
75 75 }
76 76 end
77 77 end
78 78
79 79 def report
80 80 @query = TimeEntryQuery.build_from_params(params, :project => @project, :name => '_')
81 81 scope = time_entry_scope
82 82
83 83 @report = Redmine::Helpers::TimeReport.new(@project, @issue, params[:criteria], params[:columns], scope)
84 84
85 85 respond_to do |format|
86 86 format.html { render :layout => !request.xhr? }
87 87 format.csv { send_data(report_to_csv(@report), :type => 'text/csv; header=present', :filename => 'timelog.csv') }
88 88 end
89 89 end
90 90
91 91 def show
92 92 respond_to do |format|
93 93 # TODO: Implement html response
94 94 format.html { render :nothing => true, :status => 406 }
95 95 format.api
96 96 end
97 97 end
98 98
99 99 def new
100 100 @time_entry ||= TimeEntry.new(:project => @project, :issue => @issue, :user => User.current, :spent_on => User.current.today)
101 101 @time_entry.safe_attributes = params[:time_entry]
102 102 end
103 103
104 104 def create
105 105 @time_entry ||= TimeEntry.new(:project => @project, :issue => @issue, :user => User.current, :spent_on => User.current.today)
106 106 @time_entry.safe_attributes = params[:time_entry]
107 107
108 108 call_hook(:controller_timelog_edit_before_save, { :params => params, :time_entry => @time_entry })
109 109
110 110 if @time_entry.save
111 111 respond_to do |format|
112 112 format.html {
113 113 flash[:notice] = l(:notice_successful_create)
114 114 if params[:continue]
115 115 if params[:project_id]
116 116 options = {
117 117 :time_entry => {:issue_id => @time_entry.issue_id, :activity_id => @time_entry.activity_id},
118 118 :back_url => params[:back_url]
119 119 }
120 120 if @time_entry.issue
121 121 redirect_to new_project_issue_time_entry_path(@time_entry.project, @time_entry.issue, options)
122 122 else
123 123 redirect_to new_project_time_entry_path(@time_entry.project, options)
124 124 end
125 125 else
126 126 options = {
127 127 :time_entry => {:project_id => @time_entry.project_id, :issue_id => @time_entry.issue_id, :activity_id => @time_entry.activity_id},
128 128 :back_url => params[:back_url]
129 129 }
130 130 redirect_to new_time_entry_path(options)
131 131 end
132 132 else
133 133 redirect_back_or_default project_time_entries_path(@time_entry.project)
134 134 end
135 135 }
136 136 format.api { render :action => 'show', :status => :created, :location => time_entry_url(@time_entry) }
137 137 end
138 138 else
139 139 respond_to do |format|
140 140 format.html { render :action => 'new' }
141 141 format.api { render_validation_errors(@time_entry) }
142 142 end
143 143 end
144 144 end
145 145
146 146 def edit
147 147 @time_entry.safe_attributes = params[:time_entry]
148 148 end
149 149
150 150 def update
151 151 @time_entry.safe_attributes = params[:time_entry]
152 152
153 153 call_hook(:controller_timelog_edit_before_save, { :params => params, :time_entry => @time_entry })
154 154
155 155 if @time_entry.save
156 156 respond_to do |format|
157 157 format.html {
158 158 flash[:notice] = l(:notice_successful_update)
159 159 redirect_back_or_default project_time_entries_path(@time_entry.project)
160 160 }
161 161 format.api { render_api_ok }
162 162 end
163 163 else
164 164 respond_to do |format|
165 165 format.html { render :action => 'edit' }
166 166 format.api { render_validation_errors(@time_entry) }
167 167 end
168 168 end
169 169 end
170 170
171 171 def bulk_edit
172 172 @available_activities = TimeEntryActivity.shared.active
173 173 @custom_fields = TimeEntry.first.available_custom_fields
174 174 end
175 175
176 176 def bulk_update
177 177 attributes = parse_params_for_bulk_time_entry_attributes(params)
178 178
179 179 unsaved_time_entry_ids = []
180 180 @time_entries.each do |time_entry|
181 181 time_entry.reload
182 182 time_entry.safe_attributes = attributes
183 183 call_hook(:controller_time_entries_bulk_edit_before_save, { :params => params, :time_entry => time_entry })
184 184 unless time_entry.save
185 185 logger.info "time entry could not be updated: #{time_entry.errors.full_messages}" if logger && logger.info
186 186 # Keep unsaved time_entry ids to display them in flash error
187 187 unsaved_time_entry_ids << time_entry.id
188 188 end
189 189 end
190 190 set_flash_from_bulk_time_entry_save(@time_entries, unsaved_time_entry_ids)
191 191 redirect_back_or_default project_time_entries_path(@projects.first)
192 192 end
193 193
194 194 def destroy
195 195 destroyed = TimeEntry.transaction do
196 196 @time_entries.each do |t|
197 197 unless t.destroy && t.destroyed?
198 198 raise ActiveRecord::Rollback
199 199 end
200 200 end
201 201 end
202 202
203 203 respond_to do |format|
204 204 format.html {
205 205 if destroyed
206 206 flash[:notice] = l(:notice_successful_delete)
207 207 else
208 208 flash[:error] = l(:notice_unable_delete_time_entry)
209 209 end
210 210 redirect_back_or_default project_time_entries_path(@projects.first)
211 211 }
212 212 format.api {
213 213 if destroyed
214 214 render_api_ok
215 215 else
216 216 render_validation_errors(@time_entries)
217 217 end
218 218 }
219 219 end
220 220 end
221 221
222 222 private
223 223 def find_time_entry
224 224 @time_entry = TimeEntry.find(params[:id])
225 225 unless @time_entry.editable_by?(User.current)
226 226 render_403
227 227 return false
228 228 end
229 229 @project = @time_entry.project
230 230 rescue ActiveRecord::RecordNotFound
231 231 render_404
232 232 end
233 233
234 234 def find_time_entries
235 235 @time_entries = TimeEntry.find_all_by_id(params[:id] || params[:ids])
236 236 raise ActiveRecord::RecordNotFound if @time_entries.empty?
237 237 @projects = @time_entries.collect(&:project).compact.uniq
238 238 @project = @projects.first if @projects.size == 1
239 239 rescue ActiveRecord::RecordNotFound
240 240 render_404
241 241 end
242 242
243 243 def set_flash_from_bulk_time_entry_save(time_entries, unsaved_time_entry_ids)
244 244 if unsaved_time_entry_ids.empty?
245 245 flash[:notice] = l(:notice_successful_update) unless time_entries.empty?
246 246 else
247 247 flash[:error] = l(:notice_failed_to_save_time_entries,
248 248 :count => unsaved_time_entry_ids.size,
249 249 :total => time_entries.size,
250 250 :ids => '#' + unsaved_time_entry_ids.join(', #'))
251 251 end
252 252 end
253 253
254 254 def find_optional_project_for_new_time_entry
255 255 if (project_id = (params[:project_id] || params[:time_entry] && params[:time_entry][:project_id])).present?
256 256 @project = Project.find(project_id)
257 257 end
258 258 if (issue_id = (params[:issue_id] || params[:time_entry] && params[:time_entry][:issue_id])).present?
259 259 @issue = Issue.find(issue_id)
260 260 @project ||= @issue.project
261 261 end
262 262 rescue ActiveRecord::RecordNotFound
263 263 render_404
264 264 end
265 265
266 266 def find_project_for_new_time_entry
267 267 find_optional_project_for_new_time_entry
268 268 if @project.nil?
269 269 render_404
270 270 end
271 271 end
272 272
273 273 def find_optional_project
274 274 if !params[:issue_id].blank?
275 275 @issue = Issue.find(params[:issue_id])
276 276 @project = @issue.project
277 277 elsif !params[:project_id].blank?
278 278 @project = Project.find(params[:project_id])
279 279 end
280 280 end
281 281
282 282 # Returns the TimeEntry scope for index and report actions
283 283 def time_entry_scope(options={})
284 284 scope = @query.results_scope(options)
285 285 if @issue
286 286 scope = scope.on_issue(@issue)
287 elsif @project
288 scope = scope.on_project(@project, Setting.display_subprojects_issues?)
289 287 end
290 288 scope
291 289 end
292 290
293 291 def parse_params_for_bulk_time_entry_attributes(params)
294 292 attributes = (params[:time_entry] || {}).reject {|k,v| v.blank?}
295 293 attributes.keys.each {|k| attributes[k] = '' if attributes[k] == 'none'}
296 294 attributes[:custom_field_values].reject! {|k,v| v.blank?} if attributes[:custom_field_values]
297 295 attributes
298 296 end
299 297 end
Show file before | Show file after | Hide comments
@@ -1,641 +1,663
1 1 # -*- coding: utf-8 -*-
2 2 # Redmine - project management software
3 3 # Copyright (C) 2006-2013 Jean-Philippe Lang
4 4 #
5 5 # This program is free software; you can redistribute it and/or
6 6 # modify it under the terms of the GNU General Public License
7 7 # as published by the Free Software Foundation; either version 2
8 8 # of the License, or (at your option) any later version.
9 9 #
10 10 # This program is distributed in the hope that it will be useful,
11 11 # but WITHOUT ANY WARRANTY; without even the implied warranty of
12 12 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
13 13 # GNU General Public License for more details.
14 14 #
15 15 # You should have received a copy of the GNU General Public License
16 16 # along with this program; if not, write to the Free Software
17 17 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
18 18
19 19 require File.expand_path('../../test_helper', __FILE__)
20 20
21 21 class TimelogControllerTest < ActionController::TestCase
22 22 fixtures :projects, :enabled_modules, :roles, :members,
23 23 :member_roles, :issues, :time_entries, :users,
24 24 :trackers, :enumerations, :issue_statuses,
25 25 :custom_fields, :custom_values,
26 26 :projects_trackers, :custom_fields_trackers,
27 27 :custom_fields_projects
28 28
29 29 include Redmine::I18n
30 30
31 31 def test_new_with_project_id
32 32 @request.session[:user_id] = 3
33 33 get :new, :project_id => 1
34 34 assert_response :success
35 35 assert_template 'new'
36 36 assert_select 'select[name=?]', 'time_entry[project_id]', 0
37 37 assert_select 'input[name=?][value=1][type=hidden]', 'time_entry[project_id]'
38 38 end
39 39
40 40 def test_new_with_issue_id
41 41 @request.session[:user_id] = 3
42 42 get :new, :issue_id => 2
43 43 assert_response :success
44 44 assert_template 'new'
45 45 assert_select 'select[name=?]', 'time_entry[project_id]', 0
46 46 assert_select 'input[name=?][value=1][type=hidden]', 'time_entry[project_id]'
47 47 end
48 48
49 49 def test_new_without_project
50 50 @request.session[:user_id] = 3
51 51 get :new
52 52 assert_response :success
53 53 assert_template 'new'
54 54 assert_select 'select[name=?]', 'time_entry[project_id]'
55 55 assert_select 'input[name=?]', 'time_entry[project_id]', 0
56 56 end
57 57
58 58 def test_new_without_project_should_prefill_the_form
59 59 @request.session[:user_id] = 3
60 60 get :new, :time_entry => {:project_id => '1'}
61 61 assert_response :success
62 62 assert_template 'new'
63 63 assert_select 'select[name=?]', 'time_entry[project_id]' do
64 64 assert_select 'option[value=1][selected=selected]'
65 65 end
66 66 assert_select 'input[name=?]', 'time_entry[project_id]', 0
67 67 end
68 68
69 69 def test_new_without_project_should_deny_without_permission
70 70 Role.all.each {|role| role.remove_permission! :log_time}
71 71 @request.session[:user_id] = 3
72 72
73 73 get :new
74 74 assert_response 403
75 75 end
76 76
77 77 def test_new_should_select_default_activity
78 78 @request.session[:user_id] = 3
79 79 get :new, :project_id => 1
80 80 assert_response :success
81 81 assert_select 'select[name=?]', 'time_entry[activity_id]' do
82 82 assert_select 'option[selected=selected]', :text => 'Development'
83 83 end
84 84 end
85 85
86 86 def test_new_should_only_show_active_time_entry_activities
87 87 @request.session[:user_id] = 3
88 88 get :new, :project_id => 1
89 89 assert_response :success
90 90 assert_no_tag 'option', :content => 'Inactive Activity'
91 91 end
92 92
93 93 def test_get_edit_existing_time
94 94 @request.session[:user_id] = 2
95 95 get :edit, :id => 2, :project_id => nil
96 96 assert_response :success
97 97 assert_template 'edit'
98 98 # Default activity selected
99 99 assert_tag :tag => 'form', :attributes => { :action => '/projects/ecookbook/time_entries/2' }
100 100 end
101 101
102 102 def test_get_edit_with_an_existing_time_entry_with_inactive_activity
103 103 te = TimeEntry.find(1)
104 104 te.activity = TimeEntryActivity.find_by_name("Inactive Activity")
105 105 te.save!
106 106
107 107 @request.session[:user_id] = 1
108 108 get :edit, :project_id => 1, :id => 1
109 109 assert_response :success
110 110 assert_template 'edit'
111 111 # Blank option since nothing is pre-selected
112 112 assert_tag :tag => 'option', :content => '--- Please select ---'
113 113 end
114 114
115 115 def test_post_create
116 116 # TODO: should POST to issues’ time log instead of project. change form
117 117 # and routing
118 118 @request.session[:user_id] = 3
119 119 post :create, :project_id => 1,
120 120 :time_entry => {:comments => 'Some work on TimelogControllerTest',
121 121 # Not the default activity
122 122 :activity_id => '11',
123 123 :spent_on => '2008-03-14',
124 124 :issue_id => '1',
125 125 :hours => '7.3'}
126 126 assert_redirected_to :action => 'index', :project_id => 'ecookbook'
127 127
128 128 i = Issue.find(1)
129 129 t = TimeEntry.find_by_comments('Some work on TimelogControllerTest')
130 130 assert_not_nil t
131 131 assert_equal 11, t.activity_id
132 132 assert_equal 7.3, t.hours
133 133 assert_equal 3, t.user_id
134 134 assert_equal i, t.issue
135 135 assert_equal i.project, t.project
136 136 end
137 137
138 138 def test_post_create_with_blank_issue
139 139 # TODO: should POST to issues’ time log instead of project. change form
140 140 # and routing
141 141 @request.session[:user_id] = 3
142 142 post :create, :project_id => 1,
143 143 :time_entry => {:comments => 'Some work on TimelogControllerTest',
144 144 # Not the default activity
145 145 :activity_id => '11',
146 146 :issue_id => '',
147 147 :spent_on => '2008-03-14',
148 148 :hours => '7.3'}
149 149 assert_redirected_to :action => 'index', :project_id => 'ecookbook'
150 150
151 151 t = TimeEntry.find_by_comments('Some work on TimelogControllerTest')
152 152 assert_not_nil t
153 153 assert_equal 11, t.activity_id
154 154 assert_equal 7.3, t.hours
155 155 assert_equal 3, t.user_id
156 156 end
157 157
158 158 def test_create_and_continue
159 159 @request.session[:user_id] = 2
160 160 post :create, :project_id => 1,
161 161 :time_entry => {:activity_id => '11',
162 162 :issue_id => '',
163 163 :spent_on => '2008-03-14',
164 164 :hours => '7.3'},
165 165 :continue => '1'
166 166 assert_redirected_to '/projects/ecookbook/time_entries/new?time_entry%5Bactivity_id%5D=11&time_entry%5Bissue_id%5D='
167 167 end
168 168
169 169 def test_create_and_continue_with_issue_id
170 170 @request.session[:user_id] = 2
171 171 post :create, :project_id => 1,
172 172 :time_entry => {:activity_id => '11',
173 173 :issue_id => '1',
174 174 :spent_on => '2008-03-14',
175 175 :hours => '7.3'},
176 176 :continue => '1'
177 177 assert_redirected_to '/projects/ecookbook/issues/1/time_entries/new?time_entry%5Bactivity_id%5D=11&time_entry%5Bissue_id%5D=1'
178 178 end
179 179
180 180 def test_create_and_continue_without_project
181 181 @request.session[:user_id] = 2
182 182 post :create, :time_entry => {:project_id => '1',
183 183 :activity_id => '11',
184 184 :issue_id => '',
185 185 :spent_on => '2008-03-14',
186 186 :hours => '7.3'},
187 187 :continue => '1'
188 188
189 189 assert_redirected_to '/time_entries/new?time_entry%5Bactivity_id%5D=11&time_entry%5Bissue_id%5D=&time_entry%5Bproject_id%5D=1'
190 190 end
191 191
192 192 def test_create_without_log_time_permission_should_be_denied
193 193 @request.session[:user_id] = 2
194 194 Role.find_by_name('Manager').remove_permission! :log_time
195 195 post :create, :project_id => 1,
196 196 :time_entry => {:activity_id => '11',
197 197 :issue_id => '',
198 198 :spent_on => '2008-03-14',
199 199 :hours => '7.3'}
200 200
201 201 assert_response 403
202 202 end
203 203
204 204 def test_create_with_failure
205 205 @request.session[:user_id] = 2
206 206 post :create, :project_id => 1,
207 207 :time_entry => {:activity_id => '',
208 208 :issue_id => '',
209 209 :spent_on => '2008-03-14',
210 210 :hours => '7.3'}
211 211
212 212 assert_response :success
213 213 assert_template 'new'
214 214 end
215 215
216 216 def test_create_without_project
217 217 @request.session[:user_id] = 2
218 218 assert_difference 'TimeEntry.count' do
219 219 post :create, :time_entry => {:project_id => '1',
220 220 :activity_id => '11',
221 221 :issue_id => '',
222 222 :spent_on => '2008-03-14',
223 223 :hours => '7.3'}
224 224 end
225 225
226 226 assert_redirected_to '/projects/ecookbook/time_entries'
227 227 time_entry = TimeEntry.first(:order => 'id DESC')
228 228 assert_equal 1, time_entry.project_id
229 229 end
230 230
231 231 def test_create_without_project_should_fail_with_issue_not_inside_project
232 232 @request.session[:user_id] = 2
233 233 assert_no_difference 'TimeEntry.count' do
234 234 post :create, :time_entry => {:project_id => '1',
235 235 :activity_id => '11',
236 236 :issue_id => '5',
237 237 :spent_on => '2008-03-14',
238 238 :hours => '7.3'}
239 239 end
240 240
241 241 assert_response :success
242 242 assert assigns(:time_entry).errors[:issue_id].present?
243 243 end
244 244
245 245 def test_create_without_project_should_deny_without_permission
246 246 @request.session[:user_id] = 2
247 247 Project.find(3).disable_module!(:time_tracking)
248 248
249 249 assert_no_difference 'TimeEntry.count' do
250 250 post :create, :time_entry => {:project_id => '3',
251 251 :activity_id => '11',
252 252 :issue_id => '',
253 253 :spent_on => '2008-03-14',
254 254 :hours => '7.3'}
255 255 end
256 256
257 257 assert_response 403
258 258 end
259 259
260 260 def test_create_without_project_with_failure
261 261 @request.session[:user_id] = 2
262 262 assert_no_difference 'TimeEntry.count' do
263 263 post :create, :time_entry => {:project_id => '1',
264 264 :activity_id => '11',
265 265 :issue_id => '',
266 266 :spent_on => '2008-03-14',
267 267 :hours => ''}
268 268 end
269 269
270 270 assert_response :success
271 271 assert_tag 'select', :attributes => {:name => 'time_entry[project_id]'},
272 272 :child => {:tag => 'option', :attributes => {:value => '1', :selected => 'selected'}}
273 273 end
274 274
275 275 def test_update
276 276 entry = TimeEntry.find(1)
277 277 assert_equal 1, entry.issue_id
278 278 assert_equal 2, entry.user_id
279 279
280 280 @request.session[:user_id] = 1
281 281 put :update, :id => 1,
282 282 :time_entry => {:issue_id => '2',
283 283 :hours => '8'}
284 284 assert_redirected_to :action => 'index', :project_id => 'ecookbook'
285 285 entry.reload
286 286
287 287 assert_equal 8, entry.hours
288 288 assert_equal 2, entry.issue_id
289 289 assert_equal 2, entry.user_id
290 290 end
291 291
292 292 def test_get_bulk_edit
293 293 @request.session[:user_id] = 2
294 294 get :bulk_edit, :ids => [1, 2]
295 295 assert_response :success
296 296 assert_template 'bulk_edit'
297 297
298 298 assert_select 'ul#bulk-selection' do
299 299 assert_select 'li', 2
300 300 assert_select 'li a', :text => '03/23/2007 - eCookbook: 4.25 hours'
301 301 end
302 302
303 303 assert_select 'form#bulk_edit_form[action=?]', '/time_entries/bulk_update' do
304 304 # System wide custom field
305 305 assert_select 'select[name=?]', 'time_entry[custom_field_values][10]'
306 306
307 307 # Activities
308 308 assert_select 'select[name=?]', 'time_entry[activity_id]' do
309 309 assert_select 'option[value=]', :text => '(No change)'
310 310 assert_select 'option[value=9]', :text => 'Design'
311 311 end
312 312 end
313 313 end
314 314
315 315 def test_get_bulk_edit_on_different_projects
316 316 @request.session[:user_id] = 2
317 317 get :bulk_edit, :ids => [1, 2, 6]
318 318 assert_response :success
319 319 assert_template 'bulk_edit'
320 320 end
321 321
322 322 def test_bulk_update
323 323 @request.session[:user_id] = 2
324 324 # update time entry activity
325 325 post :bulk_update, :ids => [1, 2], :time_entry => { :activity_id => 9}
326 326
327 327 assert_response 302
328 328 # check that the issues were updated
329 329 assert_equal [9, 9], TimeEntry.find_all_by_id([1, 2]).collect {|i| i.activity_id}
330 330 end
331 331
332 332 def test_bulk_update_with_failure
333 333 @request.session[:user_id] = 2
334 334 post :bulk_update, :ids => [1, 2], :time_entry => { :hours => 'A'}
335 335
336 336 assert_response 302
337 337 assert_match /Failed to save 2 time entrie/, flash[:error]
338 338 end
339 339
340 340 def test_bulk_update_on_different_projects
341 341 @request.session[:user_id] = 2
342 342 # makes user a manager on the other project
343 343 Member.create!(:user_id => 2, :project_id => 3, :role_ids => [1])
344 344
345 345 # update time entry activity
346 346 post :bulk_update, :ids => [1, 2, 4], :time_entry => { :activity_id => 9 }
347 347
348 348 assert_response 302
349 349 # check that the issues were updated
350 350 assert_equal [9, 9, 9], TimeEntry.find_all_by_id([1, 2, 4]).collect {|i| i.activity_id}
351 351 end
352 352
353 353 def test_bulk_update_on_different_projects_without_rights
354 354 @request.session[:user_id] = 3
355 355 user = User.find(3)
356 356 action = { :controller => "timelog", :action => "bulk_update" }
357 357 assert user.allowed_to?(action, TimeEntry.find(1).project)
358 358 assert ! user.allowed_to?(action, TimeEntry.find(5).project)
359 359 post :bulk_update, :ids => [1, 5], :time_entry => { :activity_id => 9 }
360 360 assert_response 403
361 361 end
362 362
363 363 def test_bulk_update_custom_field
364 364 @request.session[:user_id] = 2
365 365 post :bulk_update, :ids => [1, 2], :time_entry => { :custom_field_values => {'10' => '0'} }
366 366
367 367 assert_response 302
368 368 assert_equal ["0", "0"], TimeEntry.find_all_by_id([1, 2]).collect {|i| i.custom_value_for(10).value}
369 369 end
370 370
371 371 def test_post_bulk_update_should_redirect_back_using_the_back_url_parameter
372 372 @request.session[:user_id] = 2
373 373 post :bulk_update, :ids => [1,2], :back_url => '/time_entries'
374 374
375 375 assert_response :redirect
376 376 assert_redirected_to '/time_entries'
377 377 end
378 378
379 379 def test_post_bulk_update_should_not_redirect_back_using_the_back_url_parameter_off_the_host
380 380 @request.session[:user_id] = 2
381 381 post :bulk_update, :ids => [1,2], :back_url => 'http://google.com'
382 382
383 383 assert_response :redirect
384 384 assert_redirected_to :controller => 'timelog', :action => 'index', :project_id => Project.find(1).identifier
385 385 end
386 386
387 387 def test_post_bulk_update_without_edit_permission_should_be_denied
388 388 @request.session[:user_id] = 2
389 389 Role.find_by_name('Manager').remove_permission! :edit_time_entries
390 390 post :bulk_update, :ids => [1,2]
391 391
392 392 assert_response 403
393 393 end
394 394
395 395 def test_destroy
396 396 @request.session[:user_id] = 2
397 397 delete :destroy, :id => 1
398 398 assert_redirected_to :action => 'index', :project_id => 'ecookbook'
399 399 assert_equal I18n.t(:notice_successful_delete), flash[:notice]
400 400 assert_nil TimeEntry.find_by_id(1)
401 401 end
402 402
403 403 def test_destroy_should_fail
404 404 # simulate that this fails (e.g. due to a plugin), see #5700
405 405 TimeEntry.any_instance.expects(:destroy).returns(false)
406 406
407 407 @request.session[:user_id] = 2
408 408 delete :destroy, :id => 1
409 409 assert_redirected_to :action => 'index', :project_id => 'ecookbook'
410 410 assert_equal I18n.t(:notice_unable_delete_time_entry), flash[:error]
411 411 assert_not_nil TimeEntry.find_by_id(1)
412 412 end
413 413
414 414 def test_index_all_projects
415 415 get :index
416 416 assert_response :success
417 417 assert_template 'index'
418 418 assert_not_nil assigns(:total_hours)
419 419 assert_equal "162.90", "%.2f" % assigns(:total_hours)
420 420 assert_tag :form,
421 421 :attributes => {:action => "/time_entries", :id => 'query_form'}
422 422 end
423 423
424 424 def test_index_all_projects_should_show_log_time_link
425 425 @request.session[:user_id] = 2
426 426 get :index
427 427 assert_response :success
428 428 assert_template 'index'
429 429 assert_tag 'a', :attributes => {:href => '/time_entries/new'}, :content => /Log time/
430 430 end
431 431
432 432 def test_index_my_spent_time
433 433 @request.session[:user_id] = 2
434 434 get :index, :user_id => 'me'
435 435 assert_response :success
436 436 assert_template 'index'
437 437 assert assigns(:entries).all? {|entry| entry.user_id == 2}
438 438 end
439 439
440 440 def test_index_at_project_level
441 441 get :index, :project_id => 'ecookbook'
442 442 assert_response :success
443 443 assert_template 'index'
444 444 assert_not_nil assigns(:entries)
445 445 assert_equal 4, assigns(:entries).size
446 446 # project and subproject
447 447 assert_equal [1, 3], assigns(:entries).collect(&:project_id).uniq.sort
448 448 assert_not_nil assigns(:total_hours)
449 449 assert_equal "162.90", "%.2f" % assigns(:total_hours)
450 450 assert_tag :form,
451 451 :attributes => {:action => "/projects/ecookbook/time_entries", :id => 'query_form'}
452 452 end
453 453
454 def test_index_with_display_subprojects_issues_to_false_should_not_include_subproject_entries
455 entry = TimeEntry.generate!(:project => Project.find(3))
456
457 with_settings :display_subprojects_issues => '0' do
458 get :index, :project_id => 'ecookbook'
459 assert_response :success
460 assert_template 'index'
461 assert_not_include entry, assigns(:entries)
462 end
463 end
464
465 def test_index_with_display_subprojects_issues_to_false_and_subproject_filter_should_include_subproject_entries
466 entry = TimeEntry.generate!(:project => Project.find(3))
467
468 with_settings :display_subprojects_issues => '0' do
469 get :index, :project_id => 'ecookbook', :subproject_id => 3
470 assert_response :success
471 assert_template 'index'
472 assert_include entry, assigns(:entries)
473 end
474 end
475
454 476 def test_index_at_project_level_with_date_range
455 477 get :index, :project_id => 'ecookbook',
456 478 :f => ['spent_on'],
457 479 :op => {'spent_on' => '><'},
458 480 :v => {'spent_on' => ['2007-03-20', '2007-04-30']}
459 481 assert_response :success
460 482 assert_template 'index'
461 483 assert_not_nil assigns(:entries)
462 484 assert_equal 3, assigns(:entries).size
463 485 assert_not_nil assigns(:total_hours)
464 486 assert_equal "12.90", "%.2f" % assigns(:total_hours)
465 487 assert_tag :form,
466 488 :attributes => {:action => "/projects/ecookbook/time_entries", :id => 'query_form'}
467 489 end
468 490
469 491 def test_index_at_project_level_with_date_range_using_from_and_to_params
470 492 get :index, :project_id => 'ecookbook', :from => '2007-03-20', :to => '2007-04-30'
471 493 assert_response :success
472 494 assert_template 'index'
473 495 assert_not_nil assigns(:entries)
474 496 assert_equal 3, assigns(:entries).size
475 497 assert_not_nil assigns(:total_hours)
476 498 assert_equal "12.90", "%.2f" % assigns(:total_hours)
477 499 assert_tag :form,
478 500 :attributes => {:action => "/projects/ecookbook/time_entries", :id => 'query_form'}
479 501 end
480 502
481 503 def test_index_at_project_level_with_period
482 504 get :index, :project_id => 'ecookbook',
483 505 :f => ['spent_on'],
484 506 :op => {'spent_on' => '>t-'},
485 507 :v => {'spent_on' => ['7']}
486 508 assert_response :success
487 509 assert_template 'index'
488 510 assert_not_nil assigns(:entries)
489 511 assert_not_nil assigns(:total_hours)
490 512 assert_tag :form,
491 513 :attributes => {:action => "/projects/ecookbook/time_entries", :id => 'query_form'}
492 514 end
493 515
494 516 def test_index_at_issue_level
495 517 get :index, :issue_id => 1
496 518 assert_response :success
497 519 assert_template 'index'
498 520 assert_not_nil assigns(:entries)
499 521 assert_equal 2, assigns(:entries).size
500 522 assert_not_nil assigns(:total_hours)
501 523 assert_equal 154.25, assigns(:total_hours)
502 524 # display all time
503 525 assert_nil assigns(:from)
504 526 assert_nil assigns(:to)
505 527 # TODO: remove /projects/:project_id/issues/:issue_id/time_entries routes
506 528 # to use /issues/:issue_id/time_entries
507 529 assert_tag :form,
508 530 :attributes => {:action => "/projects/ecookbook/issues/1/time_entries", :id => 'query_form'}
509 531 end
510 532
511 533 def test_index_should_sort_by_spent_on_and_created_on
512 534 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)
513 535 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)
514 536 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)
515 537
516 538 get :index, :project_id => 1,
517 539 :f => ['spent_on'],
518 540 :op => {'spent_on' => '><'},
519 541 :v => {'spent_on' => ['2012-06-15', '2012-06-16']}
520 542 assert_response :success
521 543 assert_equal [t2, t1, t3], assigns(:entries)
522 544
523 545 get :index, :project_id => 1,
524 546 :f => ['spent_on'],
525 547 :op => {'spent_on' => '><'},
526 548 :v => {'spent_on' => ['2012-06-15', '2012-06-16']},
527 549 :sort => 'spent_on'
528 550 assert_response :success
529 551 assert_equal [t3, t1, t2], assigns(:entries)
530 552 end
531 553
532 554 def test_index_with_filter_on_issue_custom_field
533 555 issue = Issue.generate!(:project_id => 1, :tracker_id => 1, :custom_field_values => {2 => 'filter_on_issue_custom_field'})
534 556 entry = TimeEntry.generate!(:issue => issue, :hours => 2.5)
535 557
536 558 get :index, :f => ['issue.cf_2'], :op => {'issue.cf_2' => '='}, :v => {'issue.cf_2' => ['filter_on_issue_custom_field']}
537 559 assert_response :success
538 560 assert_equal [entry], assigns(:entries)
539 561 end
540 562
541 563 def test_index_with_issue_custom_field_column
542 564 issue = Issue.generate!(:project_id => 1, :tracker_id => 1, :custom_field_values => {2 => 'filter_on_issue_custom_field'})
543 565 entry = TimeEntry.generate!(:issue => issue, :hours => 2.5)
544 566
545 567 get :index, :c => %w(project spent_on issue comments hours issue.cf_2)
546 568 assert_response :success
547 569 assert_include :'issue.cf_2', assigns(:query).column_names
548 570 assert_select 'td.issue_cf_2', :text => 'filter_on_issue_custom_field'
549 571 end
550 572
551 573 def test_index_with_time_entry_custom_field_column
552 574 field = TimeEntryCustomField.generate!(:field_format => 'string')
553 575 entry = TimeEntry.generate!(:hours => 2.5, :custom_field_values => {field.id => 'CF Value'})
554 576 field_name = "cf_#{field.id}"
555 577
556 578 get :index, :c => ["hours", field_name]
557 579 assert_response :success
558 580 assert_include field_name.to_sym, assigns(:query).column_names
559 581 assert_select "td.#{field_name}", :text => 'CF Value'
560 582 end
561 583
562 584 def test_index_with_time_entry_custom_field_sorting
563 585 field = TimeEntryCustomField.generate!(:field_format => 'string', :name => 'String Field')
564 586 TimeEntry.generate!(:hours => 2.5, :custom_field_values => {field.id => 'CF Value 1'})
565 587 TimeEntry.generate!(:hours => 2.5, :custom_field_values => {field.id => 'CF Value 3'})
566 588 TimeEntry.generate!(:hours => 2.5, :custom_field_values => {field.id => 'CF Value 2'})
567 589 field_name = "cf_#{field.id}"
568 590
569 591 get :index, :c => ["hours", field_name], :sort => field_name
570 592 assert_response :success
571 593 assert_include field_name.to_sym, assigns(:query).column_names
572 594 assert_select "th a.sort", :text => 'String Field'
573 595
574 596 # Make sure that values are properly sorted
575 597 values = assigns(:entries).map {|e| e.custom_field_value(field)}.compact
576 598 assert_equal 3, values.size
577 599 assert_equal values.sort, values
578 600 end
579 601
580 602 def test_index_atom_feed
581 603 get :index, :project_id => 1, :format => 'atom'
582 604 assert_response :success
583 605 assert_equal 'application/atom+xml', @response.content_type
584 606 assert_not_nil assigns(:items)
585 607 assert assigns(:items).first.is_a?(TimeEntry)
586 608 end
587 609
588 610 def test_index_at_project_level_should_include_csv_export_dialog
589 611 get :index, :project_id => 'ecookbook',
590 612 :f => ['spent_on'],
591 613 :op => {'spent_on' => '>='},
592 614 :v => {'spent_on' => ['2007-04-01']},
593 615 :c => ['spent_on', 'user']
594 616 assert_response :success
595 617
596 618 assert_select '#csv-export-options' do
597 619 assert_select 'form[action=?][method=get]', '/projects/ecookbook/time_entries.csv' do
598 620 # filter
599 621 assert_select 'input[name=?][value=?]', 'f[]', 'spent_on'
600 622 assert_select 'input[name=?][value=?]', 'op[spent_on]', '&gt;='
601 623 assert_select 'input[name=?][value=?]', 'v[spent_on][]', '2007-04-01'
602 624 # columns
603 625 assert_select 'input[name=?][value=?]', 'c[]', 'spent_on'
604 626 assert_select 'input[name=?][value=?]', 'c[]', 'user'
605 627 assert_select 'input[name=?]', 'c[]', 2
606 628 end
607 629 end
608 630 end
609 631
610 632 def test_index_cross_project_should_include_csv_export_dialog
611 633 get :index
612 634 assert_response :success
613 635
614 636 assert_select '#csv-export-options' do
615 637 assert_select 'form[action=?][method=get]', '/time_entries.csv'
616 638 end
617 639 end
618 640
619 641 def test_index_at_issue_level_should_include_csv_export_dialog
620 642 get :index, :project_id => 'ecookbook', :issue_id => 3
621 643 assert_response :success
622 644
623 645 assert_select '#csv-export-options' do
624 646 assert_select 'form[action=?][method=get]', '/projects/ecookbook/issues/3/time_entries.csv'
625 647 end
626 648 end
627 649
628 650 def test_index_csv_all_projects
629 651 Setting.date_format = '%m/%d/%Y'
630 652 get :index, :format => 'csv'
631 653 assert_response :success
632 654 assert_equal 'text/csv; header=present', response.content_type
633 655 end
634 656
635 657 def test_index_csv
636 658 Setting.date_format = '%m/%d/%Y'
637 659 get :index, :project_id => 1, :format => 'csv'
638 660 assert_response :success
639 661 assert_equal 'text/csv; header=present', response.content_type
640 662 end
641 663 end
General Comments 0
You need to be logged in to leave comments. Login now