applies remaining conventions across the project

11 files changed, 11 insertions, 14 deletions

diff --git a/activerecord/test/cases/adapters/mysql2/json_test.rb b/activerecord/test/cases/adapters/mysql2/json_test.rb
index f0e670d4b8..2f7dc3f7ef 100644
--- a/activerecord/test/cases/adapters/mysql2/json_test.rb
+++ b/activerecord/test/cases/adapters/mysql2/json_test.rb
@@ -91,7 +91,7 @@ if ActiveRecord::Base.connection.supports_json?
     end
 
     def test_null_json
-      @connection.execute %q|insert into json_data_type (payload) VALUES(null)|
+      @connection.execute "insert into json_data_type (payload) VALUES(null)"
       x = JsonDataType.first
       assert_equal(nil, x.payload)
     end
diff --git a/activerecord/test/cases/adapters/mysql2/reserved_word_test.rb b/activerecord/test/cases/adapters/mysql2/reserved_word_test.rb
index ff78bca173..7736113a19 100644
--- a/activerecord/test/cases/adapters/mysql2/reserved_word_test.rb
+++ b/activerecord/test/cases/adapters/mysql2/reserved_word_test.rb
@@ -148,5 +148,4 @@ class Mysql2ReservedWordTest < ActiveRecord::Mysql2TestCase
         connection.execute("CREATE TABLE `#{table_name}` ( #{column_properties} )")
       end
     end
-
 end
diff --git a/activerecord/test/cases/adapters/postgresql/array_test.rb b/activerecord/test/cases/adapters/postgresql/array_test.rb
index 26f3e66324..e496960f21 100644
--- a/activerecord/test/cases/adapters/postgresql/array_test.rb
+++ b/activerecord/test/cases/adapters/postgresql/array_test.rb
@@ -306,7 +306,7 @@ class PostgresqlArrayTest < ActiveRecord::PostgreSQLTestCase
   end
 
   private
-    def assert_cycle field, array
+    def assert_cycle(field, array)
       # test creation
       x = PgArray.create!(field => array)
       x.reload
diff --git a/activerecord/test/cases/adapters/postgresql/hstore_test.rb b/activerecord/test/cases/adapters/postgresql/hstore_test.rb
index 5da4a3ac0f..817dfbf705 100644
--- a/activerecord/test/cases/adapters/postgresql/hstore_test.rb
+++ b/activerecord/test/cases/adapters/postgresql/hstore_test.rb
@@ -166,19 +166,19 @@ if ActiveRecord::Base.connection.supports_extensions?
     end
 
     def test_gen1
-      assert_equal(%q(" "=>""), @type.serialize(" "=>""))
+      assert_equal('" "=>""', @type.serialize(" "=>""))
     end
 
     def test_gen2
-      assert_equal(%q(","=>""), @type.serialize(","=>""))
+      assert_equal('","=>""', @type.serialize(","=>""))
     end
 
     def test_gen3
-      assert_equal(%q("="=>""), @type.serialize("="=>""))
+      assert_equal('"="=>""', @type.serialize("="=>""))
     end
 
     def test_gen4
-      assert_equal(%q(">"=>""), @type.serialize(">"=>""))
+      assert_equal('">"=>""', @type.serialize(">"=>""))
     end
 
     def test_parse1
diff --git a/activerecord/test/cases/adapters/postgresql/json_test.rb b/activerecord/test/cases/adapters/postgresql/json_test.rb
index 8b5a5f1bab..d0e206ae80 100644
--- a/activerecord/test/cases/adapters/postgresql/json_test.rb
+++ b/activerecord/test/cases/adapters/postgresql/json_test.rb
@@ -108,7 +108,7 @@ module PostgresqlJSONSharedTestCases
   end
 
   def test_null_json
-    @connection.execute %q|insert into json_data_type (payload) VALUES(null)|
+    @connection.execute "insert into json_data_type (payload) VALUES(null)"
     x = JsonDataType.first
     assert_equal(nil, x.payload)
   end
diff --git a/activerecord/test/cases/adapters/postgresql/prepared_statements_test.rb b/activerecord/test/cases/adapters/postgresql/prepared_statements_test.rb
index f1519db48b..b898929f8a 100644
--- a/activerecord/test/cases/adapters/postgresql/prepared_statements_test.rb
+++ b/activerecord/test/cases/adapters/postgresql/prepared_statements_test.rb
@@ -18,5 +18,4 @@ class PreparedStatementsTest < ActiveRecord::PostgreSQLTestCase
       Developer.where(id: 1)
     end
   end
-
 end
diff --git a/activerecord/test/cases/adapters/postgresql/schema_authorization_test.rb b/activerecord/test/cases/adapters/postgresql/schema_authorization_test.rb
index 84af276874..22f935f24e 100644
--- a/activerecord/test/cases/adapters/postgresql/schema_authorization_test.rb
+++ b/activerecord/test/cases/adapters/postgresql/schema_authorization_test.rb
@@ -109,7 +109,7 @@ class SchemaAuthorizationTest < ActiveRecord::PostgreSQLTestCase
   end
 
   private
-    def set_session_auth auth = nil
+    def set_session_auth(auth = nil)
       @connection.session_auth =  auth || "default"
     end
 
diff --git a/activerecord/test/cases/adapters/postgresql/schema_test.rb b/activerecord/test/cases/adapters/postgresql/schema_test.rb
index c2a6377cc6..d821cbafdf 100644
--- a/activerecord/test/cases/adapters/postgresql/schema_test.rb
+++ b/activerecord/test/cases/adapters/postgresql/schema_test.rb
@@ -29,7 +29,7 @@ class SchemaTest < ActiveRecord::PostgreSQLTestCase
   INDEX_A_COLUMN = "name"
   INDEX_B_COLUMN_S1 = "email"
   INDEX_B_COLUMN_S2 = "moment"
-  INDEX_C_COLUMN = %q{(to_tsvector('english', coalesce(things.name, '')))}
+  INDEX_C_COLUMN = "(to_tsvector('english', coalesce(things.name, '')))"
   INDEX_D_COLUMN = "description"
   INDEX_E_COLUMN = "name_vector"
   COLUMNS = [
diff --git a/activerecord/test/cases/adapters/postgresql/uuid_test.rb b/activerecord/test/cases/adapters/postgresql/uuid_test.rb
index 104c71f0d3..321b74c1f5 100644
--- a/activerecord/test/cases/adapters/postgresql/uuid_test.rb
+++ b/activerecord/test/cases/adapters/postgresql/uuid_test.rb
@@ -290,5 +290,4 @@ class PostgresqlUUIDTestInverseOf < ActiveRecord::PostgreSQLTestCase
       assert_nil UuidPost.find_by(id: 789)
     end
   end
-
 end
diff --git a/activerecord/test/cases/adapters/postgresql/xml_test.rb b/activerecord/test/cases/adapters/postgresql/xml_test.rb
index dc80834b21..826b384fb3 100644
--- a/activerecord/test/cases/adapters/postgresql/xml_test.rb
+++ b/activerecord/test/cases/adapters/postgresql/xml_test.rb
@@ -30,7 +30,7 @@ class PostgresqlXMLTest < ActiveRecord::PostgreSQLTestCase
   end
 
   def test_null_xml
-    @connection.execute %q|insert into xml_data_type (payload) VALUES(null)|
+    @connection.execute "insert into xml_data_type (payload) VALUES(null)"
     assert_nil XmlDataType.first.payload
   end
 
diff --git a/activerecord/test/cases/adapters/sqlite3/sqlite3_adapter_test.rb b/activerecord/test/cases/adapters/sqlite3/sqlite3_adapter_test.rb
index ca775e3704..4800d3d7d5 100644
--- a/activerecord/test/cases/adapters/sqlite3/sqlite3_adapter_test.rb
+++ b/activerecord/test/cases/adapters/sqlite3/sqlite3_adapter_test.rb
@@ -420,7 +420,7 @@ module ActiveRecord
 
       private
 
-        def assert_logged logs
+        def assert_logged(logs)
           subscriber = SQLSubscriber.new
           subscription = ActiveSupport::Notifications.subscribe("sql.active_record", subscriber)
           yield