Merge r23362 and r23363 from trunk to 5.1-stable (#40301).

git-svn-id: https://svn.redmine.org/redmine/branches/5.1-stable@23374 e93f8b46-1217-0410-a6f0-8f06a7374b81

2 files changed, 50 insertions, 1 deletions

diff --git a/app/views/versions/_new_modal.html.erb b/app/views/versions/_new_modal.html.erb
index 052a73974..02c57abc4 100644
--- a/app/views/versions/_new_modal.html.erb
+++ b/app/views/versions/_new_modal.html.erb
@@ -1,6 +1,6 @@
 <h3 class="title"><%=l(:label_version_new)%></h3>
 
-<%= labelled_form_for @version, :url => project_versions_path(@project), :remote => true do |f| %>
+<%= labelled_form_for @version, :url => project_versions_path(@project), :html => {:multipart => true}, :remote => true do |f| %>
 <%= render :partial => 'versions/form', :locals => { :f => f } %>
   <p class="buttons">
     <%= submit_tag l(:button_create), :name => nil %>
diff --git a/test/system/versions_test.rb b/test/system/versions_test.rb
new file mode 100644
index 000000000..0f6c68c24
--- /dev/null
+++ b/test/system/versions_test.rb
@@ -0,0 +1,49 @@
+# frozen_string_literal: true
+
+# Redmine - project management software
+# Copyright (C) 2006-  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.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+
+require_relative '../application_system_test_case'
+
+class VersionsSystemTest < ApplicationSystemTestCase
+  fixtures :projects, :users, :email_addresses, :roles, :members, :member_roles,
+           :trackers, :projects_trackers, :enabled_modules,
+           :issue_statuses, :issues, :issue_categories,
+           :enumerations, :versions, :workflows
+
+  def test_create_from_issue_form_with_file_custom_field
+    VersionCustomField.generate!(:field_format => 'attachment')
+
+    log_user('jsmith', 'jsmith')
+
+    version_name = 'Version with file custom field'
+
+    assert_difference 'Version.count' do
+      visit '/projects/ecookbook/issues/new'
+      fill_in 'Subject', :with => 'With a new version'
+
+      click_on 'New version'
+      within '#ajax-modal' do
+        fill_in 'Name', :with => version_name
+        click_on 'Create'
+      end
+      click_on 'Create'
+    end
+
+    assert_equal version_name, Version.last.name
+  end
+end