decidim-core 0.22.0 → 0.23.3

data/lib/decidim/core/engine.rb

@@ -28,6 +28,7 @@ require "omniauth-twitter"
 require "omniauth-google-oauth2"
 require "invisible_captcha"
 require "premailer/rails"
+require "premailer/adapter/decidim"
 require "geocoder"
 require "paper_trail"
 require "cells/rails"
@@ -100,28 +101,67 @@ module Decidim
         ActionView::Base.raise_on_missing_translations = true unless Rails.env.production?
       end
 
-      initializer "decidim.geocoding" do
-        if Decidim.geocoder.present?
-          config = {
-            # geocoding service (see below for supported options):
-            lookup: :here
-            # IP address geocoding service (see below for supported options):
-            # :ip_lookup => :maxmind,
-            # geocoding service request timeout, in seconds (default 3):
-            # :timeout => 5,
-            # set default units to kilometers:
-            # :units => :km,
-            # caching (see below for details):
-            # :cache => Redis.new,
-            # :cache_prefix => "..."
+      initializer "decidim.geocoding", after: :load_config_initializers do
+        Geocoder.configure(Decidim.geocoder) if Decidim.geocoder.present?
+      end
+
+      initializer "decidim.geocoding_extensions", after: "geocoder.insert_into_active_record" do
+        # Include it in ActiveRecord base in order to apply it to all models
+        # that may be using the `geocoded_by` or `reverse_geocoded_by` class
+        # methods injected by the Geocoder gem.
+        ActiveSupport.on_load :active_record do
+          ActiveRecord::Base.send(:include, Decidim::Geocodable)
+        end
+      end
+
+      initializer "decidim.maps" do
+        Decidim::Map.register_category(:dynamic, Decidim::Map::Provider::DynamicMap)
+        Decidim::Map.register_category(:static, Decidim::Map::Provider::StaticMap)
+        Decidim::Map.register_category(:geocoding, Decidim::Map::Provider::Geocoding)
+        Decidim::Map.register_category(:autocomplete, Decidim::Map::Provider::Autocomplete)
+      end
+
+      # This keeps backwards compatibility with the old style of map
+      # configuration through Decidim.geocoder.
+      initializer "decidim.maps_legacysupport", after: :load_config_initializers do
+        next if Decidim.maps.present?
+        next if Decidim.geocoder.blank?
+
+        legacy_api_key ||= begin
+          if Decidim.geocoder[:here_api_key].present?
+            Decidim.geocoder.fetch(:here_api_key)
+          elsif Decidim.geocoder[:here_app_id].present?
+            [
+              Decidim.geocoder.fetch(:here_app_id),
+              Decidim.geocoder.fetch(:here_app_code)
+            ]
+          end
+        end
+        next unless legacy_api_key
+
+        ActiveSupport::Deprecation.warn(
+          <<~DEPRECATION.strip
+            Configuring maps functionality has changed.
+
+            Please update your current Decidim.geocoder configurations to the following format:
+
+              Decidim.configure do |config|
+                config.maps = {
+                  provider: :here,
+                  api_key: Rails.application.secrets.maps[:api_key],
+                  static: { url: "#{Decidim.geocoder.fetch(:static_map_url)}" }
+                }
+              end
+          DEPRECATION
+        )
+        Decidim.configure do |config|
+          config.maps = {
+            provider: :here,
+            api_key: legacy_api_key,
+            static: {
+              url: Decidim.geocoder.fetch(:static_map_url)
+            }
           }
-          # to use an API key:
-          config[:api_key] = if Decidim.geocoder[:here_api_key].present?
-                               Decidim.geocoder.fetch(:here_api_key)
-                             else
-                               [Decidim.geocoder.fetch(:here_app_id), Decidim.geocoder.fetch(:here_app_code)]
-                             end
-          Geocoder.configure(config)
         end
       end
 
@@ -468,6 +508,10 @@ module Decidim
         NOBSPW.configuration.use_ruby_grep = true
       end
 
+      initializer "decidim.premailer" do
+        Premailer::Adapter.use = :decidim
+      end
+
       config.to_prepare do
         FoundationRailsHelper::FlashHelper.send(:include, Decidim::FlashHelperExtensions)
       end

data/lib/decidim/core/test.rb

@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
 require "decidim/core/test/shared_examples/acts_as_author_examples"
+require "decidim/core/test/shared_examples/admin_log_presenter_examples"
 require "decidim/core/test/shared_examples/authorable"
 require "decidim/core/test/shared_examples/coauthorable"
 require "decidim/core/test/shared_examples/publicable"
@@ -13,6 +14,7 @@ require "decidim/core/test/shared_examples/has_scope"
 require "decidim/core/test/shared_examples/has_category"
 require "decidim/core/test/shared_examples/has_reference"
 require "decidim/core/test/shared_examples/comments_examples"
+require "decidim/core/test/shared_examples/counts_commentators_as_newsletter_participants"
 require "decidim/core/test/shared_examples/announcements_examples"
 require "decidim/core/test/shared_examples/process_announcements_examples"
 require "decidim/core/test/shared_examples/reportable"
@@ -24,6 +26,7 @@ require "decidim/core/test/shared_examples/user_localised_email_examples"
 require "decidim/core/test/shared_examples/follows_examples"
 require "decidim/core/test/shared_examples/simple_event"
 require "decidim/core/test/shared_examples/component_type"
+require "decidim/core/test/shared_examples/scopable_resource_examples"
 require "decidim/core/test/shared_examples/fingerprint_examples"
 require "decidim/core/test/shared_examples/searchable_results_examples"
 require "decidim/core/test/shared_examples/has_space_in_mcell_examples"
@@ -54,4 +57,9 @@ require "decidim/core/test/shared_examples/rich_text_editor_examples"
 require "decidim/core/test/shared_examples/back_to_list_button_examples"
 require "decidim/core/test/shared_examples/permissions"
 require "decidim/core/test/shared_examples/admin_resource_gallery_examples"
+require "decidim/core/test/shared_examples/map_examples"
+require "decidim/core/test/shared_examples/preview_component_with_share_token_examples"
+require "decidim/core/test/shared_examples/manage_component_share_tokens"
 require "decidim/core/test/shared_examples/metric_manage_shared_context"
+require "decidim/core/test/shared_examples/embed_resource_examples"
+require "decidim/core/test/shared_examples/resource_search_examples"

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

@@ -13,7 +13,7 @@ end
 
 FactoryBot.define do
   sequence(:title) do |n|
-    "#{Faker::Lorem.sentence(3)} #{n}"
+    "#{Faker::Lorem.sentence(3)} #{n}".delete("'")
   end
 
   sequence(:name) do |n|
@@ -21,11 +21,11 @@ FactoryBot.define do
   end
 
   sequence(:nickname) do |n|
-    "#{Faker::Lorem.characters(rand(1..10))}_#{n}"
+    "#{Faker::Lorem.characters(rand(1..10))}_#{n}".gsub("'", "_")
   end
 
   sequence(:hashtag_name) do |n|
-    "#{Faker::Lorem.characters(rand(1..10))}_#{n}"
+    "#{Faker::Lorem.characters(rand(1..10))}_#{n}".gsub("'", "_")
   end
 
   sequence(:email) do |n|
@@ -37,7 +37,7 @@ FactoryBot.define do
   end
 
   sequence(:slug) do |n|
-    "#{Faker::Internet.slug(nil, "-")}-#{n}"
+    "#{Faker::Internet.slug(nil, "-")}-#{n}".gsub("'", "_")
   end
 
   sequence(:scope_name) do |n|
@@ -89,8 +89,10 @@ FactoryBot.define do
     badges_enabled { true }
     user_groups_enabled { true }
     send_welcome_notification { true }
+    comments_max_length { 1000 }
     admin_terms_of_use_body { Decidim::Faker::Localized.wrapped("<p>", "</p>") { generate_localized_title } }
     force_users_to_authenticate_before_access_organization { false }
+    machine_translation_display_priority { "original" }
     smtp_settings do
       {
         "from" => "test@example.org",
@@ -100,6 +102,7 @@ FactoryBot.define do
         "address" => "smtp.example.org"
       }
     end
+    file_upload_settings { Decidim::OrganizationSettings.default(:upload) }
 
     after(:create) do |organization|
       tos_page = Decidim::StaticPage.find_by(slug: "terms-and-conditions", organization: organization)
@@ -181,9 +184,9 @@ FactoryBot.define do
     sequence(:name) { |n| "#{Faker::Company.name} #{n}" }
     email { generate(:user_group_email) }
     nickname { generate(:nickname) }
-    avatar { Decidim::Dev.test_file("avatar.jpg", "image/jpeg") }
     about { "<script>alert(\"ABOUT\");</script>" + Faker::Lorem.paragraph(2) }
     organization
+    avatar { Decidim::Dev.test_file("avatar.jpg", "image/jpeg") } # Keep after organization
 
     transient do
       users { [] }
@@ -258,7 +261,7 @@ FactoryBot.define do
     organization { build(:organization) }
 
     trait :default do
-      slug { (Decidim::StaticPage::DEFAULT_PAGES - ["terms-and-conditions"]).sample }
+      slug { Decidim::StaticPage::DEFAULT_PAGES.sample }
     end
 
     trait :tos do
@@ -295,10 +298,10 @@ FactoryBot.define do
   factory :attachment, class: "Decidim::Attachment" do
     title { generate_localized_title }
     description { Decidim::Faker::Localized.wrapped("<p>", "</p>") { generate_localized_title } }
-    file { Decidim::Dev.test_file("city.jpeg", "image/jpeg") }
     weight { Faker::Number.number(1) }
     attached_to { build(:participatory_process) }
     content_type { "image/jpeg" }
+    file { Decidim::Dev.test_file("city.jpeg", "image/jpeg") } # Keep after attached_to
     file_size { 108_908 }
 
     trait :with_image do
@@ -447,7 +450,7 @@ FactoryBot.define do
       # user_groups correspondence to users is by sorting order
       user_groups { [] }
     end
-    title { generate(:name) }
+    title { Decidim::Faker::Localized.localized { generate(:name) } }
     component { create(:component, manifest_name: "dummy") }
     author { create(:user, :confirmed, organization: component.organization) }
     scope { create(:scope, organization: component.organization) }
@@ -465,6 +468,11 @@ FactoryBot.define do
     end
   end
 
+  factory :nested_dummy_resource, class: "Decidim::DummyResources::NestedDummyResource" do
+    title { generate(:name) }
+    dummy_resource { create(:dummy_resource) }
+  end
+
   factory :coauthorable_dummy_resource, class: "Decidim::DummyResources::CoauthorableDummyResource" do
     title { generate(:name) }
     component { create(:component, manifest_name: "dummy") }
@@ -683,4 +691,22 @@ FactoryBot.define do
     author { build(:user, organization: resource.organization) }
     user_group { create(:user_group, verified_at: Time.current, organization: resource.organization, users: [author]) }
   end
+
+  factory :share_token, class: "Decidim::ShareToken" do
+    token_for { build(:component) }
+    user { build(:user, organization: token_for.organization) }
+
+    before(:create) do |object|
+      object.organization ||= object.token_for.organization
+    end
+
+    trait :expired do
+      expires_at { 1.day.ago }
+    end
+
+    trait :used do
+      times_used { 3 }
+      last_used_at { 1.hour.ago }
+    end
+  end
 end

data/lib/decidim/core/test/shared_examples/admin_log_presenter_examples.rb

@@ -0,0 +1,34 @@
+# frozen_string_literal: true
+
+require "spec_helper"
+
+shared_examples "present admin log entry" do
+  subject(:presenter) { described_class.new(action_log, helper) }
+
+  let(:organization) { create(:organization) }
+  let(:user) { create(:user, organization: organization) }
+  let(:action) { "create" }
+  let(:action_log) do
+    create(
+      :action_log,
+      user: user,
+      action: action,
+      resource: admin_log_resource
+    )
+  end
+
+  before do
+    helper.extend(Decidim::ApplicationHelper)
+    helper.extend(Decidim::TranslationsHelper)
+  end
+
+  describe "#present" do
+    subject { presenter.present }
+
+    context "when the logged action is one that shows diff and the action log does not have an associated version" do
+      it "returns an empty diff" do
+        expect(subject).not_to include("class=\"logs__log__diff\"")
+      end
+    end
+  end
+end

data/lib/decidim/core/test/shared_examples/amendable/accept_amendment_examples.rb

@@ -26,18 +26,18 @@ shared_examples "accept amendment" do
           amendable.creator_author,
           { state: "accepted" },
           visibility: "public-only"
-        ).and_call_original
+        ).and_return(amendment)
 
       expect(Decidim.traceability)
-        .to receive(:update!)
+        .to receive(:perform_action!)
         .with(
+          :update,
           amendable,
           emendation.creator_author,
-          { body: emendation.body, title: emendation.title },
           visibility: "public-only"
         ).and_call_original
 
-      expect { command.call }.to change(Decidim::ActionLog, :count).by(2)
+      command.call
     end
 
     it "notifies the change" do

data/lib/decidim/core/test/shared_examples/amendable_proposals_interface_examples.rb

@@ -5,14 +5,14 @@ require "spec_helper"
 shared_examples_for "amendable proposals interface" do
   describe "amendments" do
     let(:query) do
-      "{ amendments {
+      '{ amendments {
       state
-      amendable { ...on Proposal { title } }
+      amendable { ...on Proposal { title { translation(locale: "en") } } }
       amendableType
-      emendation { ...on Proposal { title } }
+      emendation { ...on Proposal { title { translation(locale: "en") } } }
       emendationType
       amender { name }
-    } }"
+    } }'
     end
 
     it "includes the amendments states" do
@@ -33,13 +33,13 @@ shared_examples_for "amendable proposals interface" do
     end
 
     it "returns amendable as parent proposal" do
-      amendment_amendables = response["amendments"].map { |amendment| amendment["amendable"] }
-      expect(amendment_amendables).to include(*model.amendments.map(&:amendable).map { |p| { "title" => p.title } })
+      amendment_amendables = response["amendments"].map { |amendment| amendment["amendable"] }.map { |title| title["title"]["translation"] }
+      expect(amendment_amendables).to include(*model.amendments.map(&:amendable).map { |p| p.title["en"] })
     end
 
     it "returns emendations received" do
-      amendment_emendations = response["amendments"].map { |amendment| amendment["emendation"] }
-      expect(amendment_emendations).to include(*model.amendments.map(&:emendation).map { |p| { "title" => p.title } })
+      amendment_emendations = response["amendments"].map { |amendment| amendment["emendation"] }.map { |title| title["title"]["translation"] }
+      expect(amendment_emendations).to include(*model.amendments.map(&:emendation).map { |p| p.title["en"] })
     end
 
     it "returns amender as emendation author" do

data/lib/decidim/core/test/shared_examples/comments_examples.rb

@@ -9,6 +9,10 @@ shared_examples "comments" do
     switch_to_host(organization.host)
   end
 
+  after do
+    expect_no_js_errors
+  end
+
   it "shows the list of comments for the resource" do
     visit resource_path
 
@@ -18,7 +22,7 @@ shared_examples "comments" do
     within "#comments" do
       comments.each do |comment|
         expect(page).to have_content comment.author.name
-        expect(page).to have_content comment.body
+        expect(page).to have_content comment.body.values.first
       end
     end
   end
@@ -61,6 +65,35 @@ shared_examples "comments" do
       expect(page).to have_selector(".add-comment form")
     end
 
+    context "when no default comments length specified" do
+      it "displays the numbers of characters left" do
+        within ".add-comment form" do
+          expect(page).to have_content("1000 characters left")
+        end
+      end
+    end
+
+    context "when organization has a default comments length params" do
+      let!(:organization) { create(:organization, comments_max_length: 2000) }
+
+      it "displays the numbers of characters left" do
+        within ".add-comment form" do
+          expect(page).to have_content("2000 characters left")
+        end
+      end
+
+      context "when component has a default comments length params" do
+        it "displays the numbers of characters left" do
+          component.update!(settings: { comments_max_length: 3000 })
+          visit current_path
+
+          within ".add-comment form" do
+            expect(page).to have_content("3000 characters left")
+          end
+        end
+      end
+    end
+
     context "when user adds a new comment" do
       before do
         within ".add-comment form" do
@@ -286,5 +319,23 @@ shared_examples "comments" do
         end
       end
     end
+
+    describe "hashtags", :slow do
+      let(:content) { "A comment with a hashtag #decidim" }
+
+      before do
+        visit resource_path
+
+        within ".add-comment form" do
+          fill_in "add-comment-#{commentable.commentable_type}-#{commentable.id}", with: content
+          click_button "Send"
+        end
+      end
+
+      it "replaces the hashtag with a link to the hashtag search" do
+        expect(page).to have_comment_from(user, "A comment with a hashtag #decidim", wait: 20)
+        expect(page).to have_link "#decidim", href: "/search?term=%23decidim"
+      end
+    end
   end
 end

data/lib/decidim/core/test/shared_examples/counts_commentators_as_newsletter_participants.rb

@@ -0,0 +1,31 @@
+# frozen_string_literal: true
+
+require "spec_helper"
+
+shared_examples_for "counts commentators as newsletter participants" do
+  # non participant commentator (comments into other spaces)
+  let!(:non_participant) { create(:user, :confirmed, newsletter_notifications_at: Time.current, organization: component_out_of_newsletter.organization) }
+  # expects resource_out_of_newsletter to belong to a space which has NOT been selected in the newsletter
+  let!(:outlier_comment) { create(:comment, author: non_participant, commentable: resource_out_of_newsletter) }
+
+  let(:commentators_ids) { [] }
+  let(:recipients_ids) { author_ids + commentators_ids }
+
+  context "without commentators" do
+    it "returns zero participants" do
+      expect(subject).to match_array(recipients_ids)
+    end
+  end
+
+  context "with commentators, counts commentators in the current space" do
+    # participant commentator
+    let!(:commentator_participant) { create(:user, :confirmed, newsletter_notifications_at: Time.current, organization: organization) }
+    # expects resource_in_newsletter to belong to a space selected in the newsletter
+    let!(:comment_in_newsletter) { create(:comment, author: commentator_participant, commentable: resource_in_newsletter) }
+    let(:commentators_ids) { [commentator_participant.id] }
+
+    it "returns only commenters in the selected spaces" do
+      expect(subject).to match_array(recipients_ids)
+    end
+  end
+end