applies remaining conventions across the project

8 files changed, 4 insertions, 13 deletions

diff --git a/activerecord/test/models/country.rb b/activerecord/test/models/country.rb
index 7db9a4e731..7912719ddd 100644
--- a/activerecord/test/models/country.rb
+++ b/activerecord/test/models/country.rb
@@ -1,7 +1,5 @@
 class Country < ActiveRecord::Base
-
   self.primary_key = :country_id
 
   has_and_belongs_to_many :treaties
-
 end
diff --git a/activerecord/test/models/developer.rb b/activerecord/test/models/developer.rb
index 6dc3c6d632..5ca1d37f6d 100644
--- a/activerecord/test/models/developer.rb
+++ b/activerecord/test/models/developer.rb
@@ -83,7 +83,6 @@ class Developer < ActiveRecord::Base
     self.class.instance_count += 1
   end
   private :track_instance_count
-
 end
 
 class AuditLog < ActiveRecord::Base
diff --git a/activerecord/test/models/minivan.rb b/activerecord/test/models/minivan.rb
index 3c12406425..e9b05dadf2 100644
--- a/activerecord/test/models/minivan.rb
+++ b/activerecord/test/models/minivan.rb
@@ -5,5 +5,4 @@ class Minivan < ActiveRecord::Base
   has_one :dashboard, through: :speedometer
 
   attr_readonly :color
-
 end
diff --git a/activerecord/test/models/owner.rb b/activerecord/test/models/owner.rb
index 45508a7f67..21fc9b6eb8 100644
--- a/activerecord/test/models/owner.rb
+++ b/activerecord/test/models/owner.rb
@@ -6,14 +6,14 @@ class Owner < ActiveRecord::Base
 
   belongs_to :last_pet, class_name: "Pet"
   scope :including_last_pet, -> {
-    select(%q[
+    select('
       owners.*, (
         select p.pet_id from pets p
         where p.owner_id = owners.owner_id
         order by p.name desc
         limit 1
       ) as last_pet_id
-    ]).includes(:last_pet)
+    ').includes(:last_pet)
   }
 
   after_commit :execute_blocks
diff --git a/activerecord/test/models/person.rb b/activerecord/test/models/person.rb
index eb117f92e1..84ffddb74e 100644
--- a/activerecord/test/models/person.rb
+++ b/activerecord/test/models/person.rb
@@ -123,13 +123,13 @@ end
 class Insure
   INSURES = %W{life annuality}
 
-  def self.load mask
+  def self.load(mask)
     INSURES.select do |insure|
       (1 << INSURES.index(insure)) & mask.to_i > 0
     end
   end
 
-  def self.dump insures
+  def self.dump(insures)
     numbers = insures.map { |insure| INSURES.index(insure) }
     numbers.inject(0) { |sum, n| sum + (1 << n) }
   end
diff --git a/activerecord/test/models/subject.rb b/activerecord/test/models/subject.rb
index 9b96f11c9d..f31a33ec7e 100644
--- a/activerecord/test/models/subject.rb
+++ b/activerecord/test/models/subject.rb
@@ -1,7 +1,6 @@
 # used for OracleSynonymTest, see test/synonym_test_oracle.rb
 #
 class Subject < ActiveRecord::Base
-
   # added initialization of author_email_address in the same way as in Topic class
   # as otherwise synonym test was failing
   after_initialize :set_email_address
@@ -12,5 +11,4 @@ class Subject < ActiveRecord::Base
         self.author_email_address = "test@test.com"
       end
     end
-
 end
diff --git a/activerecord/test/models/treaty.rb b/activerecord/test/models/treaty.rb
index 41fd1350f3..373cd48f71 100644
--- a/activerecord/test/models/treaty.rb
+++ b/activerecord/test/models/treaty.rb
@@ -1,7 +1,5 @@
 class Treaty < ActiveRecord::Base
-
   self.primary_key = :treaty_id
 
   has_and_belongs_to_many :countries
-
 end
diff --git a/activerecord/test/models/vegetables.rb b/activerecord/test/models/vegetables.rb
index ef310d2359..a4590d06e0 100644
--- a/activerecord/test/models/vegetables.rb
+++ b/activerecord/test/models/vegetables.rb
@@ -1,5 +1,4 @@
 class Vegetable < ActiveRecord::Base
-
   validates_presence_of :name
 
   def self.inheritance_column