diff options
| author | Jean-Philippe Lang <jp_lang@yahoo.fr> | 2011-01-01 13:40:36 +0000 |
|---|---|---|
| committer | Jean-Philippe Lang <jp_lang@yahoo.fr> | 2011-01-01 13:40:36 +0000 |
| commit | 488285e12321fc590dee0235470cfb12d77a3432 (patch) | |
| tree | d8f44a7dad87372748a64e12cedf66148c0e85f9 /test/fixtures | |
| parent | 1c7079db3fb099c6913353c9d56c27628b712026 (diff) | |
| download | redmine-488285e12321fc590dee0235470cfb12d77a3432.tar.gz redmine-488285e12321fc590dee0235470cfb12d77a3432.zip | |
Strip non utf8 content when displaying diff (ruby1.9 compatibility).
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4604 e93f8b46-1217-0410-a6f0-8f06a7374b81
Diffstat (limited to 'test/fixtures')
| -rw-r--r-- | test/fixtures/attachments.yml | 16 | ||||
| -rw-r--r-- | test/fixtures/files/060719210727_changeset_iso8859-1.diff (renamed from test/fixtures/files/060719210727_changeset.diff) | 6 | ||||
| -rw-r--r-- | test/fixtures/files/060719210727_changeset_utf8.diff | 13 |
3 files changed, 30 insertions, 5 deletions
diff --git a/test/fixtures/attachments.yml b/test/fixtures/attachments.yml index 487ce5aa9..bd4a86ac6 100644 --- a/test/fixtures/attachments.yml +++ b/test/fixtures/attachments.yml @@ -54,11 +54,11 @@ attachments_005: container_type: Issue container_id: 3 downloads: 0 - disk_filename: 060719210727_changeset.diff + disk_filename: 060719210727_changeset_iso8859-1.diff digest: b91e08d0cf966d5c6ff411bd8c4cc3a2 id: 5 filesize: 687 - filename: changeset.diff + filename: changeset_iso8859-1.diff author_id: 2 content_type: text/x-diff attachments_006: @@ -157,3 +157,15 @@ attachments_013: filename: foo.zip author_id: 2 content_type: application/octet-stream +attachments_014: + created_on: 2006-07-19 21:07:27 +02:00 + container_type: Issue + container_id: 3 + downloads: 0 + disk_filename: 060719210727_changeset_utf8.diff + digest: b91e08d0cf966d5c6ff411bd8c4cc3a2 + id: 14 + filesize: 687 + filename: changeset_utf8.diff + author_id: 2 + content_type: text/x-diff diff --git a/test/fixtures/files/060719210727_changeset.diff b/test/fixtures/files/060719210727_changeset_iso8859-1.diff index af2c2068d..9bade6ab9 100644 --- a/test/fixtures/files/060719210727_changeset.diff +++ b/test/fixtures/files/060719210727_changeset_iso8859-1.diff @@ -1,10 +1,10 @@ Index: trunk/app/controllers/issues_controller.rb =================================================================== ---- trunk/app/controllers/issues_controller.rb (r‚vision 1483) -+++ trunk/app/controllers/issues_controller.rb (r‚vision 1484) +--- trunk/app/controllers/issues_controller.rb (révision 1483) ++++ trunk/app/controllers/issues_controller.rb (révision 1484) @@ -149,7 +149,7 @@ attach_files(@issue, params[:attachments]) - flash[:notice] = l(:notice_successful_create) + flash[:notice] = 'Demande créée avec succès' Mailer.deliver_issue_add(@issue) if Setting.notified_events.include?('issue_added') - redirect_to :controller => 'issues', :action => 'show', :id => @issue, :project_id => @project + redirect_to :controller => 'issues', :action => 'show', :id => @issue diff --git a/test/fixtures/files/060719210727_changeset_utf8.diff b/test/fixtures/files/060719210727_changeset_utf8.diff new file mode 100644 index 000000000..e594f203a --- /dev/null +++ b/test/fixtures/files/060719210727_changeset_utf8.diff @@ -0,0 +1,13 @@ +Index: trunk/app/controllers/issues_controller.rb
+===================================================================
+--- trunk/app/controllers/issues_controller.rb (révision 1483)
++++ trunk/app/controllers/issues_controller.rb (révision 1484)
+@@ -149,7 +149,7 @@
+ attach_files(@issue, params[:attachments])
+ flash[:notice] = 'Demande créée avec succès'
+ Mailer.deliver_issue_add(@issue) if Setting.notified_events.include?('issue_added')
+- redirect_to :controller => 'issues', :action => 'show', :id => @issue, :project_id => @project
++ redirect_to :controller => 'issues', :action => 'show', :id => @issue
+ return
+ end
+ end
|