Merge pull request #3886 from nebulab/kennyadsl/activestorage-specs

Enable ActiveStorage specs against Rails 6.1
solidusio · Feb 15, 2021 · f6e84d9 · f6e84d9
2 parents 0d2c83d + 430e14b
commit f6e84d9
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -98,13 +98,17 @@ jobs:
   postgres:
     executor: postgres
     parallelism: &parallelism 3
+    environment:
+      ENABLE_ACTIVE_STORAGE: true
     steps:
       - setup
       - test
 
   mysql:
     executor: mysql
     parallelism: *parallelism
+    environment:
+      ENABLE_ACTIVE_STORAGE: true
     steps:
       - setup
       - test

diff --git a/backend/app/views/spree/admin/taxons/attachment_forms/_paperclip.html.erb b/backend/app/views/spree/admin/taxons/attachment_forms/_paperclip.html.erb
@@ -2,7 +2,7 @@
   <%= f.field_container attachment do %>
     <%= f.label attachment %><br>
     <%= f.file_field attachment %>
-    <% if f.object.send(attachment).present? %>
+    <% if f.object.send(:"#{attachment}_present?") %>
       <%= image_tag f.object.send(attachment, definition[:default_style]) %>
       <%= link_to t('spree.actions.remove'),
                   admin_taxonomy_taxon_attachment_path(@taxonomy,