diff options
| author | Jean-Philippe Lang <jp_lang@yahoo.fr> | 2015-05-30 09:41:58 +0000 |
|---|---|---|
| committer | Jean-Philippe Lang <jp_lang@yahoo.fr> | 2015-05-30 09:41:58 +0000 |
| commit | ff2532e52d406bb29509ee63b8329a70ddfc5c52 (patch) | |
| tree | 6d64f04519f957d31fe0ec986f50935f95e8740a /test/functional | |
| parent | 78384d147a48a2d690c35f030232e232800dd919 (diff) | |
| download | redmine-ff2532e52d406bb29509ee63b8329a70ddfc5c52.tar.gz redmine-ff2532e52d406bb29509ee63b8329a70ddfc5c52.zip | |
Fixed test failures introduced by r14288 (#19656).
git-svn-id: http://svn.redmine.org/redmine/trunk@14291 e93f8b46-1217-0410-a6f0-8f06a7374b81
Diffstat (limited to 'test/functional')
| -rw-r--r-- | test/functional/project_enumerations_controller_test.rb | 2 | ||||
| -rw-r--r-- | test/functional/timelog_controller_test.rb | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/test/functional/project_enumerations_controller_test.rb b/test/functional/project_enumerations_controller_test.rb index b52fec613..943c086f7 100644 --- a/test/functional/project_enumerations_controller_test.rb +++ b/test/functional/project_enumerations_controller_test.rb @@ -153,7 +153,7 @@ class ProjectEnumerationsControllerTest < ActionController::TestCase # second one is a dupicate parent = TimeEntryActivity.find(9) 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), :issue_id => 3, :activity_id => 10, :spent_on => '2009-01-01'}) assert_equal 3, TimeEntry.where(:activity_id => 9, :project_id => 1).count diff --git a/test/functional/timelog_controller_test.rb b/test/functional/timelog_controller_test.rb index 1d4097ce2..68fde87f0 100644 --- a/test/functional/timelog_controller_test.rb +++ b/test/functional/timelog_controller_test.rb @@ -113,7 +113,7 @@ class TimelogControllerTest < ActionController::TestCase 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! + te.save!(:validate => false) @request.session[:user_id] = 1 get :edit, :project_id => 1, :id => 1 |