diff options
| author | Sean Griffin <sean@seantheprogrammer.com> | 2015-01-31 20:30:11 -0700 |
|---|---|---|
| committer | Sean Griffin <sean@seantheprogrammer.com> | 2015-01-31 20:30:11 -0700 |
| commit | f6160cf0506fb49d4340f0e9b7bfe0430a9750d3 (patch) | |
| tree | 238d7b6414e15e706df57922a059ca946ec4a51a | |
| parent | 70ac072976c8cc6f013f0df3777e54ccae3f4f8c (diff) | |
| parent | c46c1c1599a9b00373e6ae8d855e372f3435a832 (diff) | |
| download | rails-f6160cf0506fb49d4340f0e9b7bfe0430a9750d3.tar.gz rails-f6160cf0506fb49d4340f0e9b7bfe0430a9750d3.tar.bz2 rails-f6160cf0506fb49d4340f0e9b7bfe0430a9750d3.zip | |
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]
| -rw-r--r-- | activerecord/lib/active_record/fixtures.rb | 4 | ||||
| -rw-r--r-- | guides/source/upgrading_ruby_on_rails.md | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/activerecord/lib/active_record/fixtures.rb b/activerecord/lib/active_record/fixtures.rb index 57db2faaff..739be524da 100644 --- a/activerecord/lib/active_record/fixtures.rb +++ b/activerecord/lib/active_record/fixtures.rb @@ -132,7 +132,7 @@ module ActiveRecord # Digest::SHA2.hexdigest(File.read(Rails.root.join('test/fixtures', path))) # end # end - # ActiveRecord::FixtureSet.context_class.send :include, FixtureFileHelpers + # ActiveRecord::FixtureSet.context_class.include FixtureFileHelpers # # - use the helper method in a fixture # photo: @@ -522,7 +522,7 @@ module ActiveRecord update_all_loaded_fixtures fixtures_map connection.transaction(:requires_new => true) do - deleted_tables = Set.new + deleted_tables = Set.new fixture_sets.each do |fs| conn = fs.model_class.respond_to?(:connection) ? fs.model_class.connection : connection table_rows = fs.table_rows diff --git a/guides/source/upgrading_ruby_on_rails.md b/guides/source/upgrading_ruby_on_rails.md index d7fbe575c2..909a92b9dd 100644 --- a/guides/source/upgrading_ruby_on_rails.md +++ b/guides/source/upgrading_ruby_on_rails.md @@ -534,7 +534,7 @@ module FixtureFileHelpers Digest::SHA2.hexdigest(File.read(Rails.root.join('test/fixtures', path))) end end -ActiveRecord::FixtureSet.context_class.send :include, FixtureFileHelpers +ActiveRecord::FixtureSet.context_class.include FixtureFileHelpers ``` ### I18n enforcing available locales |