decidim-decidim_awesome 0.10.3 → 0.11.1

data/lib/decidim/decidim_awesome/menu_hacker.rb

@@ -21,6 +21,7 @@ module Decidim
           default = default_items.find { |i| i.url.gsub(/\?.*/, "") == item.url }
           if default
             item.send("overrided?=", true)
+            item[:original_active] = default.active
             @items.reject! { |i| i.url.gsub(/\?.*/, "") == item.url }
           end
           @items << item
@@ -36,10 +37,7 @@ module Decidim
       attr_reader :name, :view
 
       def default_items
-        @default_items ||= build_menu.items.map do |item|
-          item.instance_variable_set(:@active, method(:activate?)) unless item.active == :exact
-          item
-        end
+        @default_items ||= build_menu.items
       end
 
       def build_menu
@@ -48,7 +46,6 @@ module Decidim
         menu
       end
 
-      # rubocop:disable Style/OpenStructUse
       def menu_overrides
         @menu_overrides ||= current_config.map do |item|
           OpenStruct.new(
@@ -65,7 +62,6 @@ module Decidim
           )
         end
       end
-      # rubocop:enable Style/OpenStructUse
 
       def activate?(url, view)
         urls = @items.map(&:url).sort_by(&:length).reverse
@@ -83,14 +79,14 @@ module Decidim
         when "verified_user"
           # the cleaner version should be user.authorizations.any?
           # but there is not relationship between users and authorizations
-          Decidim::Authorization.where(user: user).any? { |auth| auth.granted? && !auth.expired? }
+          Decidim::Authorization.where(user:).any? { |auth| auth.granted? && !auth.expired? }
         else
           true
         end
       end
 
       def current_config
-        @current_config ||= (AwesomeConfig.find_by(var: name, organization: organization)&.value || []).filter { |i| i.is_a? Hash }
+        @current_config ||= (AwesomeConfig.find_by(var: name, organization:)&.value || []).filter { |i| i.is_a? Hash }
       end
     end
   end

data/lib/decidim/decidim_awesome/system_checker.rb

@@ -24,8 +24,8 @@ module Decidim
 
         delegate :to_h, to: :overrides
 
-        def each(&block)
-          to_h.each(&block)
+        def each(&)
+          to_h.each(&)
         end
 
         def each_file
@@ -58,11 +58,9 @@ module Decidim
           Digest::MD5.hexdigest(File.read(file))
         end
 
-        # rubocop:disable Style/OpenStructUse
         def to_struct(obj)
           OpenStruct.new obj
         end
-        # rubocop:enable Style/OpenStructUse
       end
     end
   end

data/lib/decidim/decidim_awesome/test/factories.rb

@@ -8,22 +8,22 @@ FactoryBot.define do
   factory :awesome_config, class: "Decidim::DecidimAwesome::AwesomeConfig" do
     var { Faker::Hacker.noun }
     value { Decidim::DecidimAwesome.config.to_a.sample(1).to_h }
-    organization { create :organization }
+    organization
   end
 
   factory :config_constraint, class: "Decidim::DecidimAwesome::ConfigConstraint" do
     settings { { Faker::Hacker.noun => Faker::Hacker.noun } }
-    awesome_config { create :awesome_config }
+    awesome_config
   end
 
   factory :awesome_editor_image, class: "Decidim::DecidimAwesome::EditorImage" do
     file { Decidim::Dev.test_file("city.jpeg", "image/jpeg") }
     path { Faker::Internet.url(host: "", scheme: "") }
-    author { create :user }
-    organization { create :organization }
+    author { association :user }
+    organization
   end
 
-  factory :paper_trail_version, class: Decidim::DecidimAwesome::PaperTrailVersion do
+  factory :paper_trail_version, class: "Decidim::DecidimAwesome::PaperTrailVersion" do
     item_id { user.id }
     item_type { "Decidim::ParticipatoryProcessUserRole" }
     event { "create" }
@@ -33,28 +33,28 @@ FactoryBot.define do
   factory :map_component, parent: :component do
     name { Decidim::Components::Namer.new(participatory_space.organization.available_locales, :proposals).i18n_name }
     manifest_name { :awesome_map }
-    participatory_space { create(:participatory_process, :with_steps, organization: organization) }
+    participatory_space { association(:participatory_process, :with_steps, organization:) }
   end
 
   factory :iframe_component, parent: :component do
     name { Decidim::Components::Namer.new(participatory_space.organization.available_locales, :proposals).i18n_name }
     manifest_name { :awesome_iframe }
-    participatory_space { create(:participatory_process, :with_steps, organization: organization) }
+    participatory_space { association(:participatory_process, :with_steps, organization:) }
   end
 
   factory :awesome_vote_weight, class: "Decidim::DecidimAwesome::VoteWeight" do
-    vote { create :proposal_vote }
+    vote { association(:proposal_vote) }
     sequence(:weight) { |n| n }
   end
 
   factory :awesome_proposal_extra_fields, class: "Decidim::DecidimAwesome::ProposalExtraField" do
-    proposal { create :proposal }
+    proposal
 
     trait :with_votes do
       after :create do |weight|
         5.times.collect do |n|
           vote = create(:proposal_vote, proposal: weight.proposal, author: create(:user, organization: weight.proposal.organization))
-          create(:awesome_vote_weight, vote: vote, weight: n + 1)
+          create(:awesome_vote_weight, vote:, weight: n + 1)
         end
       end
     end

data/lib/decidim/decidim_awesome/test/initializer.rb

@@ -3,11 +3,9 @@
 Decidim::DecidimAwesome.configure do |config|
   if ENV.fetch("FEATURES", nil) == "disabled"
     [
-      :allow_images_in_full_editor,
-      :allow_images_in_small_editor,
+      :allow_images_in_editors,
+      :allow_videos_in_editors,
       :allow_images_in_proposals,
-      :use_markdown_editor,
-      :allow_images_in_markdown_editor,
       :auto_save_forms,
       :intergram_for_admins,
       :intergram_for_public,
@@ -15,6 +13,7 @@ Decidim::DecidimAwesome.configure do |config|
       :proposal_custom_fields,
       :proposal_private_custom_fields,
       :menu,
+      :home_content_block_menu,
       :scoped_admins,
       :custom_redirects,
       :validate_title_min_length,
@@ -36,10 +35,3 @@ Decidim::DecidimAwesome.configure do |config|
     config.disabled_components = [:awesome_map, :awesome_iframe]
   end
 end
-
-if Decidim::DecidimAwesome.legacy_version?
-  Rails.application.config.to_prepare do
-    Decidim::Api::Schema.max_complexity = 5000
-    Decidim::Api::Schema.max_depth = 50
-  end
-end

data/lib/decidim/decidim_awesome/test/layouts/decidim/_head.html.erb

@@ -18,11 +18,11 @@
 <meta property="og:image" content="<%= decidim_meta_image_url %>">
 
 <%= favicon %>
-<%= stylesheet_pack_tag "decidim_core", media: "all" %>
+<%= append_stylesheet_pack_tag "decidim_core", media: "all" %>
 <%= invisible_captcha_styles %>
 
 <%= organization_colors %>
-<%= javascript_pack_tag "decidim_core", defer: false %>
+<%= append_javascript_pack_tag "decidim_core", defer: false %>
 
 <%= render partial: "layouts/decidim/head_extra" %>
 <%== current_organization.header_snippets if Decidim.enable_html_header_snippets %>

data/lib/decidim/decidim_awesome/test/layouts/decidim/admin/_header.html.erb

@@ -2,7 +2,7 @@
 <%= csrf_meta_tags %>
 <%= organization_colors %>
 
-<%= stylesheet_pack_tag "decidim_admin", media: "all" %>
-<%= javascript_pack_tag "decidim_admin", defer: false %>
+<%= append_stylesheet_pack_tag "decidim_admin", media: "all" %>
+<%= append_javascript_pack_tag "decidim_admin", defer: false %>
 
 <%= snippets.display(:head) %>

data/lib/decidim/decidim_awesome/test/shared_examples/box_label_editor_examples.rb

@@ -5,19 +5,19 @@ shared_examples "edits box label inline" do |test_case, key|
 
   it "updates the label when no changes" do
     link = find("[data-key=#{key}] a.awesome-auto-edit", match: :first)
-    expect(page).not_to have_css("input.awesome-auto-edit")
+    expect(page).not_to have_field(class: "awesome-auto-edit")
     link.click
-    expect(page).to have_css("input.awesome-auto-edit")
+    expect(page).to have_field(class: "awesome-auto-edit")
     find("body").click
-    expect(page).not_to have_css("input.awesome-auto-edit")
+    expect(page).not_to have_field(class: "awesome-auto-edit")
     link.click
     input = find("[data-key=#{key}] input.awesome-auto-edit")
     input.fill_in with: "A new làbel\n"
     sleep 1
-    expect(page).not_to have_css("input.awesome-auto-edit")
+    expect(page).not_to have_field(class: "awesome-auto-edit")
     expect(page).to have_css("span.awesome-auto-edit[data-key=a_new_label]")
 
-    find("*[type=submit]").click
+    click_link_or_button "Update configuration"
     case test_case
     when :css
       expect(page).to have_content("body {background: red;}")
@@ -48,19 +48,19 @@ shared_examples "edits box label inline" do |test_case, key|
     end
 
     link = find("[data-key=#{key}] a.awesome-auto-edit", match: :first)
-    expect(page).not_to have_css("input.awesome-auto-edit")
+    expect(page).not_to have_field(class: "awesome-auto-edit")
     link.click
-    expect(page).to have_css("input.awesome-auto-edit")
+    expect(page).to have_field(class: "awesome-auto-edit")
     find("body").click
-    expect(page).not_to have_css("input.awesome-auto-edit")
+    expect(page).not_to have_field(class: "awesome-auto-edit")
     link.click
     input = find("[data-key=#{key}] input.awesome-auto-edit")
     input.fill_in with: "A new làbel\n"
     sleep 1
-    expect(page).not_to have_css("input.awesome-auto-edit")
+    expect(page).not_to have_field(class: "awesome-auto-edit")
     expect(page).to have_css("span.awesome-auto-edit[data-key=a_new_label]")
 
-    find("*[type=submit]").click
+    click_link_or_button "Update configuration"
     case test_case
     when :css
       expect(page).to have_admin_callout("updated successfully")
@@ -78,34 +78,34 @@ shared_examples "edits box label inline" do |test_case, key|
 
   it "updates the label with post changes" do
     link = find("[data-key=#{key}] a.awesome-auto-edit", match: :first)
-    expect(page).not_to have_css("input.awesome-auto-edit")
+    expect(page).not_to have_field(class: "awesome-auto-edit")
     link.click
-    expect(page).to have_css("input.awesome-auto-edit")
+    expect(page).to have_field(class: "awesome-auto-edit")
     find("body").click
-    expect(page).not_to have_css("input.awesome-auto-edit")
+    expect(page).not_to have_field(class: "awesome-auto-edit")
     link.click
     input = find("[data-key=#{key}] input.awesome-auto-edit")
     input.fill_in with: "A new làbel\n"
     sleep 1
-    expect(page).not_to have_css("input.awesome-auto-edit")
+    expect(page).not_to have_field(class: "awesome-auto-edit")
     expect(page).to have_css("span.awesome-auto-edit[data-key=a_new_label]")
 
     case test_case
     when :css
-      sleep 2
+      sleep 1
       page.execute_script('document.querySelector("[data-key=a_new_label] .CodeMirror").CodeMirror.setValue("body {background: lilac;}");')
-      find("*[type=submit]").click
+      click_link_or_button "Update configuration"
       expect(page).to have_admin_callout("updated successfully")
       expect(page).to have_content("body {background: lilac;}")
     when :fields
       expect(page).to have_content("Full Name")
       sleep 2
       page.execute_script("$('.proposal_custom_fields_container[data-key=a_new_label] .proposal_custom_fields_editor')[0].FormBuilder.actions.setData(#{data})")
-      find("*[type=submit]").click
+      click_link_or_button "Update configuration"
       expect(page).to have_content("Short Name")
     when :admins
       page.execute_script("$('.multiusers-select:first').append(new Option('#{user.name}', #{user.id}, true, true)).trigger('change');")
-      find("*[type=submit]").click
+      click_link_or_button "Update configuration"
       expect(page).to have_content(user.name.to_s)
       expect(page).to have_content(user2.name.to_s)
       expect(page).to have_content(user3.name.to_s)

data/lib/decidim/decidim_awesome/test/shared_examples/config_examples.rb

@@ -4,7 +4,7 @@ shared_examples "javascript config vars" do
   it "has DecidimAwesome object" do
     expect(page.body).to have_content("window.DecidimAwesome")
     expect(page.body).to have_content("window.DecidimAwesome.version")
-    expect(page.body).to have_content("window.DecidimAwesome.editor_uploader_path")
+    expect(page.body).to have_content("window.DecidimAwesome.editorUploaderPath")
     expect(page.body).to have_content("window.DecidimAwesome.texts")
   end
 end
@@ -12,7 +12,7 @@ end
 shared_examples "has menu link" do |item|
   let(:prefix) { "config/" }
   it "shows the feature link" do
-    within ".secondary-nav" do
+    within ".sidebar-menu" do
       expect(page).to have_link(href: "/admin/decidim_awesome/#{prefix}#{item}")
     end
   end
@@ -21,7 +21,7 @@ end
 shared_examples "do not have menu link" do |item|
   let(:prefix) { "config/" }
   it "do not show the feature link" do
-    within ".secondary-nav" do
+    within ".sidebar-menu" do
       expect(page).not_to have_link(href: "/admin/decidim_awesome/#{prefix}#{item}")
     end
   end

data/lib/decidim/decidim_awesome/test/shared_examples/custom_fields_examples.rb

@@ -66,8 +66,8 @@ shared_examples "removes a box" do |name|
     expect(page).to have_content("Street Sweeper")
     expect(page).not_to have_content("Short Bio")
 
-    expect(Decidim::DecidimAwesome::AwesomeConfig.find_by(organization: organization, var: "#{var_name}_foo")).not_to be_present
-    expect(Decidim::DecidimAwesome::AwesomeConfig.find_by(organization: organization, var: "#{var_name}_bar")).to be_present
+    expect(Decidim::DecidimAwesome::AwesomeConfig.find_by(organization:, var: "#{var_name}_foo")).not_to be_present
+    expect(Decidim::DecidimAwesome::AwesomeConfig.find_by(organization:, var: "#{var_name}_bar")).to be_present
   end
 end
 
@@ -81,11 +81,11 @@ shared_examples "adds a constraint" do
 
   it "adds a new config helper var" do
     within ".proposal_custom_fields_container[data-key=\"foo\"]" do
-      click_button "Add case"
+      click_on "Add case"
     end
 
     select "Processes", from: "constraint_participatory_space_manifest"
-    within ".modal-content" do
+    within "#new-modal-#{var_name}_foo" do
       click_on "Save"
     end
 
@@ -95,8 +95,8 @@ shared_examples "adds a constraint" do
       expect(page).to have_content("Processes")
     end
 
-    expect(Decidim::DecidimAwesome::AwesomeConfig.find_by(organization: organization, var: "#{var_name}_bar")).to be_present
-    expect(Decidim::DecidimAwesome::AwesomeConfig.find_by(organization: organization, var: "#{var_name}_bar").constraints.first.settings).to eq(constraint.settings)
+    expect(Decidim::DecidimAwesome::AwesomeConfig.find_by(organization:, var: "#{var_name}_bar")).to be_present
+    expect(Decidim::DecidimAwesome::AwesomeConfig.find_by(organization:, var: "#{var_name}_bar").constraints.first.settings).to eq(constraint.settings)
   end
 end
 
@@ -130,9 +130,9 @@ shared_examples "removes a constraint" do
       expect(page).not_to have_content("Proposals")
     end
 
-    expect(Decidim::DecidimAwesome::AwesomeConfig.find_by(organization: organization, var: "#{var_name}_bar")).to be_present
-    expect(Decidim::DecidimAwesome::AwesomeConfig.find_by(organization: organization, var: "#{var_name}_bar").constraints.count).to eq(1)
-    expect(Decidim::DecidimAwesome::AwesomeConfig.find_by(organization: organization, var: "#{var_name}_bar").constraints.first).to eq(another_constraint)
+    expect(Decidim::DecidimAwesome::AwesomeConfig.find_by(organization:, var: "#{var_name}_bar")).to be_present
+    expect(Decidim::DecidimAwesome::AwesomeConfig.find_by(organization:, var: "#{var_name}_bar").constraints.count).to eq(1)
+    expect(Decidim::DecidimAwesome::AwesomeConfig.find_by(organization:, var: "#{var_name}_bar").constraints.first).to eq(another_constraint)
   end
 
   context "and there is only one constraint" do
@@ -148,8 +148,8 @@ shared_examples "removes a constraint" do
       end
 
       expect(page).to have_content("Sorry, this cannot be deleted")
-      expect(Decidim::DecidimAwesome::AwesomeConfig.find_by(organization: organization, var: "#{var_name}_bar").constraints.count).to eq(1)
-      expect(Decidim::DecidimAwesome::AwesomeConfig.find_by(organization: organization, var: "#{var_name}_bar").constraints.first).to eq(constraint)
+      expect(Decidim::DecidimAwesome::AwesomeConfig.find_by(organization:, var: "#{var_name}_bar").constraints.count).to eq(1)
+      expect(Decidim::DecidimAwesome::AwesomeConfig.find_by(organization:, var: "#{var_name}_bar").constraints.first).to eq(constraint)
     end
   end
 end

data/lib/decidim/decidim_awesome/test/shared_examples/custom_redirects_contexts.rb

@@ -4,16 +4,16 @@ shared_context "with custom redirects params" do
   let(:organization) { create(:organization) }
   let(:context) do
     {
-      current_user: create(:user, organization: organization),
+      current_user: create(:user, organization:),
       current_organization: organization
     }
   end
   let(:params) do
     {
-      origin: origin,
-      destination: destination,
-      active: active,
-      pass_query: pass_query
+      origin:,
+      destination:,
+      active:,
+      pass_query:
     }
   end
   let(:attributes) do
@@ -33,8 +33,8 @@ shared_context "with custom redirects params" do
 
   let(:another_params) do
     {
-      allow_images_in_full_editor: true,
-      allow_images_in_small_editor: true
+      allow_images_in_editors: true,
+      allow_videos_in_editors: true
     }
   end
   let(:form) do

data/lib/decidim/decidim_awesome/test/shared_examples/editor_examples.rb

@@ -24,76 +24,36 @@ shared_examples "has video support" do
   end
 end
 
-shared_examples "has no drag and drop" do |rte|
-  it "has no help text" do
+shared_examples "has no drag and drop" do
+  it "cannot drop a file" do
     expect(page).not_to have_content("Add images by dragging & dropping or pasting them.")
-  end
-
-  if rte
-    it "has image button" do
-      expect(page).not_to have_xpath("//button[@class='ql-image']")
-    end
-  else
-    it "has no paste event" do
-      sleep 1
-      expect(page.execute_script("return typeof $._data($('#{editor_selector}')[0], 'events').paste")).to eq("undefined")
-    end
-
-    it "has no drop event" do
-      sleep 1
-      expect(page.execute_script("return typeof $._data($('#{editor_selector}')[0], 'events').drop")).to eq("undefined")
-    end
-  end
-end
-
-shared_examples "has drag and drop" do |rte|
-  it "has help text" do
-    expect(page).to have_content("Add images by dragging & dropping or pasting them.")
-  end
-
-  if rte
-    it "has image button" do
-      expect(page).to have_xpath("//button[@class='ql-image']")
-    end
-  else
-    it "has paste event" do
-      sleep 1
-      expect(page.execute_script("return typeof $._data($('#{editor_selector}')[0], 'events').paste")).to eq("object")
-    end
-
-    it "has drop event" do
-      sleep 1
-      expect(page.execute_script("return typeof $._data($('#{editor_selector}')[0], 'events').drop")).to eq("object")
-    end
+    find(editor_selector).drop(image)
+    expect(page.execute_script("return document.querySelector('#{editor_selector}').value")).not_to eq("[Uploading file...]")
+    sleep 1
+    last_image = Decidim::DecidimAwesome::EditorImage.last
+    expect(last_image).to be_nil
   end
 end
 
-shared_examples "has markdown editor" do |images|
-  it "has CodeMirror class" do
-    expect(page).to have_xpath("//div[@class='CodeMirror cm-s-paper CodeMirror-wrap']")
-  end
-
-  it "has toolbar" do
-    expect(page).to have_xpath("//div[@class='editor-toolbar']")
-  end
-
-  if images
-    it "has help text" do
+shared_examples "has drag and drop" do
+  it "can drop a file" do
+    within "form.edit_proposal" do
       expect(page).to have_content("Add images by dragging & dropping or pasting them.")
-    end
-  else
-    it "has no help text" do
-      expect(page).not_to have_content("Add images by dragging & dropping or pasting them.")
-    end
-  end
-end
-
-shared_examples "has no markdown editor" do
-  it "has CodeMirror class" do
-    expect(page).not_to have_xpath("//div[@class='CodeMirror cm-s-paper CodeMirror-wrap']")
-  end
-
-  it "has toolbar" do
-    expect(page).not_to have_xpath("//div[@class='editor-toolbar']")
+      fill_in :proposal_body, with: ""
+    end
+    find(editor_selector).drop(image)
+    expect(page.execute_script("return document.querySelector('#{editor_selector}').value")).to include("[Uploading file...]")
+    sleep 1
+    last_image = Decidim::DecidimAwesome::EditorImage.last
+    expect(last_image).to be_present
+    content = page.execute_script("return document.querySelector('#{editor_selector}').value")
+    expect(content).to include(last_image.attached_uploader(:file).path)
+    within "form.edit_proposal" do
+      # ensures valid body validations
+      fill_in :proposal_body, with: "This is a super test with lots of downcases characters to be sure that the image name does not mess with percentage of caps.\n#{content}"
+      fill_in :proposal_title, with: "This is a test proposal"
+      click_on "Send"
+    end
+    expect(proposal.reload.body["en"]).to include(last_image.attached_uploader(:file).path)
   end
 end

data/lib/decidim/decidim_awesome/test/shared_examples/menu_hack_contexts.rb

@@ -4,20 +4,21 @@ shared_context "with menu hacks params" do
   let(:organization) { create(:organization) }
   let(:context) do
     {
-      current_user: create(:user, organization: organization),
+      current_user: create(:user, organization:),
       current_organization: organization
     }
   end
   let(:params) do
     {
-      menu_id: :menu,
+      menu_id:,
       raw_label: label,
-      url: url,
-      position: position,
-      target: target,
-      visibility: visibility
+      url:,
+      position:,
+      target:,
+      visibility:
     }
   end
+  let(:menu_id) { menu_name.to_sym }
   let(:attributes) do
     {
       "label" => label,
@@ -37,11 +38,11 @@ shared_context "with menu hacks params" do
   let(:position) { 2 }
   let(:target) { "_blank" }
   let(:visibility) { "hidden" }
-  let(:menu_name) { :menu }
+
   let(:another_params) do
     {
-      allow_images_in_full_editor: true,
-      allow_images_in_small_editor: true
+      allow_images_in_editors: true,
+      allow_videos_in_editors: true
     }
   end
   let(:form) do