Merged rails-5.1 branch (#23630).

git-svn-id: http://svn.redmine.org/redmine/trunk@16859 e93f8b46-1217-0410-a6f0-8f06a7374b81

8 files changed, 8 insertions, 12 deletions

diff --git a/test/unit/attachment_test.rb b/test/unit/attachment_test.rb
index e55c60b86..dcad6f23d 100644
--- a/test/unit/attachment_test.rb
+++ b/test/unit/attachment_test.rb
@@ -23,10 +23,6 @@ class AttachmentTest < ActiveSupport::TestCase
   fixtures :users, :email_addresses, :projects, :roles, :members, :member_roles,
            :enabled_modules, :issues, :trackers, :attachments
 
-  # TODO: remove this with Rails 5 that supports after_commit callbacks
-  # in transactional fixtures (https://github.com/rails/rails/pull/18458)
-  self.use_transactional_fixtures = false
-
   def setup
     set_tmp_attachments_directory
   end
diff --git a/test/unit/attachment_transaction_test.rb b/test/unit/attachment_transaction_test.rb
index 44776c8f5..b0f13332f 100644
--- a/test/unit/attachment_transaction_test.rb
+++ b/test/unit/attachment_transaction_test.rb
@@ -23,7 +23,7 @@ class AttachmentTest < ActiveSupport::TestCase
   fixtures :users, :email_addresses, :projects, :roles, :members, :member_roles,
            :enabled_modules, :issues, :trackers, :attachments
 
-  self.use_transactional_fixtures = false
+  self.use_transactional_tests = false
 
   def setup
     set_tmp_attachments_directory
diff --git a/test/unit/issue_nested_set_concurrency_test.rb b/test/unit/issue_nested_set_concurrency_test.rb
index 4345fffc7..2f8daf8c8 100644
--- a/test/unit/issue_nested_set_concurrency_test.rb
+++ b/test/unit/issue_nested_set_concurrency_test.rb
@@ -24,7 +24,7 @@ class IssueNestedSetConcurrencyTest < ActiveSupport::TestCase
            :issue_statuses,
            :enumerations
 
-  self.use_transactional_fixtures = false
+  self.use_transactional_tests = false
 
   def setup
     skip if sqlite?
diff --git a/test/unit/issue_test.rb b/test/unit/issue_test.rb
index df242a169..a01d2e3e1 100644
--- a/test/unit/issue_test.rb
+++ b/test/unit/issue_test.rb
@@ -3045,14 +3045,14 @@ class IssueTest < ActiveSupport::TestCase
     assert_equal IssueStatus.find(3), issue.status
   end
 
-  def test_assigned_to_was_with_a_group
+  def test_previous_assignee_with_a_group
     group = Group.find(10)
     Member.create!(:project_id => 1, :principal => group, :role_ids => [1])
 
     with_settings :issue_group_assignment => '1' do
       issue = Issue.generate!(:assigned_to => group)
       issue.reload.assigned_to = nil
-      assert_equal group, issue.assigned_to_was
+      assert_equal group, issue.previous_assignee
     end
   end
 
diff --git a/test/unit/issue_transaction_test.rb b/test/unit/issue_transaction_test.rb
index bb30df5d2..f944ffe8e 100644
--- a/test/unit/issue_transaction_test.rb
+++ b/test/unit/issue_transaction_test.rb
@@ -27,7 +27,7 @@ class IssueTransactionTest < ActiveSupport::TestCase
            :custom_fields, :custom_fields_projects, :custom_fields_trackers, :custom_values,
            :time_entries
 
-  self.use_transactional_fixtures = false
+  self.use_transactional_tests = false
 
   def test_invalid_move_to_another_project
     lft1 = new_issue_lft
diff --git a/test/unit/lib/redmine/views/builders/json_test.rb b/test/unit/lib/redmine/views/builders/json_test.rb
index 8a0bd1032..b1b50b80a 100644
--- a/test/unit/lib/redmine/views/builders/json_test.rb
+++ b/test/unit/lib/redmine/views/builders/json_test.rb
@@ -87,7 +87,7 @@ class Redmine::Views::Builders::JsonTest < ActiveSupport::TestCase
   end
 
   def assert_json_output(expected, &block)
-    builder = Redmine::Views::Builders::Json.new(ActionDispatch::TestRequest.new, ActionDispatch::TestResponse.new)
+    builder = Redmine::Views::Builders::Json.new(ActionDispatch::TestRequest.create, ActionDispatch::TestResponse.create)
     block.call(builder)
     assert_equal(expected, ActiveSupport::JSON.decode(builder.output))
   end
diff --git a/test/unit/lib/redmine/views/builders/xml_test.rb b/test/unit/lib/redmine/views/builders/xml_test.rb
index cdc1ec2cf..46b5755b0 100644
--- a/test/unit/lib/redmine/views/builders/xml_test.rb
+++ b/test/unit/lib/redmine/views/builders/xml_test.rb
@@ -60,7 +60,7 @@ class Redmine::Views::Builders::XmlTest < ActiveSupport::TestCase
   end
 
   def assert_xml_output(expected, &block)
-    builder = Redmine::Views::Builders::Xml.new(ActionDispatch::TestRequest.new, ActionDispatch::TestResponse.new)
+    builder = Redmine::Views::Builders::Xml.new(ActionDispatch::TestRequest.create, ActionDispatch::TestResponse.create)
     block.call(builder)
     assert_equal('<?xml version="1.0" encoding="UTF-8"?>' + expected, builder.output)
   end
diff --git a/test/unit/project_nested_set_concurrency_test.rb b/test/unit/project_nested_set_concurrency_test.rb
index b67e5b3e3..430aab175 100644
--- a/test/unit/project_nested_set_concurrency_test.rb
+++ b/test/unit/project_nested_set_concurrency_test.rb
@@ -18,7 +18,7 @@
 require File.expand_path('../../test_helper', __FILE__)
 
 class ProjectNestedSetConcurrencyTest < ActiveSupport::TestCase
-  self.use_transactional_fixtures = false
+  self.use_transactional_tests = false
 
   def setup
     CustomField.delete_all