alchemy_cms 6.1.10 → 7.0.0.pre.a

data/db/migrate/20230121212637_alchemy_six_point_one.rb

@@ -0,0 +1,248 @@
+# frozen_string_literal: true
+
+class AlchemySixPointOne < ActiveRecord::Migration[ActiveRecord::Migration.current_version]
+  def up
+    unless table_exists?("alchemy_attachments")
+      create_table "alchemy_attachments" do |t|
+        t.string "name"
+        t.string "file_name"
+        t.string "file_mime_type"
+        t.integer "file_size"
+        t.integer "creator_id"
+        t.integer "updater_id"
+        t.datetime "created_at", null: false
+        t.datetime "updated_at", null: false
+        t.string "file_uid"
+        t.index ["creator_id"], name: "index_alchemy_attachments_on_creator_id"
+        t.index ["file_uid"], name: "index_alchemy_attachments_on_file_uid"
+        t.index ["updater_id"], name: "index_alchemy_attachments_on_updater_id"
+      end
+    end
+
+    unless table_exists?("alchemy_elements_alchemy_pages")
+      create_table "alchemy_elements_alchemy_pages", id: false do |t|
+        t.integer "element_id"
+        t.integer "page_id"
+        t.index ["element_id"], name: "index_alchemy_elements_alchemy_pages_on_element_id"
+        t.index ["page_id"], name: "index_alchemy_elements_alchemy_pages_on_page_id"
+      end
+    end
+
+    unless table_exists?("alchemy_folded_pages")
+      create_table "alchemy_folded_pages" do |t|
+        t.integer "page_id", null: false
+        t.integer "user_id", null: false
+        t.boolean "folded", default: false, null: false
+        t.index ["page_id", "user_id"], name: "index_alchemy_folded_pages_on_page_id_and_user_id", unique: true
+      end
+    end
+
+    unless table_exists?("alchemy_sites")
+      create_table "alchemy_sites" do |t|
+        t.string "host"
+        t.string "name"
+        t.datetime "created_at", null: false
+        t.datetime "updated_at", null: false
+        t.boolean "public", default: false, null: false
+        t.text "aliases"
+        t.boolean "redirect_to_primary_host", default: false, null: false
+        t.index ["host", "public"], name: "alchemy_sites_public_hosts_idx"
+        t.index ["host"], name: "index_alchemy_sites_on_host"
+      end
+    end
+
+    unless table_exists?("alchemy_languages")
+      create_table "alchemy_languages" do |t|
+        t.string "name"
+        t.string "language_code"
+        t.string "frontpage_name"
+        t.string "page_layout", default: "intro"
+        t.boolean "public", default: false, null: false
+        t.datetime "created_at", null: false
+        t.datetime "updated_at", null: false
+        t.integer "creator_id"
+        t.integer "updater_id"
+        t.boolean "default", default: false, null: false
+        t.string "country_code", default: "", null: false
+        t.references "site", null: false, foreign_key: { to_table: :alchemy_sites }
+        t.string "locale"
+        t.index ["creator_id"], name: "index_alchemy_languages_on_creator_id"
+        t.index ["language_code", "country_code"], name: "index_alchemy_languages_on_language_code_and_country_code"
+        t.index ["language_code"], name: "index_alchemy_languages_on_language_code"
+        t.index ["updater_id"], name: "index_alchemy_languages_on_updater_id"
+      end
+    end
+
+    unless table_exists?("alchemy_legacy_page_urls")
+      create_table "alchemy_legacy_page_urls" do |t|
+        t.string "urlname", null: false
+        t.integer "page_id", null: false
+        t.datetime "created_at", null: false
+        t.datetime "updated_at", null: false
+        t.index ["page_id"], name: "index_alchemy_legacy_page_urls_on_page_id"
+        t.index ["urlname"], name: "index_alchemy_legacy_page_urls_on_urlname"
+      end
+    end
+
+    unless table_exists?("alchemy_pages")
+      create_table "alchemy_pages" do |t|
+        t.string "name"
+        t.string "urlname"
+        t.string "title"
+        t.string "language_code"
+        t.boolean "language_root", default: false, null: false
+        t.string "page_layout"
+        t.text "meta_keywords"
+        t.text "meta_description"
+        t.integer "lft"
+        t.integer "rgt"
+        t.integer "parent_id"
+        t.integer "depth"
+        t.integer "locked_by"
+        t.boolean "restricted", default: false, null: false
+        t.boolean "robot_index", default: true, null: false
+        t.boolean "robot_follow", default: true, null: false
+        t.boolean "sitemap", default: true, null: false
+        t.boolean "layoutpage", default: false, null: false
+        t.datetime "created_at", null: false
+        t.datetime "updated_at", null: false
+        t.integer "creator_id"
+        t.integer "updater_id"
+        t.references "language", null: false, foreign_key: { to_table: :alchemy_languages }
+        t.datetime "published_at", precision: nil
+        t.datetime "locked_at", precision: nil
+        t.index ["creator_id"], name: "index_alchemy_pages_on_creator_id"
+        t.index ["locked_at", "locked_by"], name: "index_alchemy_pages_on_locked_at_and_locked_by"
+        t.index ["parent_id", "lft"], name: "index_pages_on_parent_id_and_lft"
+        t.index ["rgt"], name: "index_alchemy_pages_on_rgt"
+        t.index ["updater_id"], name: "index_alchemy_pages_on_updater_id"
+        t.index ["urlname"], name: "index_pages_on_urlname"
+      end
+    end
+
+    unless table_exists?("alchemy_page_versions")
+      create_table "alchemy_page_versions" do |t|
+        t.references "page", null: false, foreign_key: { to_table: :alchemy_pages, on_delete: :cascade }
+        t.datetime "public_on", precision: nil
+        t.datetime "public_until", precision: nil
+        t.datetime "created_at", null: false
+        t.datetime "updated_at", null: false
+        t.index ["public_on", "public_until"], name: "index_alchemy_page_versions_on_public_on_and_public_until"
+      end
+    end
+
+    unless table_exists?("alchemy_elements")
+      create_table "alchemy_elements" do |t|
+        t.string "name"
+        t.integer "position"
+        t.boolean "public", default: true, null: false
+        t.boolean "folded", default: false, null: false
+        t.boolean "unique", default: false, null: false
+        t.datetime "created_at", null: false
+        t.datetime "updated_at", null: false
+        t.integer "creator_id"
+        t.integer "updater_id"
+        t.integer "parent_element_id"
+        t.boolean "fixed", default: false, null: false
+        t.references "page_version", null: false, foreign_key: { to_table: :alchemy_page_versions, on_delete: :cascade }
+        t.index ["creator_id"], name: "index_alchemy_elements_on_creator_id"
+        t.index ["fixed"], name: "index_alchemy_elements_on_fixed"
+        t.index ["page_version_id", "parent_element_id"], name: "idx_alchemy_elements_on_page_version_id_and_parent_element_id"
+        t.index ["page_version_id", "position"], name: "idx_alchemy_elements_on_page_version_id_and_position"
+        t.index ["updater_id"], name: "index_alchemy_elements_on_updater_id"
+      end
+    end
+
+    unless table_exists?("alchemy_ingredients")
+      create_table "alchemy_ingredients" do |t|
+        t.references "element", null: false, foreign_key: { to_table: :alchemy_elements, on_delete: :cascade }
+        t.string "type", null: false
+        t.string "role", null: false
+        t.text "value"
+        if ActiveRecord::Migration.connection.adapter_name.match?(/postgres/i)
+          t.jsonb :data, default: {}
+        else
+          t.json :data
+        end
+        t.string "related_object_type"
+        t.integer "related_object_id"
+        t.datetime "created_at", null: false
+        t.datetime "updated_at", null: false
+        t.index ["element_id", "role"], name: "index_alchemy_ingredients_on_element_id_and_role", unique: true
+        t.index ["related_object_id", "related_object_type"], name: "idx_alchemy_ingredient_relation"
+        t.index ["type"], name: "index_alchemy_ingredients_on_type"
+      end
+    end
+
+    unless table_exists?("alchemy_nodes")
+      create_table "alchemy_nodes" do |t|
+        t.string "name"
+        t.string "title"
+        t.string "url"
+        t.boolean "nofollow", default: false, null: false
+        t.boolean "external", default: false, null: false
+        t.boolean "folded", default: false, null: false
+        t.integer "parent_id"
+        t.integer "lft", null: false
+        t.integer "rgt", null: false
+        t.integer "depth", default: 0, null: false
+        t.references "page", foreign_key: { to_table: :alchemy_pages, on_delete: :restrict }
+        t.references "language", null: false, foreign_key: { to_table: :alchemy_languages }
+        t.integer "creator_id"
+        t.integer "updater_id"
+        t.datetime "created_at", null: false
+        t.datetime "updated_at", null: false
+        t.string "menu_type", null: false
+        t.index ["creator_id"], name: "index_alchemy_nodes_on_creator_id"
+        t.index ["lft"], name: "index_alchemy_nodes_on_lft"
+        t.index ["parent_id"], name: "index_alchemy_nodes_on_parent_id"
+        t.index ["rgt"], name: "index_alchemy_nodes_on_rgt"
+        t.index ["updater_id"], name: "index_alchemy_nodes_on_updater_id"
+      end
+    end
+
+    unless table_exists?("alchemy_pictures")
+      create_table "alchemy_pictures" do |t|
+        t.string "name"
+        t.string "image_file_name"
+        t.integer "image_file_width"
+        t.integer "image_file_height"
+        t.datetime "created_at", null: false
+        t.datetime "updated_at", null: false
+        t.integer "creator_id"
+        t.integer "updater_id"
+        t.string "upload_hash"
+        t.string "image_file_uid"
+        t.integer "image_file_size"
+        t.string "image_file_format"
+        t.index ["creator_id"], name: "index_alchemy_pictures_on_creator_id"
+        t.index ["updater_id"], name: "index_alchemy_pictures_on_updater_id"
+      end
+    end
+
+    unless table_exists?("alchemy_picture_thumbs")
+      create_table "alchemy_picture_thumbs" do |t|
+        t.references "picture", null: false, foreign_key: { to_table: :alchemy_pictures }
+        t.string "signature", null: false
+        t.text "uid", null: false
+        t.index ["signature"], name: "index_alchemy_picture_thumbs_on_signature", unique: true
+      end
+    end
+  end
+
+  def down
+    drop_table "alchemy_attachments" if table_exists?("alchemy_attachments")
+    drop_table "alchemy_elements" if table_exists?("alchemy_elements")
+    drop_table "alchemy_elements_alchemy_pages" if table_exists?("alchemy_elements_alchemy_pages")
+    drop_table "alchemy_folded_pages" if table_exists?("alchemy_folded_pages")
+    drop_table "alchemy_ingredients" if table_exists?("alchemy_ingredients")
+    drop_table "alchemy_languages" if table_exists?("alchemy_languages")
+    drop_table "alchemy_legacy_page_urls" if table_exists?("alchemy_legacy_page_urls")
+    drop_table "alchemy_nodes" if table_exists?("alchemy_nodes")
+    drop_table "alchemy_page_versions" if table_exists?("alchemy_page_versions")
+    drop_table "alchemy_pages" if table_exists?("alchemy_pages")
+    drop_table "alchemy_picture_thumbs" if table_exists?("alchemy_picture_thumbs")
+    drop_table "alchemy_pictures" if table_exists?("alchemy_pictures")
+    drop_table "alchemy_sites" if table_exists?("alchemy_sites")
+  end
+end

data/lib/alchemy/cache_digests/template_tracker.rb

@@ -18,11 +18,10 @@ module Alchemy
         when /^alchemy\/page_layouts\/_(\w+)/
           page_layout = PageLayout.get($1)
           layout_elements = page_layout.fetch("elements", [])
-          layout_elements.map { |name| "alchemy/elements/_#{name}_view" } +
-            layout_elements.map { |name| "alchemy/elements/_#{name}" }
-        when /^alchemy\/elements\/_(\w+)_view/, /^alchemy\/elements\/_(\w+)/
-          essence_types($1).map { |name|
-            "alchemy/essences/_#{name.underscore}_view"
+          layout_elements.map { |name| "alchemy/elements/_#{name}" }
+        when /^alchemy\/elements\/_(\w+)/
+          ingredient_types($1).map { |type|
+            "alchemy/ingredients/_#{type.underscore}_view"
           }.uniq
         else
           ActionView::DependencyTracker::ERBTracker.call(@name, @template)
@@ -31,11 +30,11 @@ module Alchemy
 
       private
 
-      def essence_types(name)
+      def ingredient_types(name)
         element = Element.definitions.detect { |e| e["name"] == name }
         return [] unless element
 
-        element.fetch("contents", []).collect { |c| c["type"] }
+        element.fetch("ingredients", []).collect { |c| c["type"] }
       end
     end
   end

data/lib/alchemy/config.rb

@@ -78,11 +78,11 @@ module Alchemy
         if deprecated_configs.key?(name.to_sym)
           config = deprecated_configs[name.to_sym]
           if config.nil?
-            Alchemy::Deprecation.warn("#{name} configuration is deprecated and will be removed from Alchemy 5.1")
+            Alchemy::Deprecation.warn("#{name} configuration is deprecated and will be removed from Alchemy #{Alchemy::Deprecation.deprecation_horizon}")
           else
             value = show[name.to_s]
             if value != config
-              Alchemy::Deprecation.warn("Setting #{name} configuration to #{value} is deprecated and will be always #{config} in Alchemy 5.1")
+              Alchemy::Deprecation.warn("Setting #{name} configuration to #{value} is deprecated and will be always #{config} in Alchemy #{Alchemy::Deprecation.deprecation_horizon}")
             end
           end
         end

data/lib/alchemy/deprecation.rb

@@ -1,4 +1,4 @@
 # frozen_string_literal: true
 module Alchemy
-  Deprecation = ActiveSupport::Deprecation.new("7.0", "Alchemy")
+  Deprecation = ActiveSupport::Deprecation.new("8.0", "Alchemy")
 end

data/lib/alchemy/errors.rb

@@ -3,10 +3,6 @@
 # Custom error classes.
 #
 module Alchemy
-  class ContentDefinitionError < StandardError
-    # Raised if no content definition can be found.
-  end
-
   class DefaultLanguageNotFoundError < StandardError
     # Raised if no default language configuration can be found.
     def message
@@ -34,13 +30,6 @@ module Alchemy
     end
   end
 
-  class EssenceMissingError < StandardError
-    # Raised if a content misses its essence.
-    def message
-      "Essence not found"
-    end
-  end
-
   # Raised if calling +image_file+ on a Picture object returns nil.
   class MissingImageFileError < StandardError; end
 

data/lib/alchemy/hints.rb

@@ -4,7 +4,7 @@ module Alchemy
   module Hints
     # Returns a hint
     #
-    # To add a hint to a content pass +hint: true+ to the element definition in its element.yml
+    # To add a hint to a ingredient pass +hint: true+ to the element definition in its element.yml
     #
     # Then the hint itself is placed in the locale yml files.
     #
@@ -14,23 +14,23 @@ module Alchemy
     #
     #   # elements.yml
     #   - name: headline
-    #     contents:
-    #     - name: headline
-    #       type: EssenceText
-    #       hint: true
+    #     ingredients:
+    #       - role: headline
+    #         type: Text
+    #         hint: true
     #
     #   # config/locales/de.yml
     #     de:
-    #       content_hints:
+    #       ingredient_hints:
     #         headline: Lorem ipsum
     #
     # == Hint Key Example:
     #
     #   - name: headline
-    #     contents:
-    #     - name: headline
-    #       type: EssenceText
-    #       hint: Lorem ipsum
+    #     ingredients:
+    #       - role: headline
+    #         type: Text
+    #         hint: Lorem ipsum
     #
     # @return String
     #

data/lib/alchemy/permissions.rb

@@ -37,16 +37,12 @@ module Alchemy
       def alchemy_guest_user_rules
         can([:show, :download], Alchemy::Attachment) { |a| !a.restricted? }
 
-        can :read, Alchemy::Content, Alchemy::Content.available.not_restricted do |c|
-          c.public? && !c.restricted?
-        end
-
         can :read, Alchemy::Element, Alchemy::Element.published.not_restricted do |e|
           e.public? && !e.restricted?
         end
 
-        can :read, Alchemy::Page, Alchemy::Page.published.not_restricted.from_current_site do |p|
-          p.public? && !p.restricted? && p.site == Alchemy::Site.current
+        can :read, Alchemy::Page, Alchemy::Page.published.not_restricted do |p|
+          p.public? && !p.restricted?
         end
       end
     end
@@ -64,16 +60,12 @@ module Alchemy
         # Resources
         can [:show, :download], Alchemy::Attachment
 
-        can :read, Alchemy::Content, Alchemy::Content.available do |c|
-          c.public?
-        end
-
         can :read, Alchemy::Element, Alchemy::Element.published do |e|
           e.public?
         end
 
-        can :read, Alchemy::Page, Alchemy::Page.published.from_current_site do |p|
-          p.public? && p.site == Alchemy::Site.current
+        can :read, Alchemy::Page, Alchemy::Page.published do |p|
+          p.public?
         end
       end
     end
@@ -109,12 +101,7 @@ module Alchemy
 
         # Resources
         can [:read, :download], Alchemy::Attachment
-        can :manage, Alchemy::Content
         can :manage, Alchemy::Element
-        can :manage, Alchemy::EssenceAudio
-        can :manage, Alchemy::EssenceFile
-        can :manage, Alchemy::EssencePicture
-        can :manage, Alchemy::EssenceVideo
         can :manage, Alchemy::Ingredient
         can [:crop], Alchemy::Ingredients::Picture
         can :manage, Alchemy::LegacyPageUrl

data/lib/alchemy/routing_constraints.rb

@@ -6,7 +6,7 @@ module Alchemy
   # Alchemy has a very strong catch all route.
   # But we don't want to handle all requests.
   #
-  # For instance we only want to handle html and rss requests and
+  # For instance we only want to handle html requests and
   # don't want to swallow the rails/info routes in development mode.
   #
   class RoutingConstraints
@@ -21,13 +21,13 @@ module Alchemy
 
     private
 
-    # We only want html and rss requests to be handled by us.
+    # We only want html requests to be handled by us.
     #
     # If an unknown format is requested we want to handle this,
     # because it could be a legacy route that needs to be redirected.
     #
     def handable_format?
-      @request.format.symbol.nil? || (@request.format.symbol == :html) || (@request.format.symbol == :rss)
+      @request.format.symbol.nil? || (@request.format.symbol == :html)
     end
 
     # We don't want to handle the Rails info routes.

data/lib/alchemy/searchable_resource.rb

@@ -0,0 +1,38 @@
+# frozen_string_literal: true
+
+module Alchemy
+  # Defines the methods that are needed to
+  # make a model searchable in Alchemy's admin search by Ransack.
+  module SearchableResource
+    SEARCHABLE_COLUMN_TYPES = %i[string text]
+
+    # Allow all string and text attributes to be searchable by Ransack.
+    def ransackable_attributes(_auth_object = nil)
+      searchable_alchemy_resource_attributes
+    end
+
+    # Allow all attributes to be sortable by Ransack.
+    def ransortable_attributes(_auth_object = nil)
+      columns.map(&:name)
+    end
+
+    # Allow all associations defined in +alchemy_resource_relations+ to be searchable by Ransack.
+    def ransackable_associations(_auth_object = nil)
+      searchable_alchemy_resource_associations
+    end
+
+    protected
+
+    def searchable_alchemy_resource_attributes
+      columns.select { |c| c.type.in?(SEARCHABLE_COLUMN_TYPES) }.map(&:name)
+    end
+
+    def searchable_alchemy_resource_associations
+      if respond_to?(:alchemy_resource_relations)
+        alchemy_resource_relations.keys.map!(&:to_s)
+      else
+        []
+      end
+    end
+  end
+end

data/lib/alchemy/seeder.rb

@@ -82,11 +82,7 @@ module Alchemy
       end
 
       def page_yml
-        @_page_yml ||= YAML.safe_load(
-          page_seeds_file.read,
-          permitted_classes: [Date],
-          aliases: true
-        )
+        @_page_yml ||= YAML.load_file(page_seeds_file)
       end
 
       def contentpages
@@ -103,9 +99,7 @@ module Alchemy
 
       def create_page(draft, attributes = {})
         children = draft.delete("children") || []
-        page = Alchemy::Page.new(draft.merge(attributes))
-        page.versions.build
-        page.save!
+        page = Alchemy::Page.create!(draft.merge(attributes))
         log "Created page: #{page.name}"
         children.each do |child|
           create_page(child, parent: page, language: page.language)

data/lib/alchemy/tasks/tidy.rb

@@ -25,25 +25,6 @@ module Alchemy
         end
       end
 
-      def update_content_positions
-        Alchemy::Element.all.each do |element|
-          if element.contents.any?
-            puts "\n## Updating content positions of element `#{element.name}`"
-          end
-          element.contents.group_by(&:element_id).each do |_, contents|
-            contents.each_with_index do |content, idx|
-              position = idx + 1
-              if content.position != position
-                log "Updating position for content ##{content.id} to #{position}"
-                content.update_column(:position, position)
-              else
-                log "Position for content ##{content.id} is already correct (#{position})", :skip
-              end
-            end
-          end
-        end
-      end
-
       def remove_orphaned_elements
         puts "\n## Removing orphaned elements"
         elements = Alchemy::Element.unscoped.not_nested
@@ -79,25 +60,6 @@ module Alchemy
         end
       end
 
-      def remove_orphaned_contents
-        puts "\n## Removing orphaned contents"
-        contents = Alchemy::Content.unscoped.all
-        if contents.any?
-          orphaned_contents = contents.select do |content|
-            content.essence.nil? && content.essence_id.present? ||
-              content.element.nil? && content.element_id.present?
-          end
-          if orphaned_contents.any?
-            log "Found #{orphaned_contents.size} orphaned contents"
-            destroy_orphaned_records(orphaned_contents, "content")
-          else
-            log "No orphaned contents found", :skip
-          end
-        else
-          log "No contents found", :skip
-        end
-      end
-
       def remove_duplicate_legacy_urls
         puts "\n## Removing duplicate legacy URLs"
         sql = <<~SQL

data/lib/alchemy/test_support/capybara_helpers.rb

@@ -0,0 +1,69 @@
+# frozen_string_literal: true
+
+module Alchemy
+  module TestSupport
+    module CapybaraHelpers
+      # Select2 capybara helper
+      def select2(value, options)
+        label = find_label_by_text(options[:from])
+
+        select2_anchor_selector = ".select2-container a"
+
+        if label.has_css?(select2_anchor_selector)
+          label.find(select2_anchor_selector).click
+        else
+          within label.find(:xpath, "..") do
+            find(select2_anchor_selector).click
+          end
+        end
+
+        within_entire_page do
+          page.find(
+            "div.select2-result-label",
+            text: /#{Regexp.escape(value)}/i, match: :prefer_exact,
+          ).click
+        end
+      end
+
+      def select2_search(value, options)
+        if options[:from]
+          label = find_label_by_text(options[:from])
+          within label.first(:xpath, ".//..") do
+            options[:from] = "##{find(".select2-container")["id"]}"
+          end
+        elsif options[:element_id] && options[:ingredient_role]
+          container_id = find("#element_#{options[:element_id]} [data-ingredient-role='#{options[:ingredient_role]}'] .select2-container")["id"]
+          options[:from] = "##{container_id}"
+        end
+
+        find("#{options[:from]}:not(.select2-container-disabled):not(.select2-offscreen)").click
+
+        within_entire_page do
+          find("input.select2-input.select2-focused").set(value)
+          expect(page).to have_selector(".select2-result-label", visible: true)
+          find("div.select2-result-label", text: /#{Regexp.escape(value)}/i, match: :prefer_exact).click
+          expect(page).not_to have_selector(".select2-result-label")
+        end
+      end
+
+      def click_button_with_label(label)
+        label = find("label", text: label)
+        within label.first(:xpath, ".//..") do
+          first("button").click
+        end
+      end
+
+      private
+
+      def within_entire_page(&block)
+        within(:xpath, "//body", &block)
+      end
+
+      def find_label_by_text(text)
+        find "label:not(.select2-offscreen)",
+          text: /#{Regexp.escape(text)}/i,
+          match: :one
+      end
+    end
+  end
+end

data/lib/alchemy/test_support/factories/element_factory.rb

@@ -3,7 +3,6 @@
 FactoryBot.define do
   factory :alchemy_element, class: "Alchemy::Element" do
     name { "article" }
-    autogenerate_contents { false }
     autogenerate_ingredients { false }
     association :page_version, factory: :alchemy_page_version
 
@@ -26,12 +25,7 @@ FactoryBot.define do
       name { "slide" }
     end
 
-    trait :with_contents do
-      autogenerate_contents { true }
-    end
-
     trait :with_ingredients do
-      name { "element_with_ingredients" }
       autogenerate_ingredients { true }
     end
   end

data/lib/alchemy/test_support/factories/ingredient_factory.rb

@@ -19,7 +19,7 @@ FactoryBot.define do
     factory :"alchemy_ingredient_#{ingredient}", class: "Alchemy::Ingredients::#{ingredient.classify}" do
       role { ingredient }
       type { "Alchemy::Ingredients::#{ingredient.classify}" }
-      association :element, name: "all_you_can_eat_ingredients", factory: :alchemy_element
+      association :element, name: "all_you_can_eat", factory: :alchemy_element
     end
   end
 end