##// END OF EJS Templates
Fixed that project activity without parent hides system activities and removed duplicated code....
Fixed that project activity without parent hides system activities and removed duplicated code. git-svn-id: http://svn.redmine.org/redmine/trunk@14292 e93f8b46-1217-0410-a6f0-8f06a7374b81

File last commit:

r13909:ff2532e52d40
r13910:48d40a8c8884
Show More
time_entry_query_test.rb
47 lines | 2.0 KiB | text/x-ruby | RubyLexer
/ test / unit / time_entry_query_test.rb
# Redmine - project management software
# Copyright (C) 2006-2015 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 TimeEntryQueryTest < ActiveSupport::TestCase
fixtures :issues, :projects, :users,
:members, :roles, :member_roles,
:trackers, :issue_statuses,
:projects_trackers,
:journals, :journal_details,
:issue_categories, :enumerations,
:groups_users,
:enabled_modules
def test_activity_filter_should_consider_system_and_project_activities
TimeEntry.delete_all
system = TimeEntryActivity.create!(:name => 'Foo')
TimeEntry.generate!(:activity => system, :hours => 1.0)
override = TimeEntryActivity.create!(:name => 'Foo', :parent_id => system.id, :project_id => 1)
other = TimeEntryActivity.create!(:name => 'Bar')
TimeEntry.generate!(:activity => override, :hours => 2.0)
TimeEntry.generate!(:activity => other, :hours => 4.0)
query = TimeEntryQuery.new(:name => '_')
query.add_filter('activity_id', '=', [system.id.to_s])
assert_equal 3.0, query.results_scope.sum(:hours)
query = TimeEntryQuery.new(:name => '_')
query.add_filter('activity_id', '!', [system.id.to_s])
assert_equal 4.0, query.results_scope.sum(:hours)
end
end