Mercurial > hg > soundsoftware-site
diff test/functional/issues_controller_transaction_test.rb @ 1517:dffacf8a6908 redmine-2.5
Update to Redmine SVN revision 13367 on 2.5-stable branch
author | Chris Cannam |
---|---|
date | Tue, 09 Sep 2014 09:29:00 +0100 |
parents | e248c7af89ec |
children |
line wrap: on
line diff
--- a/test/functional/issues_controller_transaction_test.rb Tue Sep 09 09:28:31 2014 +0100 +++ b/test/functional/issues_controller_transaction_test.rb Tue Sep 09 09:29:00 2014 +0100 @@ -102,7 +102,7 @@ assert_response :success assert_template 'edit' - attachment = Attachment.first(:order => 'id DESC') + attachment = Attachment.order('id DESC').first assert_tag 'input', :attributes => {:name => 'attachments[p0][token]', :value => attachment.token} assert_tag 'input', :attributes => {:name => 'attachments[p0][filename]', :value => 'testfile.txt'} end @@ -189,7 +189,7 @@ assert_response 302 issue = Issue.find(1) assert_equal 4, issue.fixed_version_id - journal = Journal.first(:order => 'id DESC') + journal = Journal.order('id DESC').first assert_equal 'overwrite_conflict_resolution', journal.notes assert journal.details.any? end @@ -210,7 +210,7 @@ assert_response 302 issue = Issue.find(1) assert_nil issue.fixed_version_id - journal = Journal.first(:order => 'id DESC') + journal = Journal.order('id DESC').first assert_equal 'add_notes_conflict_resolution', journal.notes assert journal.details.empty? end