tagged version 2.1.2

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/tags/2.1.2@10537 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-09-30 10:43:39 +00:00
30 changed files with 91 additions and 242 deletions
--- a/.gitignore
+++ b/.gitignore
@@ -19,7 +19,6 @@
 /public/plugin_assets
 /tmp/*
 /tmp/cache/*
-/tmp/pdf/*
 /tmp/sessions/*
 /tmp/sockets/*
 /tmp/test/*
--- a/.hgignore
+++ b/.hgignore
@@ -21,7 +21,6 @@ public/dispatch.*
 public/plugin_assets
 tmp/*
 tmp/cache/*
-tmp/pdf/*
 tmp/sessions/*
 tmp/sockets/*
 tmp/test/*
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@@ -795,10 +795,11 @@ module ApplicationHelper
                if repository && User.current.allowed_to?(:browse_repository, project)
                  name =~ %r{^[/\\]*(.*?)(@([0-9a-f]+))?(#(L\d+))?$}
                  path, rev, anchor = $1, $3, $5
-                  link = link_to h("#{project_prefix}#{prefix}:#{repo_prefix}#{name}"), {:controller => 'repositories', :action => (prefix == 'export' ? 'raw' : 'entry'), :id => project, :repository_id => repository.identifier_param,
+                  link = link_to h("#{project_prefix}#{prefix}:#{repo_prefix}#{name}"), {:controller => 'repositories', :action => 'entry', :id => project, :repository_id => repository.identifier_param,
                                                          :path => to_path_param(path),
                                                          :rev => rev,
-                                                          :anchor => anchor},
+                                                          :anchor => anchor,
+                                                          :format => (prefix == 'export' ? 'raw' : nil)},
                                                         :class => (prefix == 'export' ? 'source download' : 'source')
                end
              end
--- a/app/helpers/context_menus_helper.rb
+++ b/app/helpers/context_menus_helper.rb
@@ -26,8 +26,8 @@ module ContextMenusHelper
    end
    if options.delete(:disabled)
      options.delete(:method)
-      options.delete(:data)
-      options[:onclick] = 'return false;'
+      options.delete(:confirm)
+      options.delete(:onclick)
      options[:class] << ' disabled'
      url = '#'
    end
--- a/app/models/mail_handler.rb
+++ b/app/models/mail_handler.rb
@@ -373,8 +373,7 @@ class MailHandler < ActionMailer::Base
      # try to reencode to utf8 manually with ruby1.8
      begin
        if h = email.header[:subject]
-          # http://tools.ietf.org/html/rfc2047#section-4
-          if m = h.value.match(/=\?([^\?]+)\?[BbQq]\?/)
+          if m = h.value.match(/^=\?([^\?]+)\?/)
            subject = Redmine::CodesetUtil.to_utf8(subject, m[1])
          end
        end
--- a/app/models/principal.rb
+++ b/app/models/principal.rb
@@ -30,13 +30,13 @@ class Principal < ActiveRecord::Base
    if q.blank?
      {}
    else
-      q = q.to_s
+      q = q.to_s.downcase
      pattern = "%#{q}%"
-      sql = "LOWER(login) LIKE LOWER(:p) OR LOWER(firstname) LIKE LOWER(:p) OR LOWER(lastname) LIKE LOWER(:p) OR LOWER(mail) LIKE LOWER(:p)"
+      sql = "LOWER(login) LIKE :p OR LOWER(firstname) LIKE :p OR LOWER(lastname) LIKE :p OR LOWER(mail) LIKE :p"
      params = {:p => pattern}
      if q =~ /^(.+)\s+(.+)$/
        a, b = "#{$1}%", "#{$2}%"
-        sql << " OR (LOWER(firstname) LIKE LOWER(:a) AND LOWER(lastname) LIKE LOWER(:b)) OR (LOWER(firstname) LIKE LOWER(:b) AND LOWER(lastname) LIKE LOWER(:a))"
+        sql << " OR (LOWER(firstname) LIKE :a AND LOWER(lastname) LIKE :b) OR (LOWER(firstname) LIKE :b AND LOWER(lastname) LIKE :a)"
        params.merge!(:a => a, :b => b)
      end
      {:conditions => [sql, params]}
--- a/app/models/version.rb
+++ b/app/models/version.rb
@@ -33,7 +33,6 @@ class Version < ActiveRecord::Base
  validates_format_of :effective_date, :with => /^\d{4}-\d{2}-\d{2}$/, :message => :not_a_date, :allow_nil => true
  validates_inclusion_of :status, :in => VERSION_STATUSES
  validates_inclusion_of :sharing, :in => VERSION_SHARINGS
-  validate :validate_version

  scope :named, lambda {|arg| { :conditions => ["LOWER(#{table_name}.name) = LOWER(?)", arg.to_s.strip]}}
  scope :open, :conditions => {:status => 'open'}
@@ -276,10 +275,4 @@ class Version < ActiveRecord::Base
      progress
    end
  end
-
-  def validate_version
-    if effective_date.nil? && @attributes['effective_date'].present?
-      errors.add :effective_date, :not_a_date
-    end
-  end
 end
--- a/app/views/common/error.html.erb
+++ b/app/views/common/error.html.erb
@@ -3,6 +3,6 @@
 <% if @message.present? %>
  <p id="errorExplanation"><%=h @message %></p>
 <% end %>
-<p><a href="javascript:history.back()"><%= l(:button_back) %></a></p>
+<p><a href="javascript:history.back()">Back</a></p>

 <% html_title @status %>
--- a/app/views/issues/_list.html.erb
+++ b/app/views/issues/_list.html.erb
@@ -19,7 +19,7 @@
    <tr class="group open">
      <td colspan="<%= query.columns.size + 2 %>">
        <span class="expander" onclick="toggleRowGroup(this);">&nbsp;</span>
-        <%= group.blank? ? l(:label_none) : column_content(@query.group_by_column, issue) %> <span class="count">(<%= @issue_count_by_group[group] %>)</span>
+        <%= group.blank? ? 'None' : column_content(@query.group_by_column, issue) %> <span class="count">(<%= @issue_count_by_group[group] %>)</span>
        <%= link_to_function("#{l(:button_collapse_all)}/#{l(:button_expand_all)}", "toggleAllRowGroups(this)", :class => 'toggle-all') %>
      </td>
    </tr>
--- a/app/views/repositories/revisions.html.erb
+++ b/app/views/repositories/revisions.html.erb
@@ -1,8 +1,7 @@
 <div class="contextual">
 <%= form_tag(
       {:controller => 'repositories', :action => 'revision', :id => @project,
-        :repository_id => @repository.identifier_param},
-       :method => :get
+        :repository_id => @repository.identifier_param}
     ) do %>
  <%= l(:label_revision) %>: <%= text_field_tag 'rev', @rev, :size => 8 %>
  <%= submit_tag 'OK' %>
--- a/config/locales/de.yml
+++ b/config/locales/de.yml
@@ -844,7 +844,7 @@ de:
  button_show: Anzeigen

  status_active: aktiv
-  status_registered: nicht aktivierte
+  status_registered: angemeldet
  status_locked: gesperrt

  version_status_open: offen
@@ -1017,8 +1017,8 @@ de:
  description_date_from: Startdatum eintragen
  description_date_to: Enddatum eintragen

-  label_parent_revision: Vorgänger
-  label_child_revision: Nachfolger
+  label_parent_revision: Parent
+  label_child_revision: Child
  error_scm_annotate_big_text_file: Der Eintrag kann nicht umgesetzt werden, da er die maximale Textlänge überschreitet.
  setting_default_issue_start_date_to_creation_date: Aktuelles Datum als Beginn für neue Tickets verwenden
  button_edit_section: Diesen Bereich bearbeiten
@@ -1068,14 +1068,14 @@ de:
  field_timeout: Auszeit (in Sekunden)
  setting_thumbnails_enabled: Vorschaubilder von Dateianhängen anzeigen
  setting_thumbnails_size: Größe der Vorschaubilder (in Pixel)
-  label_status_transitions: Statusänderungen
-  label_fields_permissions: Feldberechtigungen
+  label_status_transitions: Status transitions
+  label_fields_permissions: Fields permissions
  label_readonly: Nur-Lese-Zugriff
  label_required: Erforderlich
  text_repository_identifier_info: 'Kleinbuchstaben (a-z), Ziffern, Binde- und Unterstriche erlaubt.<br />Einmal gespeichert, kann die Kennung nicht mehr geändert werden.'
-  field_board_parent: Übergeordnetes Forum
-  label_attribute_of_project: "%{name} des Projekts"
-  label_attribute_of_author: "%{name} des Autors"
-  label_attribute_of_assigned_to: "%{name} des Bearbeiters"
-  label_attribute_of_fixed_version: "%{name} der Zielversion"
-  label_copy_subtasks: Unteraufgaben kopieren
+  field_board_parent: Parent forum
+  label_attribute_of_project: Project's %{name}
+  label_attribute_of_author: Author's %{name}
+  label_attribute_of_assigned_to: Assignee's %{name}
+  label_attribute_of_fixed_version: Target version's %{name}
+  label_copy_subtasks: Copy subtasks
--- a/config/locales/ru.yml
+++ b/config/locales/ru.yml
@@ -1152,27 +1152,27 @@ ru:
  setting_session_lifetime: Session maximum lifetime
  setting_session_timeout: Session inactivity timeout
  label_session_expiration: Session expiration
-  permission_close_project: Закрывать / открывать проекты
-  label_show_closed_projects: Просматривать закрытые проекты
-  button_close: Сделать закрытым
-  button_reopen: Сделать открытым
-  project_status_active: открытые
-  project_status_closed: закрытые
-  project_status_archived: архивированные
-  text_project_closed: Проект закрыт и находиться в режиме только для чтения.
-  notice_user_successful_create: Пользователь %{id} создан.
-  field_core_fields: Стандартные поля
+  permission_close_project: Close / reopen the project
+  label_show_closed_projects: View closed projects
+  button_close: Close
+  button_reopen: Reopen
+  project_status_active: active
+  project_status_closed: closed
+  project_status_archived: archived
+  text_project_closed: This project is closed and read-only.
+  notice_user_successful_create: User %{id} created.
+  field_core_fields: Standard fields
  field_timeout: Timeout (in seconds)
  setting_thumbnails_enabled: Display attachment thumbnails
  setting_thumbnails_size: Thumbnails size (in pixels)
-  label_status_transitions: Статус-переходы
-  label_fields_permissions: Права на изменения полей
-  label_readonly: Не изменяется
-  label_required: Обязательное
+  label_status_transitions: Status transitions
+  label_fields_permissions: Fields permissions
+  label_readonly: Read-only
+  label_required: Required
  text_repository_identifier_info: Допускаются только строчные латинские буквы (a-z), цифры, тире и подчеркивания.<br />После сохранения идентификатор изменить нельзя.
-  field_board_parent: Родительский форум
+  field_board_parent: Parent forum
  label_attribute_of_project: Project's %{name}
-  label_attribute_of_author: Имя автора %{name}
+  label_attribute_of_author: Author's %{name}
  label_attribute_of_assigned_to: Assignee's %{name}
  label_attribute_of_fixed_version: Target version's %{name}
-  label_copy_subtasks: Копировать подзадачи
+  label_copy_subtasks: Copy subtasks
--- a/config/locales/zh.yml
+++ b/config/locales/zh.yml
@@ -1061,9 +1061,9 @@ zh:
  label_readonly: 只读
  label_required: 必填
  text_repository_identifier_info: 仅小写字母（a-z）、数字、破折号（-）和下划线（_）可以使用。<br />一旦保存，标识无法修改。
-  field_board_parent: 父论坛
-  label_attribute_of_project: 项目 %{name}
-  label_attribute_of_author: 作者 %{name}
-  label_attribute_of_assigned_to: 分配给 %{name}
-  label_attribute_of_fixed_version: 目标版本 %{name}
-  label_copy_subtasks: 复制子任务
+  field_board_parent: Parent forum
+  label_attribute_of_project: Project's %{name}
+  label_attribute_of_author: Author's %{name}
+  label_attribute_of_assigned_to: Assignee's %{name}
+  label_attribute_of_fixed_version: Target version's %{name}
+  label_copy_subtasks: Copy subtasks
--- a/doc/CHANGELOG
+++ b/doc/CHANGELOG
@@ -4,25 +4,6 @@ Redmine - project management software
 Copyright (C) 2006-2012  Jean-Philippe Lang
 http://www.redmine.org/

-== 2012-11-17 v2.1.3
-
-* Defect #12050: :export links to repository files lead to a 404 error
-* Defect #12189: Missing tmp/pdf directory
-* Defect #12195: Javascript error with IE7 / IE8 on new issue form
-* Defect #12196: "Page not found" on OK button in SCM "View all revisions" page
-* Defect #12199: Confirmation message displayed when clicking a disabled delete link in the context menu
-* Defect #12231: Hardcoded "Back" in Repository
-* Defect #12294: Incorrect german translation for "registered" users filter
-* Defect #12349: Watchers auto-complete search on non-latin chars
-* Defect #12358: 'None' grouped issue list section should be translated
-* Defect #12359: Version date field regex validation accepts invalid date
-* Defect #12375: Receiving mail subject encoding broken (MOJIBAKE) in some cases on Ruby 1.8
-* Patch #9732: German translations
-* Patch #12021: Russian locale translations
-* Patch #12188: Simplified Chinese translation with zh.yml file based on Rev:10681
-* Patch #12235: German translation for 2.1-stable
-* Patch #12237: Added German Translation
-
 == 2012-09-30 v2.1.2

 * Defect #11929: XSS vulnerability in Redmine 2.1.x
--- a/lib/plugins/acts_as_attachable/lib/acts_as_attachable.rb
+++ b/lib/plugins/acts_as_attachable/lib/acts_as_attachable.rb
@@ -30,7 +30,7 @@ module Redmine
          attachable_options[:delete_permission] = options.delete(:delete_permission) || "edit_#{self.name.pluralize.underscore}".to_sym

          has_many :attachments, options.merge(:as => :container,
-                                               :order => "#{Attachment.table_name}.created_on ASC, #{Attachment.table_name}.id ASC",
+                                               :order => "#{Attachment.table_name}.created_on",
                                               :dependent => :destroy)
          send :include, Redmine::Acts::Attachable::InstanceMethods
          before_save :attach_saved_attachments
@@ -62,19 +62,7 @@ module Redmine

        def save_attachments(attachments, author=User.current)
          if attachments.is_a?(Hash)
-            attachments = attachments.stringify_keys
-            attachments = attachments.to_a.sort {|a, b|
-              if a.first.to_i > 0 && b.first.to_i > 0
-                a.first.to_i <=> b.first.to_i
-              elsif a.first.to_i > 0
-                1
-              elsif b.first.to_i > 0
-                -1
-              else
-                a.first <=> b.first
-              end
-            }
-            attachments = attachments.map(&:last)
+            attachments = attachments.values
          end
          if attachments.is_a?(Array)
            attachments.each do |attachment|
--- a/lib/redmine/version.rb
+++ b/lib/redmine/version.rb
@@ -4,7 +4,7 @@ module Redmine
  module VERSION #:nodoc:
    MAJOR = 2
    MINOR = 1
-    TINY  = 3
+    TINY  = 2

    # Branch values:
    # * official release: nil
--- a/public/javascripts/application.js
+++ b/public/javascripts/application.js
@@ -464,11 +464,9 @@ function updateBulkEditFrom(url) {
 }

 function observeAutocompleteField(fieldId, url) {
-  $(document).ready(function() {
-    $('#'+fieldId).autocomplete({
-      source: url,
-      minLength: 2
-    });
+  $('#'+fieldId).autocomplete({
+    source: url,
+    minLength: 2,
  });
 }

--- a/test/fixtures/mail_handler/subject_japanese_1.eml
+++ b/test/fixtures/mail_handler/subject_japanese_1.eml
@@ -1,7 +0,0 @@
-From: John Smith <JSmith@somenet.foo>
-To: "redmine@somenet.foo" <redmine@somenet.foo>
-Subject: =?iso-2022-jp?b?GyRCJUYlOSVIGyhCCg=?=
-Date: Fri, 1 Jun 2012 14:39:38 +0200
-Message-ID: <87C31D42249DD0489D1A1444E3232DD7019D6183@foo.bar>
-
-Fixture
--- a/test/fixtures/mail_handler/subject_japanese_2.eml
+++ b/test/fixtures/mail_handler/subject_japanese_2.eml
@@ -1,7 +0,0 @@
-From: John Smith <JSmith@somenet.foo>
-To: "redmine@somenet.foo" <redmine@somenet.foo>
-Subject: Re: =?iso-2022-jp?b?GyRCJUYlOSVIGyhCCg=?=
-Date: Fri, 1 Jun 2012 14:39:38 +0200
-Message-ID: <87C31D42249DD0489D1A1444E3232DD7019D6183@foo.bar>
-
-Fixture
--- a/test/functional/repositories_git_controller_test.rb
+++ b/test/functional/repositories_git_controller_test.rb
@@ -532,21 +532,6 @@ class RepositoriesGitControllerTest < ActionController::TestCase
      end
    end

-    def test_revisions
-      assert_equal 0, @repository.changesets.count
-      @repository.fetch_changesets
-      @project.reload
-      assert_equal NUM_REV, @repository.changesets.count
-      get :revisions, :id => PRJ_ID
-      assert_response :success
-      assert_template 'revisions'
-      assert_tag :tag => 'form',
-                 :attributes => {
-                   :method => 'get',
-                   :action => '/projects/subproject1/repository/revision'
-                 }
-    end
-
    def test_revision
      assert_equal 0, @repository.changesets.count
      @repository.fetch_changesets
--- a/test/integration/api_test/issues_test.rb
+++ b/test/integration/api_test/issues_test.rb
@@ -25,7 +25,6 @@ class ApiTest::IssuesTest < ActionController::IntegrationTest
    :member_roles,
    :issues,
    :issue_statuses,
-    :issue_relations,
    :versions,
    :trackers,
    :projects_trackers,
--- a/test/object_helpers.rb
+++ b/test/object_helpers.rb
@@ -61,8 +61,6 @@ module ObjectHelpers

  def Issue.generate!(attributes={})
    issue = Issue.new(attributes)
-    issue.project ||= Project.find(1)
-    issue.tracker ||= issue.project.trackers.first
    issue.subject = 'Generated' if issue.subject.blank?
    issue.author ||= User.find(2)
    yield issue if block_given?
--- a/test/unit/helpers/application_helper_test.rb
+++ b/test/unit/helpers/application_helper_test.rb
@@ -253,15 +253,8 @@ RAW

    project_url = {:controller => 'projects', :action => 'show', :id => 'subproject1'}

-    source_url = '/projects/ecookbook/repository/entry/some/file'
-    source_url_with_rev = '/projects/ecookbook/repository/revisions/52/entry/some/file'
-    source_url_with_ext = '/projects/ecookbook/repository/entry/some/file.ext'
-    source_url_with_rev_and_ext = '/projects/ecookbook/repository/revisions/52/entry/some/file.ext'
-
-    export_url = '/projects/ecookbook/repository/raw/some/file'
-    export_url_with_rev = '/projects/ecookbook/repository/revisions/52/raw/some/file'
-    export_url_with_ext = '/projects/ecookbook/repository/raw/some/file.ext'
-    export_url_with_rev_and_ext = '/projects/ecookbook/repository/revisions/52/raw/some/file.ext'
+    source_url = {:controller => 'repositories', :action => 'entry', :id => 'ecookbook', :path => ['some', 'file']}
+    source_url_with_ext = {:controller => 'repositories', :action => 'entry', :id => 'ecookbook', :path => ['some', 'file.ext']}

    to_test = {
      # tickets
@@ -291,16 +284,12 @@ RAW
      'source:/some/file. '         => link_to('source:/some/file', source_url, :class => 'source') + ".",
      'source:/some/file.ext. '     => link_to('source:/some/file.ext', source_url_with_ext, :class => 'source') + ".",
      'source:/some/file, '         => link_to('source:/some/file', source_url, :class => 'source') + ",",
-      'source:/some/file@52'        => link_to('source:/some/file@52', source_url_with_rev, :class => 'source'),
-      'source:/some/file.ext@52'    => link_to('source:/some/file.ext@52', source_url_with_rev_and_ext, :class => 'source'),
-      'source:/some/file#L110'      => link_to('source:/some/file#L110', source_url + "#L110", :class => 'source'),
-      'source:/some/file.ext#L110'  => link_to('source:/some/file.ext#L110', source_url_with_ext + "#L110", :class => 'source'),
-      'source:/some/file@52#L110'   => link_to('source:/some/file@52#L110', source_url_with_rev + "#L110", :class => 'source'),
-      # export
-      'export:/some/file'           => link_to('export:/some/file', export_url, :class => 'source download'),
-      'export:/some/file.ext'       => link_to('export:/some/file.ext', export_url_with_ext, :class => 'source download'),
-      'export:/some/file@52'        => link_to('export:/some/file@52', export_url_with_rev, :class => 'source download'),
-      'export:/some/file.ext@52'    => link_to('export:/some/file.ext@52', export_url_with_rev_and_ext, :class => 'source download'),
+      'source:/some/file@52'        => link_to('source:/some/file@52', source_url.merge(:rev => 52), :class => 'source'),
+      'source:/some/file.ext@52'    => link_to('source:/some/file.ext@52', source_url_with_ext.merge(:rev => 52), :class => 'source'),
+      'source:/some/file#L110'      => link_to('source:/some/file#L110', source_url.merge(:anchor => 'L110'), :class => 'source'),
+      'source:/some/file.ext#L110'  => link_to('source:/some/file.ext#L110', source_url_with_ext.merge(:anchor => 'L110'), :class => 'source'),
+      'source:/some/file@52#L110'   => link_to('source:/some/file@52#L110', source_url.merge(:rev => 52, :anchor => 'L110'), :class => 'source'),
+      'export:/some/file'           => link_to('export:/some/file', source_url.merge(:format => 'raw'), :class => 'source download'),
      # forum
      'forum#2'                     => link_to('Discussion', board_url, :class => 'board'),
      'forum:Discussion'            => link_to('Discussion', board_url, :class => 'board'),
--- a/test/unit/helpers/issues_helper_test.rb
+++ b/test/unit/helpers/issues_helper_test.rb
@@ -109,55 +109,51 @@ class IssuesHelperTest < ActionView::TestCase
      end
    end

-    context "with a start_date attribute" do
-      should "format the current date" do
-        @detail = JournalDetail.new(
+    def test_with_a_start_date_attribute_should_format_the_current_date
+      @detail = JournalDetail.new(
                   :property  => 'attr',
                   :old_value => '2010-01-01',
                   :value     => '2010-01-31',
                   :prop_key  => 'start_date'
                )
-        with_settings :date_format => '%m/%d/%Y' do
-          assert_match "01/31/2010", show_detail(@detail, true)
-        end
-      end
-
-      should "format the old date" do
-        @detail = JournalDetail.new(
-                   :property  => 'attr',
-                   :old_value => '2010-01-01',
-                   :value     => '2010-01-31',
-                   :prop_key  => 'start_date'
-                )
-        with_settings :date_format => '%m/%d/%Y' do
-          assert_match "01/01/2010", show_detail(@detail, true)
-        end
+      with_settings :date_format => '%m/%d/%Y' do
+        assert_match "01/31/2010", show_detail(@detail, true)
      end
    end

-    context "with a due_date attribute" do
-      should "format the current date" do
-        @detail = JournalDetail.new(
-                  :property  => 'attr',
-                  :old_value => '2010-01-01',
-                  :value     => '2010-01-31',
-                  :prop_key  => 'due_date'
+    def test_with_a_start_date_attribute_should_format_the_old_date
+      @detail = JournalDetail.new(
+                   :property  => 'attr',
+                   :old_value => '2010-01-01',
+                   :value     => '2010-01-31',
+                   :prop_key  => 'start_date'
                )
-        with_settings :date_format => '%m/%d/%Y' do
-          assert_match "01/31/2010", show_detail(@detail, true)
-        end
+      with_settings :date_format => '%m/%d/%Y' do
+        assert_match "01/01/2010", show_detail(@detail, true)
      end
+    end

-      should "format the old date" do
-        @detail = JournalDetail.new(
+    def test_with_a_due_date_attribute_should_with_a_due_date_attribute
+      @detail = JournalDetail.new(
                  :property  => 'attr',
                  :old_value => '2010-01-01',
                  :value     => '2010-01-31',
                  :prop_key  => 'due_date'
                )
-        with_settings :date_format => '%m/%d/%Y' do
-          assert_match "01/01/2010", show_detail(@detail, true)
-        end
+      with_settings :date_format => '%m/%d/%Y' do
+        assert_match "01/31/2010", show_detail(@detail, true)
+      end
+    end
+
+    def test_with_a_due_date_attribute_should_format_the_old_date
+      @detail = JournalDetail.new(
+                  :property  => 'attr',
+                  :old_value => '2010-01-01',
+                  :value     => '2010-01-31',
+                  :prop_key  => 'due_date'
+                )
+      with_settings :date_format => '%m/%d/%Y' do
+        assert_match "01/01/2010", show_detail(@detail, true)
      end
    end

--- a/test/unit/issue_relation_test.rb
+++ b/test/unit/issue_relation_test.rb
@@ -18,17 +18,7 @@
 require File.expand_path('../../test_helper', __FILE__)

 class IssueRelationTest < ActiveSupport::TestCase
-  fixtures :projects,
-           :users,
-           :roles,
-           :members,
-           :member_roles,
-           :issues,
-           :issue_statuses,
-           :issue_relations,
-           :enabled_modules,
-           :enumerations,
-           :trackers
+  fixtures :issue_relations, :issues

  def test_create
    from = Issue.find(1)
--- a/test/unit/issue_test.rb
+++ b/test/unit/issue_test.rb
@@ -1576,18 +1576,4 @@ class IssueTest < ActiveSupport::TestCase
  def test_journals_after_with_blank_arg_should_return_all_journals
    assert_equal [Journal.find(1), Journal.find(2)], Issue.find(1).journals_after('')
  end
-
-  def test_save_attachments_with_hash_should_save_attachments_in_keys_order
-    set_tmp_attachments_directory
-    issue = Issue.generate!
-    issue.save_attachments({
-      'p0' => {'file' => mock_file_with_options(:original_filename => 'upload')},
-      '3' => {'file' => mock_file_with_options(:original_filename => 'bar')},
-      '1' => {'file' => mock_file_with_options(:original_filename => 'foo')}
-    })
-    issue.attach_saved_attachments
-
-    assert_equal 3, issue.reload.attachments.count
-    assert_equal %w(upload foo bar), issue.attachments.map(&:filename)
-  end
 end
--- a/test/unit/mail_handler_test.rb
+++ b/test/unit/mail_handler_test.rb
@@ -382,28 +382,6 @@ class MailHandlerTest < ActiveSupport::TestCase
    assert_equal 'Testmail from Webmail: ä ö ü...', issue.subject
  end

-  def test_add_issue_with_japanese_subject
-    issue = submit_email(
-              'subject_japanese_1.eml',
-              :issue => {:project => 'ecookbook'}
-            )
-    assert_kind_of Issue, issue
-    ja = "\xe3\x83\x86\xe3\x82\xb9\xe3\x83\x88"
-    ja.force_encoding('UTF-8') if ja.respond_to?(:force_encoding)
-    assert_equal ja, issue.subject
-  end
-
-  def test_add_issue_with_mixed_japanese_subject
-    issue = submit_email(
-              'subject_japanese_2.eml',
-              :issue => {:project => 'ecookbook'}
-            )
-    assert_kind_of Issue, issue
-    ja = "Re: \xe3\x83\x86\xe3\x82\xb9\xe3\x83\x88"
-    ja.force_encoding('UTF-8') if ja.respond_to?(:force_encoding)
-    assert_equal ja, issue.subject
-  end
-
  def test_should_ignore_emails_from_locked_users
    User.find(2).lock!

--- a/test/unit/principal_test.rb
+++ b/test/unit/principal_test.rb
@@ -1,5 +1,3 @@
-# encoding: utf-8
-#
 # Redmine - project management software
 # Copyright (C) 2006-2012  Jean-Philippe Lang
 #
@@ -108,11 +106,4 @@ class PrincipalTest < ActiveSupport::TestCase
      assert_equal @palmer, results.first
    end
  end
-
-  def test_like_scope_with_cyrillic_name
-    user = User.generate!(:firstname => 'Соболев', :lastname => 'Денис')
-    results = Principal.like('Собо')
-    assert_equal 1, results.count
-    assert_equal user, results.first
-  end
 end
--- a/test/unit/version_test.rb
+++ b/test/unit/version_test.rb
@@ -32,13 +32,7 @@ class VersionTest < ActiveSupport::TestCase

  def test_invalid_effective_date_validation
    v = Version.new(:project => Project.find(1), :name => '1.1', :effective_date => '99999-01-01')
-    assert !v.valid?
-    v.effective_date = '2012-11-33'
-    assert !v.valid?
-    v.effective_date = '2012-31-11'
-    assert !v.valid?
-    v.effective_date = 'ABC'
-    assert !v.valid?
+    assert !v.save
    assert_include I18n.translate('activerecord.errors.messages.not_a_date'),
                   v.errors[:effective_date]
  end
--- a/tmp/pdf/empty
+++ b/tmp/pdf/empty