提交 f6160cf0 编写于 作者: S Sean Griffin

Merge pull request #18763 from robertomiranda/ruby-2.2

Use Module#include instead of send :include, since Module#include is a public method [ci skip]
...@@ -132,7 +132,7 @@ class FixtureClassNotFound < ActiveRecord::ActiveRecordError #:nodoc: ...@@ -132,7 +132,7 @@ class FixtureClassNotFound < ActiveRecord::ActiveRecordError #:nodoc:
# Digest::SHA2.hexdigest(File.read(Rails.root.join('test/fixtures', path))) # Digest::SHA2.hexdigest(File.read(Rails.root.join('test/fixtures', path)))
# end # end
# end # end
# ActiveRecord::FixtureSet.context_class.send :include, FixtureFileHelpers # ActiveRecord::FixtureSet.context_class.include FixtureFileHelpers
# #
# - use the helper method in a fixture # - use the helper method in a fixture
# photo: # photo:
...@@ -522,7 +522,7 @@ def self.create_fixtures(fixtures_directory, fixture_set_names, class_names = {} ...@@ -522,7 +522,7 @@ def self.create_fixtures(fixtures_directory, fixture_set_names, class_names = {}
update_all_loaded_fixtures fixtures_map update_all_loaded_fixtures fixtures_map
connection.transaction(:requires_new => true) do connection.transaction(:requires_new => true) do
deleted_tables = Set.new deleted_tables = Set.new
fixture_sets.each do |fs| fixture_sets.each do |fs|
conn = fs.model_class.respond_to?(:connection) ? fs.model_class.connection : connection conn = fs.model_class.respond_to?(:connection) ? fs.model_class.connection : connection
table_rows = fs.table_rows table_rows = fs.table_rows
......
...@@ -534,7 +534,7 @@ module FixtureFileHelpers ...@@ -534,7 +534,7 @@ module FixtureFileHelpers
Digest::SHA2.hexdigest(File.read(Rails.root.join('test/fixtures', path))) Digest::SHA2.hexdigest(File.read(Rails.root.join('test/fixtures', path)))
end end
end end
ActiveRecord::FixtureSet.context_class.send :include, FixtureFileHelpers ActiveRecord::FixtureSet.context_class.include FixtureFileHelpers
``` ```
### I18n enforcing available locales ### I18n enforcing available locales
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册