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

Merge from live branch

 # 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
 # as published by the Free Software Foundation; either version 2
 # of the License, or (at your option) any later version.

 
 require File.expand_path('../../test_helper', __FILE__)
 require 'issues_controller'
 
 class IssuesControllerTransactionTest < ActionController::TestCase
+  tests IssuesController
   fixtures :projects,
            :users,
            :roles,
            :members,
            :member_roles,

            :queries
 
   self.use_transactional_fixtures = false
 
   def setup
-    @controller = IssuesController.new
-    @request    = ActionController::TestRequest.new
-    @response   = ActionController::TestResponse.new
     User.current = nil
   end
 
   def test_update_stale_issue_should_not_update_the_issue
     issue = Issue.find(2)

       end
     end
 
     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
     issue = Issue.find(2)
     @request.session[:user_id] = 2

     end
 
     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
 
   def test_update_stale_issue_with_add_notes_conflict_resolution_should_update

     end
 
     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
 
   def test_update_stale_issue_with_cancel_conflict_resolution_should_redirect_without_updating

       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")
+    IssueQuery.any_instance.stubs(:statement).returns("INVALID STATEMENT")
 
     get :index
     assert_response 500
     assert_tag 'p', :content => /An error occurred/
     assert_nil session[:query]