summaryrefslogtreecommitdiffstats
path: root/test/functional
diff options
context:
space:
mode:
authorJean-Philippe Lang <jp_lang@yahoo.fr>2008-04-30 09:09:28 +0000
committerJean-Philippe Lang <jp_lang@yahoo.fr>2008-04-30 09:09:28 +0000
commitf1ae453688aef224d5d8dd9e715811a7517e1bb2 (patch)
treeade26e1a32feb200bb0aa1d6edf7a3ad36709204 /test/functional
parent4525a7429aecbdf44a62fc3c8adb972727ba19ad (diff)
downloadredmine-f1ae453688aef224d5d8dd9e715811a7517e1bb2.tar.gz
redmine-f1ae453688aef224d5d8dd9e715811a7517e1bb2.zip
Fixed: Updating tickets add a time log with zero hours (#1147).
git-svn-id: http://redmine.rubyforge.org/svn/trunk@1385 e93f8b46-1217-0410-a6f0-8f06a7374b81
Diffstat (limited to 'test/functional')
-rw-r--r--test/functional/issues_controller_test.rb25
1 files changed, 16 insertions, 9 deletions
diff --git a/test/functional/issues_controller_test.rb b/test/functional/issues_controller_test.rb
index 042a8f3f2..a6d2ca6e3 100644
--- a/test/functional/issues_controller_test.rb
+++ b/test/functional/issues_controller_test.rb
@@ -169,13 +169,15 @@ class IssuesControllerTest < Test::Unit::TestCase
:issue => {:tracker_id => 1,
:subject => 'This is the test_new issue',
:description => 'This is the description',
- :priority_id => 5},
+ :priority_id => 5,
+ :estimated_hours => ''},
:custom_fields => {'2' => 'Value for field 2'}
assert_redirected_to 'issues/show'
issue = Issue.find_by_subject('This is the test_new issue')
assert_not_nil issue
assert_equal 2, issue.author_id
+ assert_nil issue.estimated_hours
v = issue.custom_values.find_by_custom_field_id(2)
assert_not_nil v
assert_equal 'Value for field 2', v.value
@@ -254,10 +256,13 @@ class IssuesControllerTest < Test::Unit::TestCase
issue = Issue.find(1)
assert_equal 1, issue.status_id
@request.session[:user_id] = 2
- post :edit,
- :id => 1,
- :issue => { :status_id => 2, :assigned_to_id => 3 },
- :notes => 'Assigned to dlopper'
+ assert_difference('TimeEntry.count', 0) do
+ post :edit,
+ :id => 1,
+ :issue => { :status_id => 2, :assigned_to_id => 3 },
+ :notes => 'Assigned to dlopper',
+ :time_entry => { :hours => '', :comments => '', :activity_id => Enumeration.get_values('ACTI').first }
+ end
assert_redirected_to 'issues/show/1'
issue.reload
assert_equal 2, issue.status_id
@@ -288,10 +293,12 @@ class IssuesControllerTest < Test::Unit::TestCase
def test_post_edit_with_note_and_spent_time
@request.session[:user_id] = 2
spent_hours_before = Issue.find(1).spent_hours
- post :edit,
- :id => 1,
- :notes => '2.5 hours added',
- :time_entry => { :hours => '2.5', :comments => '', :activity_id => Enumeration.get_values('ACTI').first }
+ assert_difference('TimeEntry.count') do
+ post :edit,
+ :id => 1,
+ :notes => '2.5 hours added',
+ :time_entry => { :hours => '2.5', :comments => '', :activity_id => Enumeration.get_values('ACTI').first }
+ end
assert_redirected_to 'issues/show/1'
issue = Issue.find(1)