From b326e82dc012d81e9698cb1f402502af1788c1e9 Mon Sep 17 00:00:00 2001
From: Xavier Noria <fxn@hashref.com>
Date: Sat, 6 Aug 2016 20:20:22 +0200
Subject: applies remaining conventions across the project

---
 activemodel/test/cases/callbacks_test.rb                           | 2 --
 activemodel/test/cases/translation_test.rb                         | 1 -
 activemodel/test/cases/validations/acceptance_validation_test.rb   | 1 -
 activemodel/test/cases/validations/callbacks_test.rb               | 2 --
 activemodel/test/cases/validations/conditional_validation_test.rb  | 1 -
 activemodel/test/cases/validations/confirmation_validation_test.rb | 1 -
 activemodel/test/cases/validations/exclusion_validation_test.rb    | 1 -
 activemodel/test/cases/validations/format_validation_test.rb       | 1 -
 activemodel/test/cases/validations/i18n_validation_test.rb         | 1 -
 activemodel/test/cases/validations/inclusion_validation_test.rb    | 1 -
 activemodel/test/cases/validations/numericality_validation_test.rb | 1 -
 activemodel/test/cases/validations/presence_validation_test.rb     | 1 -
 activemodel/test/cases/validations/with_validation_test.rb         | 1 -
 activemodel/test/models/topic.rb                                   | 1 -
 14 files changed, 16 deletions(-)

(limited to 'activemodel/test')

diff --git a/activemodel/test/cases/callbacks_test.rb b/activemodel/test/cases/callbacks_test.rb
index a0686c7561..2b1c8d0eb7 100644
--- a/activemodel/test/cases/callbacks_test.rb
+++ b/activemodel/test/cases/callbacks_test.rb
@@ -1,7 +1,6 @@
 require "cases/helper"
 
 class CallbacksTest < ActiveModel::TestCase
-
   class CallbackValidator
     def around_create(model)
       model.callbacks << :before_around_create
@@ -131,5 +130,4 @@ class CallbacksTest < ActiveModel::TestCase
   test "after_create callbacks with both callbacks declared in different lines" do
     assert_equal ["callback1", "callback2"], Violin2.new.create.history
   end
-
 end
diff --git a/activemodel/test/cases/translation_test.rb b/activemodel/test/cases/translation_test.rb
index 37d68de014..1717e0c7ce 100644
--- a/activemodel/test/cases/translation_test.rb
+++ b/activemodel/test/cases/translation_test.rb
@@ -2,7 +2,6 @@ require "cases/helper"
 require "models/person"
 
 class ActiveModelI18nTests < ActiveModel::TestCase
-
   def setup
     I18n.backend = I18n::Backend::Simple.new
   end
diff --git a/activemodel/test/cases/validations/acceptance_validation_test.rb b/activemodel/test/cases/validations/acceptance_validation_test.rb
index 99f3ed3c2a..55ab213498 100644
--- a/activemodel/test/cases/validations/acceptance_validation_test.rb
+++ b/activemodel/test/cases/validations/acceptance_validation_test.rb
@@ -5,7 +5,6 @@ require "models/reply"
 require "models/person"
 
 class AcceptanceValidationTest < ActiveModel::TestCase
-
   def teardown
     Topic.clear_validators!
   end
diff --git a/activemodel/test/cases/validations/callbacks_test.rb b/activemodel/test/cases/validations/callbacks_test.rb
index 06b22f0e06..99913be752 100644
--- a/activemodel/test/cases/validations/callbacks_test.rb
+++ b/activemodel/test/cases/validations/callbacks_test.rb
@@ -73,7 +73,6 @@ end
 
 
 class CallbacksWithMethodNamesShouldBeCalled < ActiveModel::TestCase
-
   def test_if_condition_is_respected_for_before_validation
     d = DogValidatorWithIfCondition.new
     d.valid?
@@ -144,5 +143,4 @@ class CallbacksWithMethodNamesShouldBeCalled < ActiveModel::TestCase
     assert_equal ["before_validation_marker"], d.history
     assert_equal false, output
   end
-
 end
diff --git a/activemodel/test/cases/validations/conditional_validation_test.rb b/activemodel/test/cases/validations/conditional_validation_test.rb
index d92aa74e2a..8c2f656838 100644
--- a/activemodel/test/cases/validations/conditional_validation_test.rb
+++ b/activemodel/test/cases/validations/conditional_validation_test.rb
@@ -3,7 +3,6 @@ require "cases/helper"
 require "models/topic"
 
 class ConditionalValidationTest < ActiveModel::TestCase
-
   def teardown
     Topic.clear_validators!
   end
diff --git a/activemodel/test/cases/validations/confirmation_validation_test.rb b/activemodel/test/cases/validations/confirmation_validation_test.rb
index b1c4d42065..a980628765 100644
--- a/activemodel/test/cases/validations/confirmation_validation_test.rb
+++ b/activemodel/test/cases/validations/confirmation_validation_test.rb
@@ -4,7 +4,6 @@ require "models/topic"
 require "models/person"
 
 class ConfirmationValidationTest < ActiveModel::TestCase
-
   def teardown
     Topic.clear_validators!
   end
diff --git a/activemodel/test/cases/validations/exclusion_validation_test.rb b/activemodel/test/cases/validations/exclusion_validation_test.rb
index 42e99091fb..06ae4fbecd 100644
--- a/activemodel/test/cases/validations/exclusion_validation_test.rb
+++ b/activemodel/test/cases/validations/exclusion_validation_test.rb
@@ -5,7 +5,6 @@ require "models/topic"
 require "models/person"
 
 class ExclusionValidationTest < ActiveModel::TestCase
-
   def teardown
     Topic.clear_validators!
   end
diff --git a/activemodel/test/cases/validations/format_validation_test.rb b/activemodel/test/cases/validations/format_validation_test.rb
index 5c4a1863cd..d7e6bf3707 100644
--- a/activemodel/test/cases/validations/format_validation_test.rb
+++ b/activemodel/test/cases/validations/format_validation_test.rb
@@ -4,7 +4,6 @@ require "models/topic"
 require "models/person"
 
 class PresenceValidationTest < ActiveModel::TestCase
-
   def teardown
     Topic.clear_validators!
   end
diff --git a/activemodel/test/cases/validations/i18n_validation_test.rb b/activemodel/test/cases/validations/i18n_validation_test.rb
index 06ce91f838..9c0071fad7 100644
--- a/activemodel/test/cases/validations/i18n_validation_test.rb
+++ b/activemodel/test/cases/validations/i18n_validation_test.rb
@@ -2,7 +2,6 @@ require "cases/helper"
 require "models/person"
 
 class I18nValidationTest < ActiveModel::TestCase
-
   def setup
     Person.clear_validators!
     @person = Person.new
diff --git a/activemodel/test/cases/validations/inclusion_validation_test.rb b/activemodel/test/cases/validations/inclusion_validation_test.rb
index 96d55c1352..732a8d362a 100644
--- a/activemodel/test/cases/validations/inclusion_validation_test.rb
+++ b/activemodel/test/cases/validations/inclusion_validation_test.rb
@@ -5,7 +5,6 @@ require "models/topic"
 require "models/person"
 
 class InclusionValidationTest < ActiveModel::TestCase
-
   def teardown
     Topic.clear_validators!
   end
diff --git a/activemodel/test/cases/validations/numericality_validation_test.rb b/activemodel/test/cases/validations/numericality_validation_test.rb
index 56127f9286..71ef449503 100644
--- a/activemodel/test/cases/validations/numericality_validation_test.rb
+++ b/activemodel/test/cases/validations/numericality_validation_test.rb
@@ -7,7 +7,6 @@ require "bigdecimal"
 require "active_support/core_ext/big_decimal"
 
 class NumericalityValidationTest < ActiveModel::TestCase
-
   def teardown
     Topic.clear_validators!
   end
diff --git a/activemodel/test/cases/validations/presence_validation_test.rb b/activemodel/test/cases/validations/presence_validation_test.rb
index 639a443632..feda817698 100644
--- a/activemodel/test/cases/validations/presence_validation_test.rb
+++ b/activemodel/test/cases/validations/presence_validation_test.rb
@@ -5,7 +5,6 @@ require "models/person"
 require "models/custom_reader"
 
 class PresenceValidationTest < ActiveModel::TestCase
-
   teardown do
     Topic.clear_validators!
     Person.clear_validators!
diff --git a/activemodel/test/cases/validations/with_validation_test.rb b/activemodel/test/cases/validations/with_validation_test.rb
index 4932ce1d9a..6b2c998ba4 100644
--- a/activemodel/test/cases/validations/with_validation_test.rb
+++ b/activemodel/test/cases/validations/with_validation_test.rb
@@ -3,7 +3,6 @@ require "cases/helper"
 require "models/topic"
 
 class ValidatesWithTest < ActiveModel::TestCase
-
   def teardown
     Topic.clear_validators!
   end
diff --git a/activemodel/test/models/topic.rb b/activemodel/test/models/topic.rb
index 287fee0523..3924741acc 100644
--- a/activemodel/test/models/topic.rb
+++ b/activemodel/test/models/topic.rb
@@ -40,5 +40,4 @@ class Topic
   def my_word_tokenizer(str)
     str.scan(/\w+/)
   end
-
 end
-- 
cgit v1.2.3