fix organization logo validation (#720)

coopdevs · Dec 8, 2023 · 5d56ea6 · 5d56ea6
1 parent 87139a2
commit 5d56ea6
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 2 deletions.
diff --git a/app/models/organization.rb b/app/models/organization.rb
@@ -26,7 +26,9 @@ class Organization < ApplicationRecord
   has_many :petitions, dependent: :delete_all
 
   validates :name, presence: true, uniqueness: true
-  validates :logo, content_type: /\Aimage\/.*\z/
+
+  LOGO_CONTENT_TYPES = %w(image/jpeg image/png image/gif)
+  validates :logo, content_type: LOGO_CONTENT_TYPES
 
   before_validation :ensure_url
   after_create :create_account

diff --git a/app/views/organizations/_form.html.erb b/app/views/organizations/_form.html.erb
@@ -9,6 +9,6 @@
   <%= f.input :address %>
   <%= f.input :neighborhood %>
   <%= f.input :city %>
-  <%= f.input :logo, input_html: { accept: "image/*" } %>
+  <%= f.input :logo, input_html: { accept: Organization::LOGO_CONTENT_TYPES.join(',') } %>
   <%= f.button :submit %>
 <% end %>
diff --git a/spec/models/organization_spec.rb b/spec/models/organization_spec.rb
@@ -8,6 +8,11 @@
 
       expect(organization).to be_invalid
 
+      temp_file = Tempfile.new('test.svg')
+      organization.logo.attach(io: File.open(temp_file.path), filename: 'test.svg')
+
+      expect(organization).to be_invalid
+
       temp_file = Tempfile.new('test.png')
       organization.logo.attach(io: File.open(temp_file.path), filename: 'test.png')