Use model relations when creating objects from factories

[rails.git] / lib / consistency_validations.rb

diff --git a/lib/consistency_validations.rb b/lib/consistency_validations.rb
index bcb7a26b7323050e4e640a96cc06e7926a7ac087..0d17d2830a1a5104ae893fabc775d85bb7a5d74d 100644 (file)
--- a/lib/consistency_validations.rb
+++ b/lib/consistency_validations.rb
@@ -6,15 +6,15 @@ module ConsistencyValidations
   # needed for creates, but are currently not run :-(
   # This will throw an exception if there is an inconsistency
   def check_consistency(old, new, user)
-    if new.id != old.id or new.id.nil? or old.id.nil?
-      raise OSM::APIPreconditionFailedError.new("New and old IDs don't match on #{new.class.to_s}. #{new.id} != #{old.id}.")
+    if new.id != old.id || new.id.nil? || old.id.nil?
+      raise OSM::APIPreconditionFailedError.new("New and old IDs don't match on #{new.class}. #{new.id} != #{old.id}.")
     elsif new.version != old.version
       raise OSM::APIVersionMismatchError.new(new.id, new.class.to_s, new.version, old.version)
     elsif new.changeset.nil?
       raise OSM::APIChangesetMissingError.new
     elsif new.changeset.user_id != user.id
       raise OSM::APIUserChangesetMismatchError.new
-    elsif not new.changeset.is_open?
+    elsif !new.changeset.is_open?
       raise OSM::APIChangesetAlreadyClosedError.new(new.changeset)
     end
   end
@@ -25,7 +25,7 @@ module ConsistencyValidations
       raise OSM::APIChangesetMissingError.new
     elsif new.changeset.user_id != user.id
       raise OSM::APIUserChangesetMismatchError.new
-    elsif not new.changeset.is_open?
+    elsif !new.changeset.is_open?
       raise OSM::APIChangesetAlreadyClosedError.new(new.changeset)
     end
   end
@@ -40,7 +40,7 @@ module ConsistencyValidations
       raise OSM::APIChangesetMissingError.new
     elsif user.id != changeset.user_id
       raise OSM::APIUserChangesetMismatchError.new
-    elsif not changeset.is_open?
+    elsif !changeset.is_open?
       raise OSM::APIChangesetAlreadyClosedError.new(changeset)
     end
   end