diff options
Diffstat (limited to 'test/functional/issues_controller_transaction_test.rb')
| -rw-r--r-- | test/functional/issues_controller_transaction_test.rb | 52 |
1 files changed, 26 insertions, 26 deletions
diff --git a/test/functional/issues_controller_transaction_test.rb b/test/functional/issues_controller_transaction_test.rb index 8f7498290..fc82e96db 100644 --- a/test/functional/issues_controller_transaction_test.rb +++ b/test/functional/issues_controller_transaction_test.rb @@ -64,12 +64,12 @@ class IssuesControllerTransactionTest < Redmine::ControllerTest :fixed_version_id => 4, :notes => 'My notes', :lock_version => (issue.lock_version - 1) - - }, + + }, :time_entry => { :hours => '2.5', :comments => '', - :activity_id => TimeEntryActivity.first.id + :activity_id => TimeEntryActivity.first.id } } end @@ -100,16 +100,16 @@ class IssuesControllerTransactionTest < Redmine::ControllerTest :fixed_version_id => 4, :notes => 'My notes', :lock_version => (issue.lock_version - 1) - - }, + + }, :attachments => { '1' => { - 'file' => uploaded_test_file('testfile.txt', 'text/plain')} - }, + 'file' => uploaded_test_file('testfile.txt', 'text/plain')} + }, :time_entry => { :hours => '2.5', :comments => '', - :activity_id => TimeEntryActivity.first.id + :activity_id => TimeEntryActivity.first.id } } end @@ -133,7 +133,7 @@ class IssuesControllerTransactionTest < Redmine::ControllerTest :fixed_version_id => 4, :notes => '', :lock_version => (issue.lock_version - 1) - + } } assert_response :success @@ -153,8 +153,8 @@ class IssuesControllerTransactionTest < Redmine::ControllerTest :fixed_version_id => 4, :notes => '', :lock_version => 2 - - }, + + }, :last_journal_id => 1 } assert_response :success @@ -172,8 +172,8 @@ class IssuesControllerTransactionTest < Redmine::ControllerTest :fixed_version_id => 4, :notes => '', :lock_version => 2 - - }, + + }, :last_journal_id => '' } assert_response :success @@ -192,7 +192,7 @@ class IssuesControllerTransactionTest < Redmine::ControllerTest :issue => { :fixed_version_id => 4, :lock_version => 2 - }, + }, :last_journal_id => '' } assert_response :success @@ -204,7 +204,7 @@ class IssuesControllerTransactionTest < Redmine::ControllerTest :issue => { :fixed_version_id => 4, :lock_version => 2 - }, + }, :last_journal_id => '' } assert_response :success @@ -221,8 +221,8 @@ class IssuesControllerTransactionTest < Redmine::ControllerTest :fixed_version_id => 4, :notes => 'overwrite_conflict_resolution', :lock_version => 2 - - }, + + }, :conflict_resolution => 'overwrite' } end @@ -245,8 +245,8 @@ class IssuesControllerTransactionTest < Redmine::ControllerTest :fixed_version_id => 4, :notes => 'add_notes_conflict_resolution', :lock_version => 2 - - }, + + }, :conflict_resolution => 'add_notes' } end @@ -271,8 +271,8 @@ class IssuesControllerTransactionTest < Redmine::ControllerTest :notes => 'add_privates_notes_conflict_resolution', :private_notes => '1', :lock_version => 2 - - }, + + }, :conflict_resolution => 'add_notes' } end @@ -293,8 +293,8 @@ class IssuesControllerTransactionTest < Redmine::ControllerTest :fixed_version_id => 4, :notes => 'add_notes_conflict_resolution', :lock_version => 2 - - }, + + }, :conflict_resolution => 'cancel' } end @@ -311,12 +311,12 @@ class IssuesControllerTransactionTest < Redmine::ControllerTest put :update, :params => { :id => 1, :issue => { - :subject => '' - }, + :subject => '' + }, :time_entry => { :hours => '2.5', :comments => 'should not be added', - :activity_id => TimeEntryActivity.first.id + :activity_id => TimeEntryActivity.first.id } } assert_response :success |