diff test/functional/issues_controller_transaction_test.rb @ 1526:404aa68d4227

Merge from live branch

--- a/test/functional/issues_controller_transaction_test.rb	Mon Mar 17 08:57:04 2014 +0000
+++ b/test/functional/issues_controller_transaction_test.rb	Thu Sep 11 12:46:20 2014 +0100
@@ -1,5 +1,5 @@
 # Redmine - project management software
-# Copyright (C) 2006-2012  Jean-Philippe Lang
+# Copyright (C) 2006-2014  Jean-Philippe Lang
 #
 # This program is free software; you can redistribute it and/or
 # modify it under the terms of the GNU General Public License
@@ -19,6 +19,7 @@
 require 'issues_controller'
 
 class IssuesControllerTransactionTest < ActionController::TestCase
+  tests IssuesController
   fixtures :projects,
            :users,
            :roles,
@@ -46,9 +47,6 @@
   self.use_transactional_fixtures = false
 
   def setup
-    @controller = IssuesController.new
-    @request    = ActionController::TestRequest.new
-    @response   = ActionController::TestResponse.new
     User.current = nil
   end
 
@@ -104,9 +102,9 @@
 
     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 'span', :content => /testfile.txt/
+    assert_tag 'input', :attributes => {:name => 'attachments[p0][filename]', :value => 'testfile.txt'}
   end
 
   def test_update_stale_issue_without_notes_should_not_show_add_notes_option
@@ -191,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
@@ -212,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
@@ -254,7 +252,7 @@
   end
 
   def test_index_should_rescue_invalid_sql_query
-    Query.any_instance.stubs(:statement).returns("INVALID STATEMENT")
+    IssueQuery.any_instance.stubs(:statement).returns("INVALID STATEMENT")
 
     get :index
     assert_response 500