diff options
author | Rafael França <rafaelmfranca@gmail.com> | 2016-12-13 20:34:27 -0500 |
---|---|---|
committer | GitHub <noreply@github.com> | 2016-12-13 20:34:27 -0500 |
commit | 54fa0a69ecbaa96464877e79140b51b1abf4b5b9 (patch) | |
tree | 07e15803fbd830befe4687c0464395bc4f83c893 | |
parent | a6d065e39f9285119d75a05ee46c659f8b3c0db8 (diff) | |
parent | 2f6105e49411e6c2a4603a7bf828d3fb4dfd0601 (diff) | |
download | rails-54fa0a69ecbaa96464877e79140b51b1abf4b5b9.tar.gz rails-54fa0a69ecbaa96464877e79140b51b1abf4b5b9.tar.bz2 rails-54fa0a69ecbaa96464877e79140b51b1abf4b5b9.zip |
Merge pull request #27349 from y-yagi/fix_ruby_warning_in_ruby_2_4
fix new warning in ruby 2.4
-rw-r--r-- | activerecord/test/cases/adapters/mysql2/reserved_word_test.rb | 2 | ||||
-rw-r--r-- | activesupport/test/caching_test.rb | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/activerecord/test/cases/adapters/mysql2/reserved_word_test.rb b/activerecord/test/cases/adapters/mysql2/reserved_word_test.rb index b400f4d2f9..2c778b1150 100644 --- a/activerecord/test/cases/adapters/mysql2/reserved_word_test.rb +++ b/activerecord/test/cases/adapters/mysql2/reserved_word_test.rb @@ -143,7 +143,7 @@ class Mysql2ReservedWordTest < ActiveRecord::Mysql2TestCase end # custom create table, uses execute on connection to create a table, note: escapes table_name, does NOT escape columns - def create_tables_directly (tables, connection = @connection) + def create_tables_directly(tables, connection = @connection) tables.each do |table_name, column_properties| connection.execute("CREATE TABLE `#{table_name}` ( #{column_properties} )") end diff --git a/activesupport/test/caching_test.rb b/activesupport/test/caching_test.rb index 551235e9e8..73b5a7d2a8 100644 --- a/activesupport/test/caching_test.rb +++ b/activesupport/test/caching_test.rb @@ -983,7 +983,7 @@ class MemoryStoreTest < ActiveSupport::TestCase end def test_pruning_is_capped_at_a_max_time - def @cache.delete_entry (*args) + def @cache.delete_entry(*args) sleep(0.01) super end |