Fix style issues found by new rubocop version

[rails.git] / app / models / old_node.rb

diff --git a/app/models/old_node.rb b/app/models/old_node.rb
index 5b5739ff23d5891a25acd6cb916f27ea9c2bd4a4..84899d7fb4a8e7b609c0d3dd03d01271b145789f 100644 (file)
--- a/app/models/old_node.rb
+++ b/app/models/old_node.rb
@@ -10,11 +10,15 @@ class OldNode < ActiveRecord::Base
   # the queries generated by Redactable will use the wrong table name.
   include Redactable
 
-  validates_presence_of :changeset_id, :timestamp
-  validates_inclusion_of :visible, :in => [true, false]
-  validates_numericality_of :latitude, :longitude
+  validates :changeset, :presence => true, :associated => true
+  validates :latitude, :presence => true,
+                       :numericality => { :integer_only => true }
+  validates :longitude, :presence => true,
+                        :numericality => { :integer_only => true }
+  validates :timestamp, :presence => true
+  validates :visible, :inclusion => [true, false]
+
   validate :validate_position
-  validates_associated :changeset
 
   belongs_to :changeset
   belongs_to :redaction