From e875100643f99fe0f8c256f4ceec6668915d7ad5 Mon Sep 17 00:00:00 2001 From: Alexandru Emil Lupu Date: Wed, 17 Apr 2024 15:07:21 +0300 Subject: [PATCH] More cleanup --- .../meetings/admin_log/meeting_presenter.rb | 4 -- .../meetings/log/resource_presenter.rb | 22 ----------- .../proposals/admin_log/proposal_presenter.rb | 4 -- .../proposals/log/resource_presenter.rb | 22 ----------- .../proposals/log/resource_presenter_spec.rb | 39 ------------------- 5 files changed, 91 deletions(-) delete mode 100644 decidim-meetings/app/presenters/decidim/meetings/log/resource_presenter.rb delete mode 100644 decidim-proposals/app/presenters/decidim/proposals/log/resource_presenter.rb delete mode 100644 decidim-proposals/spec/presenters/decidim/proposals/log/resource_presenter_spec.rb diff --git a/decidim-meetings/app/presenters/decidim/meetings/admin_log/meeting_presenter.rb b/decidim-meetings/app/presenters/decidim/meetings/admin_log/meeting_presenter.rb index f8ee82dc73b9..1feb2202166f 100644 --- a/decidim-meetings/app/presenters/decidim/meetings/admin_log/meeting_presenter.rb +++ b/decidim-meetings/app/presenters/decidim/meetings/admin_log/meeting_presenter.rb @@ -15,10 +15,6 @@ module AdminLog class MeetingPresenter < Decidim::Log::BasePresenter private - def resource_presenter - @resource_presenter ||= Decidim::Meetings::Log::ResourcePresenter.new(action_log.resource, h, action_log.extra["resource"]) - end - def diff_fields_mapping { address: :string, diff --git a/decidim-meetings/app/presenters/decidim/meetings/log/resource_presenter.rb b/decidim-meetings/app/presenters/decidim/meetings/log/resource_presenter.rb deleted file mode 100644 index 70af0a079756..000000000000 --- a/decidim-meetings/app/presenters/decidim/meetings/log/resource_presenter.rb +++ /dev/null @@ -1,22 +0,0 @@ -# frozen_string_literal: true - -module Decidim - module Meetings - module Log - class ResourcePresenter < Decidim::Log::ResourcePresenter - private - - # Private: Presents resource name. - # - # Returns an HTML-safe String. - def present_resource_name - if resource.present? - resource.presenter.title(html_escape: true) - else - super - end - end - end - end - end -end diff --git a/decidim-proposals/app/presenters/decidim/proposals/admin_log/proposal_presenter.rb b/decidim-proposals/app/presenters/decidim/proposals/admin_log/proposal_presenter.rb index 677a0adb8a72..a8e88721ee93 100644 --- a/decidim-proposals/app/presenters/decidim/proposals/admin_log/proposal_presenter.rb +++ b/decidim-proposals/app/presenters/decidim/proposals/admin_log/proposal_presenter.rb @@ -15,10 +15,6 @@ module AdminLog class ProposalPresenter < Decidim::Log::BasePresenter private - def resource_presenter - @resource_presenter ||= Decidim::Proposals::Log::ResourcePresenter.new(action_log.resource, h, action_log.extra["resource"]) - end - def diff_fields_mapping { title: :i18n, diff --git a/decidim-proposals/app/presenters/decidim/proposals/log/resource_presenter.rb b/decidim-proposals/app/presenters/decidim/proposals/log/resource_presenter.rb deleted file mode 100644 index ea3f4fc73c09..000000000000 --- a/decidim-proposals/app/presenters/decidim/proposals/log/resource_presenter.rb +++ /dev/null @@ -1,22 +0,0 @@ -# frozen_string_literal: true - -module Decidim - module Proposals - module Log - class ResourcePresenter < Decidim::Log::ResourcePresenter - private - - # Private: Presents resource name. - # - # Returns an HTML-safe String. - def present_resource_name - if resource.present? - resource.presenter.title(html_escape: true) - else - super - end - end - end - end - end -end diff --git a/decidim-proposals/spec/presenters/decidim/proposals/log/resource_presenter_spec.rb b/decidim-proposals/spec/presenters/decidim/proposals/log/resource_presenter_spec.rb deleted file mode 100644 index cc05381a6036..000000000000 --- a/decidim-proposals/spec/presenters/decidim/proposals/log/resource_presenter_spec.rb +++ /dev/null @@ -1,39 +0,0 @@ -# frozen_string_literal: true - -require "spec_helper" - -describe Decidim::Proposals::Log::ResourcePresenter, type: :helper do - let(:presenter) { described_class.new(resource, helper, extra) } - let(:resource) { create(:proposal, title: Faker::Book.unique.title) } - let(:extra) do - { - "title" => Faker::Book.unique.title - } - end - let(:resource_path) { Decidim::ResourceLocatorPresenter.new(resource).path } - - before do - helper.extend(Decidim::ApplicationHelper) - helper.extend(Decidim::TranslationsHelper) - end - - context "when the resource exists" do - it "links to its public page with the name of the proposal" do - html = presenter.present - expect(html).to have_link(translated(resource.title), href: resource_path) - end - end - - context "when the resource does not exist" do - let(:resource) { nil } - let(:extra) do - { - "title" => "My title" - } - end - - it "does not link to its public page but renders its name" do - expect(presenter.present).to have_no_link("My title") - end - end -end