Nemcio/Redmine
1
0
Fork 0
mirror of https://github.com/redmine/redmine.git synced 2025-11-01 19:05:51 +01:00
Code Issues Packages Projects Releases Activity

Fixed test failures introduced by r14288 (#19656).

Browse Source 
git-svn-id: http://svn.redmine.org/redmine/trunk@14291 e93f8b46-1217-0410-a6f0-8f06a7374b81
This commit is contained in:
Jean-Philippe Lang
2015-05-30 09:41:58 +00:00
parent 78384d147a
commit ff2532e52d
4 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
test/functional/project_enumerations_controller_test.rb
View File

@@ -153,7 +153,7 @@ class ProjectEnumerationsControllerTest < ActionController::TestCase
# second one is a dupicate # second one is a dupicate
parent = TimeEntryActivity.find(9) parent = TimeEntryActivity.find(9)
TimeEntryActivity.create!({:name => parent.name, :project_id => 1, TimeEntryActivity.create!({:name => parent.name, :project_id => 1,
:position => parent.position, :active => true}) :position => parent.position, :active => true, :parent_id => 9})
TimeEntry.create!({:project_id => 1, :hours => 1.0, :user => User.find(1), TimeEntry.create!({:project_id => 1, :hours => 1.0, :user => User.find(1),
:issue_id => 3, :activity_id => 10, :spent_on => '2009-01-01'}) :issue_id => 3, :activity_id => 10, :spent_on => '2009-01-01'})
assert_equal 3, TimeEntry.where(:activity_id => 9, :project_id => 1).count assert_equal 3, TimeEntry.where(:activity_id => 9, :project_id => 1).count

2
test/functional/timelog_controller_test.rb
View File

@@ -113,7 +113,7 @@ class TimelogControllerTest < ActionController::TestCase
def test_get_edit_with_an_existing_time_entry_with_inactive_activity def test_get_edit_with_an_existing_time_entry_with_inactive_activity
te = TimeEntry.find(1) te = TimeEntry.find(1)
te.activity = TimeEntryActivity.find_by_name("Inactive Activity") te.activity = TimeEntryActivity.find_by_name("Inactive Activity")
te.save! te.save!(:validate => false)
@request.session[:user_id] = 1 @request.session[:user_id] = 1
get :edit, :project_id => 1, :id => 1 get :edit, :project_id => 1, :id => 1

12
test/unit/time_entry_activity_test.rb
View File

@@ -105,13 +105,13 @@ class TimeEntryActivityTest < ActiveSupport::TestCase
def test_destroying_a_system_activity_should_reassign_children_activities def test_destroying_a_system_activity_should_reassign_children_activities
project = Project.generate! project = Project.generate!
system_activity = TimeEntryActivity.create!(:name => 'Activity') entries = []
project_activity = TimeEntryActivity.create!(:name => 'Activity', :project => project, :parent_id => system_activity.id)
entries = [ system_activity = TimeEntryActivity.create!(:name => 'Activity')
TimeEntry.generate!(:project => project, :activity => system_activity), entries << TimeEntry.generate!(:project => project, :activity => system_activity)
TimeEntry.generate!(:project => project, :activity => project_activity)
] project_activity = TimeEntryActivity.create!(:name => 'Activity', :project => project, :parent_id => system_activity.id)
entries << TimeEntry.generate!(:project => project.reload, :activity => project_activity)
assert_difference 'TimeEntryActivity.count', -2 do assert_difference 'TimeEntryActivity.count', -2 do
assert_nothing_raised do assert_nothing_raised do

2
test/unit/time_entry_query_test.rb
View File

@@ -30,9 +30,9 @@ class TimeEntryQueryTest < ActiveSupport::TestCase
def test_activity_filter_should_consider_system_and_project_activities def test_activity_filter_should_consider_system_and_project_activities
TimeEntry.delete_all TimeEntry.delete_all
system = TimeEntryActivity.create!(:name => 'Foo') system = TimeEntryActivity.create!(:name => 'Foo')
TimeEntry.generate!(:activity => system, :hours => 1.0)
override = TimeEntryActivity.create!(:name => 'Foo', :parent_id => system.id, :project_id => 1) override = TimeEntryActivity.create!(:name => 'Foo', :parent_id => system.id, :project_id => 1)
other = TimeEntryActivity.create!(:name => 'Bar') other = TimeEntryActivity.create!(:name => 'Bar')
TimeEntry.generate!(:activity => system, :hours => 1.0)
TimeEntry.generate!(:activity => override, :hours => 2.0) TimeEntry.generate!(:activity => override, :hours => 2.0)
TimeEntry.generate!(:activity => other, :hours => 4.0) TimeEntry.generate!(:activity => other, :hours => 4.0)