[DRE-commits] r4374 - trunk/redmine/debian/patches

[Jérémy Lal]

Author: kapouer-guest
Date: 2009-11-23 00:21:09 +0000 (Mon, 23 Nov 2009)
New Revision: 4374

Modified:
   trunk/redmine/debian/patches/rails22.patch
Log:
Revert a rails 2.3.4 commit from upstream.

Modified: trunk/redmine/debian/patches/rails22.patch
===================================================================
--- trunk/redmine/debian/patches/rails22.patch	2009-11-23 00:21:04 UTC (rev 4373)
+++ trunk/redmine/debian/patches/rails22.patch	2009-11-23 00:21:09 UTC (rev 4374)
@@ -1775,7 +1775,7 @@
    
    def setup
 diff --git a/test/functional/documents_controller_test.rb b/test/functional/documents_controller_test.rb
-index bdab5ac..538a9a8 100644
+index bdab5ac..c0fe095 100644
 --- a/test/functional/documents_controller_test.rb
 +++ b/test/functional/documents_controller_test.rb
 @@ -21,7 +21,7 @@ require 'documents_controller'
@@ -1787,6 +1787,15 @@
    fixtures :projects, :users, :roles, :members, :member_roles, :enabled_modules, :documents, :enumerations
    
    def setup
+@@ -75,7 +75,7 @@ class DocumentsControllerTest < ActionController::TestCase
+                :document => { :title => 'DocumentsControllerTest#test_post_new',
+                               :description => 'This is a new document',
+                               :category_id => 2},
+-               :attachments => {'1' => {'file' => uploaded_test_file('testfile.txt', 'text/plain')}}
++               :attachments => {'1' => {'file' => test_uploaded_file('testfile.txt', 'text/plain')}}
+                
+     assert_redirected_to 'projects/ecookbook/documents'
+     
 diff --git a/test/functional/enumerations_controller_test.rb b/test/functional/enumerations_controller_test.rb
 index 8c66186..afbe23a 100644
 --- a/test/functional/enumerations_controller_test.rb
@@ -1840,7 +1849,7 @@
             :users,
             :roles,
 diff --git a/test/functional/issues_controller_test.rb b/test/functional/issues_controller_test.rb
-index b38b8bb..a26c18e 100644
+index b38b8bb..853b3d1 100644
 --- a/test/functional/issues_controller_test.rb
 +++ b/test/functional/issues_controller_test.rb
 @@ -21,7 +21,7 @@ require 'issues_controller'
@@ -1933,6 +1942,15 @@
      
      assert_equal 1, ActionMailer::Base.deliveries.size
    end
+@@ -787,7 +780,7 @@ class IssuesControllerTest < ActionController::TestCase
+     post :edit,
+          :id => 1,
+          :notes => '',
+-         :attachments => {'1' => {'file' => uploaded_test_file('testfile.txt', 'text/plain')}}
++         :attachments => {'1' => {'file' => test_uploaded_file('testfile.txt', 'text/plain')}}
+     assert_redirected_to :action => 'show', :id => '1'
+     j = Issue.find(1).journals.find(:first, :order => 'id DESC')
+     assert j.notes.blank?
 diff --git a/test/functional/journals_controller_test.rb b/test/functional/journals_controller_test.rb
 index 0a11bab..ae112ab 100644
 --- a/test/functional/journals_controller_test.rb
@@ -2012,7 +2030,7 @@
    
    def setup
 diff --git a/test/functional/projects_controller_test.rb b/test/functional/projects_controller_test.rb
-index dcbcb77..0d5f4f5 100644
+index dcbcb77..7b76f2f 100644
 --- a/test/functional/projects_controller_test.rb
 +++ b/test/functional/projects_controller_test.rb
 @@ -21,7 +21,7 @@ require 'projects_controller'
@@ -2024,6 +2042,24 @@
    fixtures :projects, :versions, :users, :roles, :members, :member_roles, :issues, :journals, :journal_details,
             :trackers, :projects_trackers, :issue_statuses, :enabled_modules, :enumerations, :boards, :messages,
             :attachments, :custom_fields, :custom_values, :time_entries
+@@ -272,7 +272,7 @@ class ProjectsControllerTest < ActionController::TestCase
+     
+     assert_difference 'Attachment.count' do
+       post :add_file, :id => 1, :version_id => '',
+-           :attachments => {'1' => {'file' => uploaded_test_file('testfile.txt', 'text/plain')}}
++           :attachments => {'1' => {'file' => test_uploaded_file('testfile.txt', 'text/plain')}}
+     end
+     assert_redirected_to 'projects/ecookbook/files'
+     a = Attachment.find(:first, :order => 'created_on DESC')
+@@ -303,7 +303,7 @@ class ProjectsControllerTest < ActionController::TestCase
+     
+     assert_difference 'Attachment.count' do
+       post :add_file, :id => 1, :version_id => '2',
+-           :attachments => {'1' => {'file' => uploaded_test_file('testfile.txt', 'text/plain')}}
++           :attachments => {'1' => {'file' => test_uploaded_file('testfile.txt', 'text/plain')}}
+     end
+     assert_redirected_to 'projects/ecookbook/files'
+     a = Attachment.find(:first, :order => 'created_on DESC')
 diff --git a/test/functional/queries_controller_test.rb b/test/functional/queries_controller_test.rb
 index af2a86e..8edde44 100644
 --- a/test/functional/queries_controller_test.rb
@@ -2350,6 +2386,19 @@
  
    # Add other helpers here if you need them
    include ActionView::Helpers::ActiveRecordHelper
+diff --git a/test/integration/issues_test.rb b/test/integration/issues_test.rb
+index 0a35e13..9a73252 100644
+--- a/test/integration/issues_test.rb
++++ b/test/integration/issues_test.rb
+@@ -71,7 +71,7 @@ class IssuesTest < ActionController::IntegrationTest
+ 
+     post 'issues/1/edit',
+          :notes => 'Some notes',
+-         :attachments => {'1' => {'file' => uploaded_test_file('testfile.txt', 'text/plain'), 'description' => 'This is an attachment'}}
++         :attachments => {'1' => {'file' => test_uploaded_file('testfile.txt', 'text/plain'), 'description' => 'This is an attachment'}}
+     assert_redirected_to "issues/1"
+     
+     # make sure attachment was saved
 diff --git a/test/test_helper.rb b/test/test_helper.rb
 index 07d4af7..c8dae5d 100644
 --- a/test/test_helper.rb
@@ -2388,7 +2437,7 @@
             :trackers, :projects_trackers, :issue_statuses, :enabled_modules, :enumerations, :boards, :messages
  
 diff --git a/test/unit/attachment_test.rb b/test/unit/attachment_test.rb
-index 7b289d5..af2b84f 100644
+index 7b289d5..ff1ee90 100644
 --- a/test/unit/attachment_test.rb
 +++ b/test/unit/attachment_test.rb
 @@ -19,7 +19,7 @@
@@ -2400,6 +2449,23 @@
    fixtures :issues, :users
    
    def setup
+@@ -27,14 +27,14 @@ class AttachmentTest < ActiveSupport::TestCase
+ 
+   def test_create
+     a = Attachment.new(:container => Issue.find(1),
+-                       :file => uploaded_test_file("testfile.txt", "text/plain"),
++                       :file => test_uploaded_file("testfile.txt", "text/plain"),
+                        :author => User.find(1))
+     assert a.save
+     assert_equal 'testfile.txt', a.filename
+     assert_equal 59, a.filesize
+     assert_equal 'text/plain', a.content_type
+     assert_equal 0, a.downloads
+-    assert_equal Digest::MD5.hexdigest(uploaded_test_file("testfile.txt", "text/plain").read), a.digest
++    assert_equal Digest::MD5.hexdigest(test_uploaded_file("testfile.txt", "text/plain").read), a.digest
+     assert File.exist?(a.diskfile)
+   end
+   
 diff --git a/test/unit/auth_source_ldap_test.rb b/test/unit/auth_source_ldap_test.rb
 index d0f7a6e..30abd5d 100644
 --- a/test/unit/auth_source_ldap_test.rb