diff --git a/test/functional/issues_controller_test.rb b/test/functional/issues_controller_test.rb index eb8f9c287..b897c472e 100644 --- a/test/functional/issues_controller_test.rb +++ b/test/functional/issues_controller_test.rb @@ -2871,24 +2871,6 @@ class IssuesControllerTest < ActionController::TestCase assert_equal spent_hours_before + 2.5, issue.spent_hours end - def test_put_update_with_spent_time_and_failure_should_not_add_spent_time - @request.session[:user_id] = 2 - - assert_no_difference('TimeEntry.count') do - put :update, - :id => 1, - :issue => { :subject => '' }, - :time_entry => { :hours => '2.5', :comments => 'should not be added', :activity_id => TimeEntryActivity.first.id } - assert_response :success - end - - assert_select 'input[name=?][value=?]', 'time_entry[hours]', '2.5' - assert_select 'input[name=?][value=?]', 'time_entry[comments]', 'should not be added' - assert_select 'select[name=?]', 'time_entry[activity_id]' do - assert_select 'option[value=?][selected=selected]', TimeEntryActivity.first.id - end - end - def test_put_update_with_attachment_only set_tmp_attachments_directory diff --git a/test/functional/issues_controller_transaction_test.rb b/test/functional/issues_controller_transaction_test.rb index 7e1fa0d00..20a3895ff 100644 --- a/test/functional/issues_controller_transaction_test.rb +++ b/test/functional/issues_controller_transaction_test.rb @@ -235,6 +235,24 @@ class IssuesControllerTransactionTest < ActionController::TestCase assert_nil issue.fixed_version_id end + def test_put_update_with_spent_time_and_failure_should_not_add_spent_time + @request.session[:user_id] = 2 + + assert_no_difference('TimeEntry.count') do + put :update, + :id => 1, + :issue => { :subject => '' }, + :time_entry => { :hours => '2.5', :comments => 'should not be added', :activity_id => TimeEntryActivity.first.id } + assert_response :success + end + + assert_select 'input[name=?][value=?]', 'time_entry[hours]', '2.5' + assert_select 'input[name=?][value=?]', 'time_entry[comments]', 'should not be added' + assert_select 'select[name=?]', 'time_entry[activity_id]' do + assert_select 'option[value=?][selected=selected]', TimeEntryActivity.first.id + end + end + def test_index_should_rescue_invalid_sql_query Query.any_instance.stubs(:statement).returns("INVALID STATEMENT")