Fix error messages for requests

hpi-swt2 · Mar 4, 2019 · 6f66667 · 6f66667
1 parent 0eec8dd
commit 6f66667
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/app/models/request.rb b/app/models/request.rb
@@ -33,8 +33,8 @@ class Request < ApplicationRecord
   end
 
   def name_uniqueness
-    errors.add('vSphere already has a VM with the same name') if VSphere::VirtualMachine.all.map(&:name).include?(name)
-    errors.add('There is already a request with the same name') if (Request.pending + Request.accepted).map(&:name).include?(name)
+    errors.add(:name, ': vSphere already has a VM with the same name') if VSphere::VirtualMachine.all.map(&:name).include?(name)
+    errors.add(:name, ': There is already a request with the same name') if (Request.pending + Request.accepted).map(&:name).include?(name)
   end
 
   def description_text(host_name)

diff --git a/spec/factories/requests.rb b/spec/factories/requests.rb
@@ -2,7 +2,7 @@
 
 FactoryBot.define do
   factory :request do
-    name { 'myvm' }
+    name { Faker::Alphanumeric.unique.alphanumeric 10 }
     cpu_cores { 2 }
     ram_gb { 1 }
     storage_gb { 3 }