decidim-core 0.27.2 → 0.27.3

data/lib/decidim/asset_router/pipeline.rb

@@ -28,6 +28,8 @@ module Decidim
       #   resolved, the asset path.
       def url(**options)
         path = ActionController::Base.helpers.asset_pack_path(asset, **options)
+        return path if path.match?(%r{\A(https?:)?//})
+
         "#{asset_host}#{path}"
       end
 

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

@@ -416,6 +416,42 @@ shared_examples "comments" do
         )
       end
 
+      context "when user can hide replies on a thread" do
+        let(:thread) { comments.first }
+        let(:new_reply_body) { "Hey, I just jumped inside the thread!" }
+        let!(:new_reply) { create(:comment, commentable: thread, root_commentable: commentable, body: new_reply_body) }
+
+        it "displays the hide button" do
+          visit current_path
+          within "#comment_#{thread.id}" do
+            expect(page).to have_content("Hide replies")
+            expect(page).to have_content(new_reply_body)
+          end
+        end
+
+        it "displays the show button" do
+          visit current_path
+          within "#comment_#{thread.id}" do
+            click_button "Hide replies"
+            expect(page).to have_content("Show reply")
+            expect(page).not_to have_content(new_reply_body)
+          end
+        end
+
+        context "when are more replies" do
+          let!(:new_replies) { create_list(:comment, 2, commentable: thread, root_commentable: commentable, body: new_reply_body) }
+
+          it "displays the show button" do
+            visit current_path
+            within "#comment_#{thread.id}" do
+              click_button "Hide replies"
+              expect(page).to have_content("Show 3 replies")
+              expect(page).not_to have_content(new_reply_body)
+            end
+          end
+        end
+      end
+
       context "when inside a thread reply form" do
         let(:thread) { comments.first }
         let(:new_reply_body) { "Hey, I just jumped inside the thread!" }

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

@@ -0,0 +1,33 @@
+# frozen_string_literal: true
+
+shared_context "when sends the notification digest" do
+  context "when daily notification mail" do
+    let(:user) { create(:user, :admin, organization: organization, notifications_sending_frequency: "daily") }
+
+    it_behaves_like "notification digest mail"
+  end
+
+  context "when weekly notification mail" do
+    let(:user) { create(:user, :admin, organization: organization, notifications_sending_frequency: "weekly") }
+
+    it_behaves_like "notification digest mail"
+  end
+end
+
+shared_examples_for "notification digest mail" do
+  context "when a notificable event takes place" do
+    let!(:organization) { create(:organization) }
+    let!(:participatory_space) { create(:participatory_process, organization: organization) }
+
+    it "sends a notification to the user's email" do
+      perform_enqueued_jobs do
+        expect(command.call).to broadcast(:ok)
+        Decidim::Notification.last.update(created_at: 1.day.ago)
+        Decidim::EmailNotificationsDigestGeneratorJob.perform_now(user.id, user.notifications_sending_frequency)
+      end
+
+      expect(last_email_body.length).to be_positive
+      expect(last_email_body).not_to include("translation missing")
+    end
+  end
+end

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

@@ -1,8 +1,9 @@
 # frozen_string_literal: true
 
-shared_examples_for "has embedded video in description" do |description_attribute_name|
+shared_examples_for "has embedded video in description" do |description_attribute_name, count: 1|
   let(description_attribute_name) { { en: %(Description <iframe class="ql-video" allowfullscreen="true" src="#{iframe_src}" frameborder="0"></iframe>) } }
   let(:iframe_src) { "http://www.example.org" }
+  let!(:cookie_warning) { "You need to enable all cookies in order to see this content" }
 
   context "when cookies are rejected" do
     before do
@@ -11,7 +12,7 @@ shared_examples_for "has embedded video in description" do |description_attribut
     end
 
     it "disables iframe" do
-      expect(page).to have_content("You need to enable all cookies in order to see this content")
+      expect(page).to have_content(cookie_warning)
       expect(page).not_to have_selector("iframe")
     end
   end
@@ -23,8 +24,8 @@ shared_examples_for "has embedded video in description" do |description_attribut
     end
 
     it "shows iframe" do
-      expect(page).not_to have_content("You need to enable all cookies in order to see this content")
-      expect(page).to have_selector("iframe", count: 1)
+      expect(page).not_to have_content(cookie_warning)
+      expect(page).to have_selector("iframe", count: count)
     end
   end
 end

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

@@ -1,13 +1,17 @@
 # frozen_string_literal: true
 
-shared_examples "having a rich text editor" do |css, toolbar|
-  it "has a form with a rich text editor" do
-    within "form.#{css}" do
+shared_examples "having a rich text editor for field" do |selector, toolbar|
+  it "has a rich text editor" do
+    within selector do
       expect(page).to have_selector("div.editor-container[data-toolbar='#{toolbar}']", visible: :all)
     end
   end
 end
 
+shared_examples "having a rich text editor" do |css, toolbar|
+  it_behaves_like "having a rich text editor for field", "form.#{css}", toolbar
+end
+
 shared_context "with rich text editor content" do
   let(:content) { "<p>#{safe_tags}</p>#{script}" }
   let(:safe_tags) { em + u + strong }

data/lib/decidim/core/test.rb

@@ -75,3 +75,4 @@ require "decidim/core/test/shared_examples/conversations_examples"
 require "decidim/core/test/shared_examples/resource_endorsed_event_examples"
 require "decidim/core/test/shared_examples/versions_controller_examples"
 require "decidim/core/test/shared_examples/mcell_examples"
+require "decidim/core/test/shared_examples/digest_mail_examples"

data/lib/decidim/core/version.rb

@@ -4,7 +4,7 @@ module Decidim
   # This holds the decidim-core version.
   module Core
     def self.version
-      "0.27.2"
+      "0.27.3"
     end
   end
 end

data/lib/decidim/form_builder.rb

@@ -444,7 +444,7 @@ module Decidim
     #              * resouce_name: Name of the resource (e.g. user)
     #              * resource_class: Attribute's resource class (e.g. Decidim::User)
     #              * resouce_class: Class of the resource (e.g. user)
-    #              * optional: Whether the file can be optional or not.
+    #              * required: Whether the file is required or not (false by default).
     #              * titled: Whether the file can have title or not.
     #              * show_current: Whether the current file is displayed next to the button.
     #              * help: Array of help messages which are displayed inside of the upload modal.
@@ -464,7 +464,7 @@ module Decidim
         attribute: attribute,
         resource_name: @object_name,
         resource_class: options[:resource_class]&.to_s || resource_class(attribute),
-        optional: true,
+        required: false,
         titled: false,
         show_current: true,
         max_file_size: max_file_size,
@@ -712,6 +712,8 @@ module Decidim
                safe_join([yield, text.html_safe])
              elsif block_given?
                safe_join([text.html_safe, yield])
+             else
+               text
              end
 
       label(attribute, text, options || {})
@@ -928,7 +930,6 @@ module Decidim
       return {} unless options[:editor_images]
 
       {
-        editor_images: true,
         upload_images_path: Decidim::Core::Engine.routes.url_helpers.editor_images_path,
         drag_and_drop_help_text: I18n.t("drag_and_drop_help", scope: "decidim.editor_images")
       }

data/lib/decidim/publicable.rb

@@ -45,5 +45,9 @@ module Decidim
     def unpublish!
       update!(published_at: nil)
     end
+
+    def previously_published?
+      respond_to?(:versions) && versions.where(event: "update").where("object ->> 'published_at' IS NOT NULL").any?
+    end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: decidim-core
 version: !ruby/object:Gem::Version
-  version: 0.27.2
+  version: 0.27.3
 platform: ruby
 authors:
 - Josep Jaume Rey Peroy
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-02-13 00:00:00.000000000 Z
+date: 2023-05-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: active_link_to
@@ -740,28 +740,28 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.27.2
+        version: 0.27.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.27.2
+        version: 0.27.3
 - !ruby/object:Gem::Dependency
   name: decidim-dev
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.27.2
+        version: 0.27.3
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.27.2
+        version: 0.27.3
 description: Adds core features so other engines can hook into the framework.
 email:
 - josepjaume@gmail.com
@@ -1853,8 +1853,10 @@ files:
 - app/views/decidim/last_activities/_activities.html.erb
 - app/views/decidim/last_activities/index.html.erb
 - app/views/decidim/last_activities/index.js.erb
+- app/views/decidim/links/_invalid_url_modal.html.erb
 - app/views/decidim/links/_modal.html.erb
 - app/views/decidim/links/_warning.html.erb
+- app/views/decidim/links/invalid_url.js.erb
 - app/views/decidim/links/new.html.erb
 - app/views/decidim/links/new.js.erb
 - app/views/decidim/manifests/show.json.erb
@@ -2025,6 +2027,7 @@ files:
 - config/locales/et-EE.yml
 - config/locales/et.yml
 - config/locales/eu.yml
+- config/locales/fa-IR.yml
 - config/locales/fi-pl.yml
 - config/locales/fi-plain.yml
 - config/locales/fi.yml
@@ -2043,6 +2046,7 @@ files:
 - config/locales/it.yml
 - config/locales/ja.yml
 - config/locales/ka-GE.yml
+- config/locales/kaa.yml
 - config/locales/ko-KR.yml
 - config/locales/ko.yml
 - config/locales/lb-LU.yml
@@ -2452,6 +2456,7 @@ files:
 - lib/decidim/core/test/shared_examples/controller_render_views.rb
 - lib/decidim/core/test/shared_examples/conversations_examples.rb
 - lib/decidim/core/test/shared_examples/counts_commentators_as_newsletter_participants.rb
+- lib/decidim/core/test/shared_examples/digest_mail_examples.rb
 - lib/decidim/core/test/shared_examples/edit_link_shared_examples.rb
 - lib/decidim/core/test/shared_examples/editor_shared_examples.rb
 - lib/decidim/core/test/shared_examples/embed_resource_examples.rb
@@ -2699,7 +2704,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.7
+rubygems_version: 3.2.22
 signing_key: 
 specification_version: 4
 summary: The core of the Decidim framework.