jro_apps/redmine Commit - r5195:c2baf187ac66

add functional tests for bulk edit time entries (#7996)....

Toshi MARUYAMA -

r5195:c2baf187ac66

parent child

Context file:

r5195:c2baf187ac66

Collapse all files

test/fixtures/custom_fields.yml +14 0

             ---
             custom_fields_001:
               name: Database
               min_length: 0
               regexp: ""
               is_for_all: true
               is_filter: true
               type: IssueCustomField
               max_length: 0
               possible_values:
               - MySQL
               - PostgreSQL
               - Oracle
               id: 1
               is_required: false
               field_format: list
               default_value: ""
               editable: true
             custom_fields_002:
               name: Searchable field
               min_length: 1
               regexp: ""
               is_for_all: true
               type: IssueCustomField
               max_length: 100
               possible_values: ""
               id: 2
               is_required: false
               field_format: string
               searchable: true
               default_value: "Default string"
               editable: true
             custom_fields_003:
               name: Development status
               min_length: 0
               regexp: ""
               is_for_all: false
               is_filter: true
               type: ProjectCustomField
               max_length: 0
               possible_values:
               - Stable
               - Beta
               - Alpha
               - Planning
               id: 3
               is_required: false
               field_format: list
               default_value: ""
               editable: true
             custom_fields_004:
               name: Phone number
               min_length: 0
               regexp: ""
               is_for_all: false
               type: UserCustomField
               max_length: 0
               possible_values: ""
               id: 4
               is_required: false
               field_format: string
               default_value: ""
               editable: true
             custom_fields_005:
               name: Money
               min_length: 0
               regexp: ""
               is_for_all: false
               type: UserCustomField
               max_length: 0
               possible_values: ""
               id: 5
               is_required: false
               field_format: float
               default_value: ""
               editable: true
             custom_fields_006:
               name: Float field
               min_length: 0
               regexp: ""
               is_for_all: true
               type: IssueCustomField
               max_length: 0
               possible_values: ""
               id: 6
               is_required: false
               field_format: float
               default_value: ""
               editable: true
             custom_fields_007:
               name: Billable
               min_length: 0
               regexp: ""
               is_for_all: false
               is_filter: true
               type: TimeEntryActivityCustomField
               max_length: 0
               possible_values: ""
               id: 7
               is_required: false
               field_format: bool
               default_value: ""
               editable: true
             custom_fields_008:
               name: Custom date
               min_length: 0
               regexp: ""
               is_for_all: true
               is_filter: false
               type: IssueCustomField
               max_length: 0
               possible_values: ""
               id: 8
               is_required: false
               field_format: date
               default_value: ""
               editable: true
             custom_fields_009:
               name: Project 1 cf
               min_length: 0
               regexp: ""
               is_for_all: false
               is_filter: true
               type: IssueCustomField
               max_length: 0
               possible_values: ""
               id: 9
               is_required: false
               field_format: date
               default_value: ""
               editable: true
+            custom_fields_010:
+              name: Overtime
+              min_length: 0
+              regexp: ""
+              is_for_all: false
+              is_filter: false
+              type: TimeEntryCustomField
+              max_length: 0
+              possible_values: ""
+              id: 10
+              is_required: false
+              field_format: bool
+              default_value: 0
+              editable: true

test/fixtures/time_entries.yml +14 0

             ---
             time_entries_001:
               created_on: 2007-03-23 12:54:18 +01:00
               tweek: 12
               tmonth: 3
               project_id: 1
               comments: My hours
               updated_on: 2007-03-23 12:54:18 +01:00
               activity_id: 9
               spent_on: 2007-03-23
               issue_id: 1
               id: 1
               hours: 4.25
               user_id: 2
               tyear: 2007
             time_entries_002:
               created_on: 2007-03-23 14:11:04 +01:00
               tweek: 11
               tmonth: 3
               project_id: 1
               comments: ""
               updated_on: 2007-03-23 14:11:04 +01:00
               activity_id: 9
               spent_on: 2007-03-12
               issue_id: 1
               id: 2
               hours: 150.0
               user_id: 1
               tyear: 2007
             time_entries_003:
               created_on: 2007-04-21 12:20:48 +02:00
               tweek: 16
               tmonth: 4
               project_id: 1
               comments: ""
               updated_on: 2007-04-21 12:20:48 +02:00
               activity_id: 9
               spent_on: 2007-04-21
               issue_id: 3
               id: 3
               hours: 1.0
               user_id: 1
               tyear: 2007
             time_entries_004:
               created_on: 2007-04-22 12:20:48 +02:00
               tweek: 16
               tmonth: 4
               project_id: 3
               comments: Time spent on a subproject
               updated_on: 2007-04-22 12:20:48 +02:00
               activity_id: 10
               spent_on: 2007-04-22
               issue_id:
               id: 4
               hours: 7.65
               user_id: 1
               tyear: 2007
+            time_entries_005:
+              created_on: 2011-03-22 12:20:48 +02:00
+              tweek: 12
+              tmonth: 3
+              project_id: 5
+              comments: Time spent on a subproject
+              updated_on: 2011-03-22 12:20:48 +02:00
+              activity_id: 10
+              spent_on: 2011-03-22
+              issue_id:
+              id: 5
+              hours: 7.65
+              user_id: 1
+              tyear: 2011

test/functional/timelog_controller_test.rb +75 -4

             # -*- coding: utf-8 -*-
             # redMine - project management software
             # Copyright (C) 2006-2007  Jean-Philippe Lang
             #
             # This program is free software; you can redistribute it and/or
             # modify it under the terms of the GNU General Public License
             # as published by the Free Software Foundation; either version 2
             # of the License, or (at your option) any later version.
             #
             # This program is distributed in the hope that it will be useful,
             # but WITHOUT ANY WARRANTY; without even the implied warranty of
             # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
             # GNU General Public License for more details.
             #
             # You should have received a copy of the GNU General Public License
             # along with this program; if not, write to the Free Software
             # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
             require File.expand_path('../../test_helper', __FILE__)
             require 'timelog_controller'
             # Re-raise errors caught by the controller.
             class TimelogController; def rescue_action(e) raise e end; end
             class TimelogControllerTest < ActionController::TestCase
               fixtures :projects, :enabled_modules, :roles, :members, :member_roles, :issues, :time_entries, :users, :trackers, :enumerations, :issue_statuses, :custom_fields, :custom_values
               def setup
                 @controller = TimelogController.new
                 @request    = ActionController::TestRequest.new
                 @response   = ActionController::TestResponse.new
               end
               def test_get_new
                 @request.session[:user_id] = 3
                 get :new, :project_id => 1
                 assert_response :success
                 assert_template 'edit'
                 # Default activity selected
                 assert_tag :tag => 'option', :attributes => { :selected => 'selected' },
                                              :content => 'Development'
               end
               def test_get_new_should_only_show_active_time_entry_activities
                 @request.session[:user_id] = 3
                 get :new, :project_id => 1
                 assert_response :success
                 assert_template 'edit'
                 assert_no_tag :tag => 'option', :content => 'Inactive Activity'
               end
               def test_get_edit_existing_time
                 @request.session[:user_id] = 2
                 get :edit, :id => 2, :project_id => nil
                 assert_response :success
                 assert_template 'edit'
                 # Default activity selected
                 assert_tag :tag => 'form', :attributes => { :action => '/projects/ecookbook/time_entries/2' }
               end
               def test_get_edit_with_an_existing_time_entry_with_inactive_activity
                 te = TimeEntry.find(1)
                 te.activity = TimeEntryActivity.find_by_name("Inactive Activity")
                 te.save!
                 @request.session[:user_id] = 1
                 get :edit, :project_id => 1, :id => 1
                 assert_response :success
                 assert_template 'edit'
                 # Blank option since nothing is pre-selected
                 assert_tag :tag => 'option', :content => '--- Please select ---'
               end
               def test_post_create
                 # TODO: should POST to issues’ time log instead of project. change form
                 # and routing
                 @request.session[:user_id] = 3
                 post :create, :project_id => 1,
                             :time_entry => {:comments => 'Some work on TimelogControllerTest',
                                             # Not the default activity
                                             :activity_id => '11',
                                             :spent_on => '2008-03-14',
                                             :issue_id => '1',
                                             :hours => '7.3'}
                 assert_redirected_to :action => 'index', :project_id => 'ecookbook'
                 i = Issue.find(1)
                 t = TimeEntry.find_by_comments('Some work on TimelogControllerTest')
                 assert_not_nil t
                 assert_equal 11, t.activity_id
                 assert_equal 7.3, t.hours
                 assert_equal 3, t.user_id
                 assert_equal i, t.issue
                 assert_equal i.project, t.project
               end
               def test_post_create_with_blank_issue
                 # TODO: should POST to issues’ time log instead of project. change form
                 # and routing
                 @request.session[:user_id] = 3
                 post :create, :project_id => 1,
                             :time_entry => {:comments => 'Some work on TimelogControllerTest',
                                             # Not the default activity
                                             :activity_id => '11',
                                             :issue_id => '',
                                             :spent_on => '2008-03-14',
                                             :hours => '7.3'}
                 assert_redirected_to :action => 'index', :project_id => 'ecookbook'
                 t = TimeEntry.find_by_comments('Some work on TimelogControllerTest')
                 assert_not_nil t
                 assert_equal 11, t.activity_id
                 assert_equal 7.3, t.hours
                 assert_equal 3, t.user_id
               end
               def test_update
                 entry = TimeEntry.find(1)
                 assert_equal 1, entry.issue_id
                 assert_equal 2, entry.user_id
                 @request.session[:user_id] = 1
                 put :update, :id => 1,
                             :time_entry => {:issue_id => '2',
                                             :hours => '8'}
                 assert_redirected_to :action => 'index', :project_id => 'ecookbook'
                 entry.reload
                 assert_equal 8, entry.hours
                 assert_equal 2, entry.issue_id
                 assert_equal 2, entry.user_id
               end
+              def test_get_bulk_edit
+                @request.session[:user_id] = 2
+                get :bulk_edit, :ids => [1, 2]
+                assert_response :success
+                assert_template 'bulk_edit'
+                # System wide custom field
+                assert_tag :select, :attributes => {:name => 'time_entry[custom_field_values][10]'}
+              end
+              def test_get_bulk_edit_on_different_projects
+                @request.session[:user_id] = 2
+                get :bulk_edit, :ids => [1, 2, 6]
+                assert_response :success
+                assert_template 'bulk_edit'
+              end
+              def test_bulk_update
+                @request.session[:user_id] = 2
+                # update time entry activity
+                post :bulk_update, :ids => [1, 2], :time_entry => { :activity_id => 9}
+                assert_response 302
+                # check that the issues were updated
+                assert_equal [9, 9], TimeEntry.find_all_by_id([1, 2]).collect {|i| i.activity_id}
+              end
+              def test_bulk_update_on_different_projects
+                @request.session[:user_id] = 2
+                # update time entry activity
+                post :bulk_update, :ids => [1, 2, 4], :time_entry => { :activity_id => 9 }
+                assert_response 302
+                # check that the issues were updated
+                assert_equal [9, 9, 9], TimeEntry.find_all_by_id([1, 2, 4]).collect {|i| i.activity_id}
+              end
+              def test_bulk_update_on_different_projects_without_rights
+                @request.session[:user_id] = 3
+                user = User.find(3)
+                action = { :controller => "timelog", :action => "bulk_update" }
+                assert user.allowed_to?(action, TimeEntry.find(1).project)
+                assert ! user.allowed_to?(action, TimeEntry.find(5).project)
+                post :bulk_update, :ids => [1, 5], :time_entry => { :activity_id => 9 }
+                assert_response 403
+              end
+              def test_bulk_update_custom_field
+                @request.session[:user_id] = 2
+                post :bulk_update, :ids => [1, 2], :time_entry => { :custom_field_values => {'10' => '0'} }
+                assert_response 302
+                assert_equal ["0", "0"], TimeEntry.find_all_by_id([1, 2]).collect {|i| i.custom_value_for(10).value}
+              end
+              def test_post_bulk_update_should_redirect_back_using_the_back_url_parameter
+                @request.session[:user_id] = 2
+                post :bulk_update, :ids => [1,2], :back_url => '/time_entries'
+                assert_response :redirect
+                assert_redirected_to '/time_entries'
+              end
+              def test_post_bulk_update_should_not_redirect_back_using_the_back_url_parameter_off_the_host
+                @request.session[:user_id] = 2
+                post :bulk_update, :ids => [1,2], :back_url => 'http://google.com'
+                assert_response :redirect
+                assert_redirected_to :controller => 'timelog', :action => 'index', :project_id => Project.find(1).identifier
+              end
               def test_destroy
                 @request.session[:user_id] = 2
                 delete :destroy, :id => 1
                 assert_redirected_to :action => 'index', :project_id => 'ecookbook'
                 assert_equal I18n.t(:notice_successful_delete), flash[:notice]
                 assert_nil TimeEntry.find_by_id(1)
               end
               def test_destroy_should_fail
                 # simulate that this fails (e.g. due to a plugin), see #5700
                 TimeEntry.class_eval do
                   before_destroy :stop_callback_chain
                   def stop_callback_chain ; return false ; end
                 end
                 @request.session[:user_id] = 2
                 delete :destroy, :id => 1
                 assert_redirected_to :action => 'index', :project_id => 'ecookbook'
                 assert_equal I18n.t(:notice_unable_delete_time_entry), flash[:error]
                 assert_not_nil TimeEntry.find_by_id(1)
                 # remove the simulation
                 TimeEntry.before_destroy.reject! {|callback| callback.method == :stop_callback_chain }
               end
               def test_index_all_projects
                 get :index
                 assert_response :success
                 assert_template 'index'
                 assert_not_nil assigns(:total_hours)
                 assert_equal "162.90", "%.2f" % assigns(:total_hours)
                 assert_tag :form,
                   :attributes => {:action => "/time_entries", :id => 'query_form'}
               end
               def test_index_at_project_level
                 get :index, :project_id => 'ecookbook'
                 assert_response :success
                 assert_template 'index'
                 assert_not_nil assigns(:entries)
                 assert_equal 4, assigns(:entries).size
                 # project and subproject
                 assert_equal [1, 3], assigns(:entries).collect(&:project_id).uniq.sort
                 assert_not_nil assigns(:total_hours)
                 assert_equal "162.90", "%.2f" % assigns(:total_hours)
                 # display all time by default
                 assert_equal '2007-03-12'.to_date, assigns(:from)
                 assert_equal '2007-04-22'.to_date, assigns(:to)
                 assert_tag :form,
                   :attributes => {:action => "/projects/ecookbook/time_entries", :id => 'query_form'}
               end
               def test_index_at_project_level_with_date_range
                 get :index, :project_id => 'ecookbook', :from => '2007-03-20', :to => '2007-04-30'
                 assert_response :success
                 assert_template 'index'
                 assert_not_nil assigns(:entries)
                 assert_equal 3, assigns(:entries).size
                 assert_not_nil assigns(:total_hours)
                 assert_equal "12.90", "%.2f" % assigns(:total_hours)
                 assert_equal '2007-03-20'.to_date, assigns(:from)
                 assert_equal '2007-04-30'.to_date, assigns(:to)
                 assert_tag :form,
                   :attributes => {:action => "/projects/ecookbook/time_entries", :id => 'query_form'}
               end
               def test_index_at_project_level_with_period
                 get :index, :project_id => 'ecookbook', :period => '7_days'
                 assert_response :success
                 assert_template 'index'
                 assert_not_nil assigns(:entries)
                 assert_not_nil assigns(:total_hours)
                 assert_equal Date.today - 7, assigns(:from)
                 assert_equal Date.today, assigns(:to)
                 assert_tag :form,
                   :attributes => {:action => "/projects/ecookbook/time_entries", :id => 'query_form'}
               end
               def test_index_one_day
                 get :index, :project_id => 'ecookbook', :from => "2007-03-23", :to => "2007-03-23"
                 assert_response :success
                 assert_template 'index'
                 assert_not_nil assigns(:total_hours)
                 assert_equal "4.25", "%.2f" % assigns(:total_hours)
                 assert_tag :form,
                   :attributes => {:action => "/projects/ecookbook/time_entries", :id => 'query_form'}
               end
               def test_index_at_issue_level
                 get :index, :issue_id => 1
                 assert_response :success
                 assert_template 'index'
                 assert_not_nil assigns(:entries)
                 assert_equal 2, assigns(:entries).size
                 assert_not_nil assigns(:total_hours)
                 assert_equal 154.25, assigns(:total_hours)
                 # display all time based on what's been logged
                 assert_equal '2007-03-12'.to_date, assigns(:from)
                 assert_equal '2007-04-22'.to_date, assigns(:to)
                 # TODO: remove /projects/:project_id/issues/:issue_id/time_entries routes
                 # to use /issues/:issue_id/time_entries
                 assert_tag :form,
                   :attributes => {:action => "/projects/ecookbook/issues/1/time_entries", :id => 'query_form'}
               end
               def test_index_atom_feed
                 get :index, :project_id => 1, :format => 'atom'
                 assert_response :success
                 assert_equal 'application/atom+xml', @response.content_type
                 assert_not_nil assigns(:items)
                 assert assigns(:items).first.is_a?(TimeEntry)
               end
               def test_index_all_projects_csv_export
                 Setting.date_format = '%m/%d/%Y'
                 get :index, :format => 'csv'
                 assert_response :success
                 assert_equal 'text/csv', @response.content_type
-                assert @response.body.include?("Date,User,Activity,Project,Issue,Tracker,Subject,Hours,Comment\n")
+                assert @response.body.include?("Date,User,Activity,Project,Issue,Tracker,Subject,Hours,Comment,Overtime\n")
-                assert @response.body.include?("\n04/21/2007,redMine Admin,Design,eCookbook,3,Bug,Error 281 when updating a recipe,1.0,\"\"\n")
+                assert @response.body.include?("\n04/21/2007,redMine Admin,Design,eCookbook,3,Bug,Error 281 when updating a recipe,1.0,\"\",\"\"\n")
               end
               def test_index_csv_export
                 Setting.date_format = '%m/%d/%Y'
                 get :index, :project_id => 1, :format => 'csv'
                 assert_response :success
                 assert_equal 'text/csv', @response.content_type
-                assert @response.body.include?("Date,User,Activity,Project,Issue,Tracker,Subject,Hours,Comment\n")
+                assert @response.body.include?("Date,User,Activity,Project,Issue,Tracker,Subject,Hours,Comment,Overtime\n")
-                assert @response.body.include?("\n04/21/2007,redMine Admin,Design,eCookbook,3,Bug,Error 281 when updating a recipe,1.0,\"\"\n")
+                assert @response.body.include?("\n04/21/2007,redMine Admin,Design,eCookbook,3,Bug,Error 281 when updating a recipe,1.0,\"\",\"\"\n")
               end
             end

test/unit/time_entry_activity_test.rb +1 -1

             # redMine - project management software
             # Copyright (C) 2006-2008  Jean-Philippe Lang
             #
             # This program is free software; you can redistribute it and/or
             # modify it under the terms of the GNU General Public License
             # as published by the Free Software Foundation; either version 2
             # of the License, or (at your option) any later version.
             #
             # This program is distributed in the hope that it will be useful,
             # but WITHOUT ANY WARRANTY; without even the implied warranty of
             # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
             # GNU General Public License for more details.
             #
             # You should have received a copy of the GNU General Public License
             # along with this program; if not, write to the Free Software
             # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
             require File.expand_path('../../test_helper', __FILE__)
             class TimeEntryActivityTest < ActiveSupport::TestCase
               fixtures :enumerations, :time_entries
               def test_should_be_an_enumeration
                 assert TimeEntryActivity.ancestors.include?(Enumeration)
               end
               def test_objects_count
                 assert_equal 3, TimeEntryActivity.find_by_name("Design").objects_count
-                assert_equal 1, TimeEntryActivity.find_by_name("Development").objects_count
+                assert_equal 2, TimeEntryActivity.find_by_name("Development").objects_count
               end
               def test_option_name
                 assert_equal :enumeration_activities, TimeEntryActivity.new.option_name
               end
               def test_create_with_custom_field
                 field = TimeEntryActivityCustomField.find_by_name('Billable')
                 e = TimeEntryActivity.new(:name => 'Custom Data')
                 e.custom_field_values = {field.id => "1"}
                 assert e.save
                 e.reload
                 assert_equal "1", e.custom_value_for(field).value
               end
               def test_create_without_required_custom_field_should_fail
                 field = TimeEntryActivityCustomField.find_by_name('Billable')
                 field.update_attribute(:is_required, true)
                 e = TimeEntryActivity.new(:name => 'Custom Data')
                 assert !e.save
                 assert_equal I18n.translate('activerecord.errors.messages.invalid'), e.errors.on(:custom_values)
               end
               def test_create_with_required_custom_field_should_succeed
                 field = TimeEntryActivityCustomField.find_by_name('Billable')
                 field.update_attribute(:is_required, true)
                 e = TimeEntryActivity.new(:name => 'Custom Data')
                 e.custom_field_values = {field.id => "1"}
                 assert e.save
               end
               def test_update_issue_with_required_custom_field_change
                 field = TimeEntryActivityCustomField.find_by_name('Billable')
                 field.update_attribute(:is_required, true)
                 e = TimeEntryActivity.find(10)
                 assert e.available_custom_fields.include?(field)
                 # No change to custom field, record can be saved
                 assert e.save
                 # Blanking custom field, save should fail
                 e.custom_field_values = {field.id => ""}
                 assert !e.save
                 assert e.errors.on(:custom_values)
                 # Update custom field to valid value, save should succeed
                 e.custom_field_values = {field.id => "0"}
                 assert e.save
                 e.reload
                 assert_equal "0", e.custom_value_for(field).value
               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