From 74a9b48076d73613165f4caca27f35622ec43131 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Javi=20Mart=C3=ADn?= Date: Sat, 22 Feb 2025 23:04:18 +0100 Subject: [PATCH 01/11] Remove usage of obsolete with_subnavigation parameter The layouts/header partial doesn't use this parameter since commit 488e7e081, where it was deleted while solving a merge conflict. --- app/views/layouts/application.html.erb | 2 +- app/views/layouts/dashboard.html.erb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb index b0daa354b..4028a7d85 100644 --- a/app/views/layouts/application.html.erb +++ b/app/views/layouts/application.html.erb @@ -18,7 +18,7 @@ <%= raw setting["html.per_page_code_body"] %>
- <%= render "layouts/header", with_subnavigation: true %> + <%= render "layouts/header" %>
<%= render "layouts/flash" %> diff --git a/app/views/layouts/dashboard.html.erb b/app/views/layouts/dashboard.html.erb index ef35fbfcb..a5dda956e 100644 --- a/app/views/layouts/dashboard.html.erb +++ b/app/views/layouts/dashboard.html.erb @@ -18,7 +18,7 @@

<%= setting["org_name"] %>

- <%= render "layouts/header", with_subnavigation: false %> + <%= render "layouts/header" %>
<%= check_box_tag :show_menu, nil, false, role: "switch" %> From d18510e1022c43e2f186ac84a83784fd605e85f5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Javi=20Mart=C3=ADn?= Date: Sat, 22 Feb 2025 23:10:31 +0100 Subject: [PATCH 02/11] Remove unused image_default parameter This parameter isn't used since commit b4a6f664b. Note we're changing the tests to use proposals instead of debates because proposals may have images attached, while debates may not. --- app/helpers/welcome_helper.rb | 8 +++---- app/views/welcome/_recommended.html.erb | 2 -- .../welcome/_recommended_carousel.html.erb | 2 +- spec/views/welcome/index.html.erb_spec.rb | 22 +++++++++---------- 4 files changed, 14 insertions(+), 20 deletions(-) diff --git a/app/helpers/welcome_helper.rb b/app/helpers/welcome_helper.rb index 82f93bb3c..85ee522da 100644 --- a/app/helpers/welcome_helper.rb +++ b/app/helpers/welcome_helper.rb @@ -18,17 +18,15 @@ module WelcomeHelper end end - def render_recommendation_image(recommended, image_default) - image_path = calculate_image_path(recommended, image_default) + def render_recommendation_image(recommended) + image_path = calculate_image_path(recommended) image_tag(image_path) if image_path.present? end - def calculate_image_path(recommended, image_default) + def calculate_image_path(recommended) if recommended.respond_to?(:image) && recommended.image.present? && recommended.image.attachment.attached? recommended.image.variant(:medium) - elsif image_default.present? - image_default end end diff --git a/app/views/welcome/_recommended.html.erb b/app/views/welcome/_recommended.html.erb index d288363b2..f278a1089 100644 --- a/app/views/welcome/_recommended.html.erb +++ b/app/views/welcome/_recommended.html.erb @@ -13,7 +13,6 @@ key: "debates", image_field: nil, image_version: nil, - image_default: nil, carousel_size: carousel_size, btn_text_link: t("welcome.recommended.debates.btn_text_link"), btn_path_link: debates_path(order: "recommendations") %> @@ -25,7 +24,6 @@ key: "proposals", image_field: :attachment, image_version: :thumb, - image_default: nil, carousel_size: carousel_size, btn_text_link: t("welcome.recommended.proposals.btn_text_link"), btn_path_link: proposals_path(order: "recommendations") %> diff --git a/app/views/welcome/_recommended_carousel.html.erb b/app/views/welcome/_recommended_carousel.html.erb index 15d445593..da2ac25f5 100644 --- a/app/views/welcome/_recommended_carousel.html.erb +++ b/app/views/welcome/_recommended_carousel.html.erb @@ -11,7 +11,7 @@
  • - <%= render_recommendation_image(recommended, image_default) %> + <%= render_recommendation_image(recommended) %>
    <%= link_to recommended_path(recommended) do %>

    <%= recommended.title %>

    diff --git a/spec/views/welcome/index.html.erb_spec.rb b/spec/views/welcome/index.html.erb_spec.rb index 411c999c5..2f71ce7d3 100644 --- a/spec/views/welcome/index.html.erb_spec.rb +++ b/spec/views/welcome/index.html.erb_spec.rb @@ -1,36 +1,34 @@ require "rails_helper" RSpec.describe "welcome#index" do - it "Display images on orbit carrousel when we have defined image_default" do - debate = create(:debate) + it "displays images on the orbit carrousel when recommendations have an image" do + proposal = create(:proposal, :with_image) render template: "welcome/_recommended_carousel", locals: { key: "debates", - recommendeds: [debate], + recommendeds: [proposal], image_field: nil, image_version: nil, - image_default: "https://dummyimage.com/600x400/000/fff", carousel_size: "medium-6 large-6 medium-centered large-centered", - btn_text_link: t("welcome.recommended.debates.btn_text_link"), - btn_path_link: debates_path(order: "recommendations") } + btn_text_link: t("welcome.recommended.proposals.btn_text_link"), + btn_path_link: proposals_path(order: "recommendations") } within 'li[data-slide="0"] .card' do expect(page).to have_css "img" end end - it "Not display images on orbit carrousel when we have not defined image_default" do - debate = create(:debate) + it "does not display images on the orbit carrousel when recommendations don't have an image" do + proposal = create(:proposal) render template: "welcome/_recommended_carousel", locals: { key: "debates", - recommendeds: [debate], + recommendeds: [proposal], image_field: nil, image_version: nil, - image_default: nil, carousel_size: "medium-6 large-6 medium-centered large-centered", - btn_text_link: t("welcome.recommended.debates.btn_text_link"), - btn_path_link: debates_path(order: "recommendations") } + btn_text_link: t("welcome.recommended.proposals.btn_text_link"), + btn_path_link: proposals_path(order: "recommendations") } within 'li[data-slide="0"] .card' do expect(page).not_to have_css "img" From e70732a47fbded08018ddf60ba78e2b45fdd2504 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Javi=20Mart=C3=ADn?= Date: Sat, 22 Feb 2025 23:22:21 +0100 Subject: [PATCH 03/11] Don't create records after starting the browser in user test I accidentally made this mistake while trying to avoid the exact same issue back in commit 73992b2c8. Accessing the database in a test after starting the process running the browser has caused database corruption in our CI multiple times. --- spec/system/management/users_spec.rb | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/spec/system/management/users_spec.rb b/spec/system/management/users_spec.rb index 3b183b0fa..b35cec7c8 100644 --- a/spec/system/management/users_spec.rb +++ b/spec/system/management/users_spec.rb @@ -72,6 +72,7 @@ describe "Users" do scenario "Delete a level 2 user account from document verification page" do level_2_user = create(:user, :level_two, document_number: "12345678Z") manager = create(:manager) + administrator = create(:administrator) login_as_manager(manager) visit management_document_verifications_path @@ -92,7 +93,7 @@ describe "Users" do expect(page).to have_content "no user account associated to it" logout - login_as(create(:administrator).user) + login_as(administrator.user) visit admin_users_path(filter: "erased") From c5018e4a53db9d8a42383bc83394c39577b09721 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Javi=20Mart=C3=ADn?= Date: Sat, 22 Feb 2025 23:29:05 +0100 Subject: [PATCH 04/11] Remove obsolete video_url column in poll_questions table This column isn't used since commit 4c0deb0ec because administrators can associate videos to the answers since commit 5862eea51. The value of this attribute isn't used in the public area since commit 8277e3cc2. --- app/views/admin/poll/questions/show.html.erb | 8 -------- config/locales/en/admin.yml | 1 - config/locales/es/admin.yml | 1 - .../20250222222739_remove_poll_questions_video_url.rb | 5 +++++ db/schema.rb | 3 +-- 5 files changed, 6 insertions(+), 12 deletions(-) create mode 100644 db/migrate/20250222222739_remove_poll_questions_video_url.rb diff --git a/app/views/admin/poll/questions/show.html.erb b/app/views/admin/poll/questions/show.html.erb index 1cb73202a..35b09b9f9 100644 --- a/app/views/admin/poll/questions/show.html.erb +++ b/app/views/admin/poll/questions/show.html.erb @@ -100,11 +100,3 @@ <% end %> - -<% if @question.video_url.present? %> -

    - <%= t("admin.questions.show.video_url") %> -
    - <%= @question.video_url %> -

    -<% end %> diff --git a/config/locales/en/admin.yml b/config/locales/en/admin.yml index f51a3daf6..0f4ae62ee 100644 --- a/config/locales/en/admin.yml +++ b/config/locales/en/admin.yml @@ -1166,7 +1166,6 @@ en: edit_question: Edit question valid_answers: Valid answers add_answer: Add answer - video_url: External video answers: title: Answer description: Description diff --git a/config/locales/es/admin.yml b/config/locales/es/admin.yml index 993c8594a..41848b570 100644 --- a/config/locales/es/admin.yml +++ b/config/locales/es/admin.yml @@ -1166,7 +1166,6 @@ es: edit_question: Editar pregunta valid_answers: Respuestas válidas add_answer: Añadir respuesta - video_url: Vídeo externo answers: title: Respuesta description: Descripción diff --git a/db/migrate/20250222222739_remove_poll_questions_video_url.rb b/db/migrate/20250222222739_remove_poll_questions_video_url.rb new file mode 100644 index 000000000..bf66fcff5 --- /dev/null +++ b/db/migrate/20250222222739_remove_poll_questions_video_url.rb @@ -0,0 +1,5 @@ +class RemovePollQuestionsVideoUrl < ActiveRecord::Migration[7.0] + def change + remove_column :poll_questions, :video_url, :string + end +end diff --git a/db/schema.rb b/db/schema.rb index e3b541dc0..ab8291ece 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -10,7 +10,7 @@ # # It's strongly recommended that you check this file into your version control system. -ActiveRecord::Schema[7.0].define(version: 2024_10_26_112901) do +ActiveRecord::Schema[7.0].define(version: 2025_02_22_222739) do # These are extensions that must be enabled in order to support this database enable_extension "pg_trgm" enable_extension "plpgsql" @@ -1138,7 +1138,6 @@ ActiveRecord::Schema[7.0].define(version: 2024_10_26_112901) do t.datetime "created_at", precision: nil t.datetime "updated_at", precision: nil t.tsvector "tsv" - t.string "video_url" t.index ["author_id"], name: "index_poll_questions_on_author_id" t.index ["poll_id"], name: "index_poll_questions_on_poll_id" t.index ["proposal_id"], name: "index_poll_questions_on_proposal_id" From 4732817360ea6f43c5c0898ef581b5f274c62ec3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Javi=20Mart=C3=ADn?= Date: Sun, 23 Feb 2025 13:15:35 +0100 Subject: [PATCH 05/11] Remove obsolete icons-related CSS These rules aren't used since commit c5c9efee1. Note that there's still an `icon-budget` element in the `_investment_show` partial. The rules for this icon are already defined inside the rules for the `.budget-investment-show` selector. The `icon-budget` and `icon-proposals` HTML classes are still used in the "Following" tab (the code uses the `followable_icon` method), but in this case the `.budget-investment` or `.proposal` selectors aren't present, so the properties weren't applied here either. Similarly, there are elements with the `icon-debates` and `icon-proposals` HTML classes in the dashboard area, but they aren't inside elements matching the `.debate` or `.proposal` selectors either. And there's an element with the `icon-debate` HTML class in the legislation area. Once again, it isn't inside an element matching the `.debate` selector. So can safely remove this code. --- app/assets/stylesheets/participation.scss | 22 ---------------------- 1 file changed, 22 deletions(-) diff --git a/app/assets/stylesheets/participation.scss b/app/assets/stylesheets/participation.scss index c9f4cc37d..8700b6ef0 100644 --- a/app/assets/stylesheets/participation.scss +++ b/app/assets/stylesheets/participation.scss @@ -512,28 +512,6 @@ } } - .icon-debates, - .icon-proposals, - .icon-budget { - font-size: rem-calc(18); - line-height: $line-height; - margin-left: rem-calc(6); - top: 0; - } - - .icon-debates { - color: $debates; - } - - .icon-proposals { - color: $proposals-dark; - } - - .icon-budget { - color: $budget; - font-size: $small-font-size; - } - .debate-info, .proposal-info, .investment-project-info, From cf5863b29fbb77c3cac24565cea3cfde22c89226 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Javi=20Mart=C3=ADn?= Date: Sun, 23 Feb 2025 14:49:20 +0100 Subject: [PATCH 06/11] Move admin proposals index view to a component This way we can use the `header` method to simplify it a bit. --- .../admin/proposals/index_component.html.erb | 39 +++++++++++++++++ .../admin/proposals/index_component.rb | 12 ++++++ app/views/admin/proposals/index.html.erb | 42 +------------------ 3 files changed, 52 insertions(+), 41 deletions(-) create mode 100644 app/components/admin/proposals/index_component.html.erb create mode 100644 app/components/admin/proposals/index_component.rb diff --git a/app/components/admin/proposals/index_component.html.erb b/app/components/admin/proposals/index_component.html.erb new file mode 100644 index 000000000..d1637739d --- /dev/null +++ b/app/components/admin/proposals/index_component.html.erb @@ -0,0 +1,39 @@ +<% provide :main_class, "admin-proposals-index" %> + +<%= header %> + +<% if proposals.any? %> + <%= render Admin::SearchComponent.new(label: t("admin.shared.search.label.proposals")) %> + +

    <%= page_entries_info proposals %>

    + + + + + + + + + + + + + + <% proposals.each do |proposal| %> + + + + + + + + <% end %> + +
    <%= t("admin.proposals.index.id") %><%= Proposal.human_attribute_name(:title) %><%= t("admin.proposals.index.author") %><%= t("admin.proposals.index.milestones") %><%= t("admin.proposals.index.selected") %>
    <%= proposal.id %><%= link_to proposal.title, admin_proposal_path(proposal) %><%= proposal.author.username %><%= proposal.milestones.count %><%= render Admin::Proposals::ToggleSelectionComponent.new(proposal) %>
    + + <%= paginate proposals %> +<% else %> +
    + <%= t("admin.proposals.index.no_proposals") %> +
    +<% end %> diff --git a/app/components/admin/proposals/index_component.rb b/app/components/admin/proposals/index_component.rb new file mode 100644 index 000000000..ba35ee196 --- /dev/null +++ b/app/components/admin/proposals/index_component.rb @@ -0,0 +1,12 @@ +class Admin::Proposals::IndexComponent < ApplicationComponent + include Header + attr_reader :proposals + + def initialize(proposals) + @proposals = proposals + end + + def title + t("admin.proposals.index.title") + end +end diff --git a/app/views/admin/proposals/index.html.erb b/app/views/admin/proposals/index.html.erb index 27964da5b..06d6de765 100644 --- a/app/views/admin/proposals/index.html.erb +++ b/app/views/admin/proposals/index.html.erb @@ -1,41 +1 @@ -<% provide(:title) do %> - <%= t("admin.header.title") %> - <%= t("admin.proposals.index.title") %> -<% end %> - -

    <%= t("admin.proposals.index.title") %>

    - -<% if @proposals.any? %> - <%= render Admin::SearchComponent.new(label: t("admin.shared.search.label.proposals")) %> - -

    <%= page_entries_info @proposals %>

    - - - - - - - - - - - - - - <% @proposals.each do |proposal| %> - - - - - - - - <% end %> - -
    <%= t("admin.proposals.index.id") %><%= Proposal.human_attribute_name(:title) %><%= t("admin.proposals.index.author") %><%= t("admin.proposals.index.milestones") %><%= t("admin.proposals.index.selected") %>
    <%= proposal.id %><%= link_to proposal.title, admin_proposal_path(proposal) %><%= proposal.author.username %><%= proposal.milestones.count %><%= render Admin::Proposals::ToggleSelectionComponent.new(proposal) %>
    - - <%= paginate @proposals %> -<% else %> -
    - <%= t("admin.proposals.index.no_proposals") %> -
    -<% end %> +<%= render Admin::Proposals::IndexComponent.new(@proposals) %> From 2239b8fdca23add2bb234116a897e6fa93fc93ae Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Javi=20Mart=C3=ADn?= Date: Sun, 23 Feb 2025 14:51:48 +0100 Subject: [PATCH 07/11] Remove obsolete questions index in the admin area We removed the link to this page in commit 83e8d6035 because poll questions don't really make sense without a poll. However, this page also contained information about successful proposals, which might be interesting so administrators don't have to navigate to the public area in order to find and create questions based on successful proposals. So we're keeping the part about successful proposals and linking it from the proposals part of the admin area. Note we're using translation keys like `successful_proposals_tab`, which don't make sense anymore, for the successful proposals. We're doing so because we've already got translations for these keys and, if we renamed them, we'd lose the existing translations and our translators would have to add them again. Also note we're changing one poll question test a little bit so we create the question from a successful proposal using the new page. There are other tests checking how to create a question from the admin/proposals#show action and other tests checking what happens when accessing a successful proposal in the admin section, so we don't lose any test coverage by changing an existing test instead of adding a new one. Finally, note that we've removing the `search` method in poll question because we no longer use it. This currently makes the `author_visible_name` database column useless; we aren't removing it right now because we don't want to risk a possible data loss in a patch release (we're about to release version 2.3.1), but we might remove it in the future. --- .../admin/poll/questions/filter.scss | 11 ------ .../poll/questions/filter_component.html.erb | 7 ---- .../admin/poll/questions/filter_component.rb | 14 ------- .../admin/proposals/index_component.html.erb | 4 +- .../admin/proposals/index_component.rb | 8 ++++ .../proposals/successful_component.html.erb} | 8 +++- .../admin/proposals/successful_component.rb | 12 ++++++ .../admin/poll/questions_controller.rb | 13 +------ app/controllers/admin/proposals_controller.rb | 6 ++- app/models/poll/question.rb | 17 --------- .../poll/questions/_filter_subnav.html.erb | 12 ------ .../admin/poll/questions/_questions.html.erb | 38 ------------------- app/views/admin/poll/questions/index.html.erb | 18 --------- app/views/admin/proposals/successful.html.erb | 1 + config/locales/en/admin.yml | 7 ---- config/locales/en/general.yml | 1 - config/locales/es/admin.yml | 7 ---- config/locales/es/general.yml | 1 - config/routes/admin.rb | 6 ++- .../poll/questions/filter_component_spec.rb | 9 ----- .../admin/proposals/index_component_spec.rb | 35 +++++++++++++++++ spec/system/admin/poll/questions_spec.rb | 13 ++----- spec/system/budget_polls/questions_spec.rb | 13 ------- 23 files changed, 81 insertions(+), 180 deletions(-) delete mode 100644 app/assets/stylesheets/admin/poll/questions/filter.scss delete mode 100644 app/components/admin/poll/questions/filter_component.html.erb delete mode 100644 app/components/admin/poll/questions/filter_component.rb rename app/{views/admin/poll/questions/_successful_proposals.html.erb => components/admin/proposals/successful_component.html.erb} (84%) create mode 100644 app/components/admin/proposals/successful_component.rb delete mode 100644 app/views/admin/poll/questions/_filter_subnav.html.erb delete mode 100644 app/views/admin/poll/questions/_questions.html.erb delete mode 100644 app/views/admin/poll/questions/index.html.erb create mode 100644 app/views/admin/proposals/successful.html.erb delete mode 100644 spec/components/admin/poll/questions/filter_component_spec.rb create mode 100644 spec/components/admin/proposals/index_component_spec.rb delete mode 100644 spec/system/budget_polls/questions_spec.rb diff --git a/app/assets/stylesheets/admin/poll/questions/filter.scss b/app/assets/stylesheets/admin/poll/questions/filter.scss deleted file mode 100644 index 498872d2b..000000000 --- a/app/assets/stylesheets/admin/poll/questions/filter.scss +++ /dev/null @@ -1,11 +0,0 @@ -.admin .poll-questions-filter { - $gap: 0.5em; - @include flex-with-gap($gap); - align-items: flex-end; - flex-wrap: wrap; - - [type="submit"] { - @include regular-button; - margin-left: $gap; - } -} diff --git a/app/components/admin/poll/questions/filter_component.html.erb b/app/components/admin/poll/questions/filter_component.html.erb deleted file mode 100644 index ee1f443ff..000000000 --- a/app/components/admin/poll/questions/filter_component.html.erb +++ /dev/null @@ -1,7 +0,0 @@ -<%= form_tag "", method: :get, class: "poll-questions-filter" do %> -
    - <%= label_tag :poll_id, t("admin.questions.index.filter_poll") %> - <%= select_tag "poll_id", poll_select_options, prompt: t("polls.all") %> -
    - <%= submit_tag t("shared.filter") %> -<% end %> diff --git a/app/components/admin/poll/questions/filter_component.rb b/app/components/admin/poll/questions/filter_component.rb deleted file mode 100644 index 8b396bd9b..000000000 --- a/app/components/admin/poll/questions/filter_component.rb +++ /dev/null @@ -1,14 +0,0 @@ -class Admin::Poll::Questions::FilterComponent < ApplicationComponent - attr_reader :polls - use_helpers :current_path_with_query_params - - def initialize(polls) - @polls = polls - end - - private - - def poll_select_options - options_from_collection_for_select(polls, :id, :name, params[:poll_id]) - end -end diff --git a/app/components/admin/proposals/index_component.html.erb b/app/components/admin/proposals/index_component.html.erb index d1637739d..74ef9c4f1 100644 --- a/app/components/admin/proposals/index_component.html.erb +++ b/app/components/admin/proposals/index_component.html.erb @@ -1,6 +1,8 @@ <% provide :main_class, "admin-proposals-index" %> -<%= header %> +<%= header do %> + <%= successful_proposals_link %> +<% end %> <% if proposals.any? %> <%= render Admin::SearchComponent.new(label: t("admin.shared.search.label.proposals")) %> diff --git a/app/components/admin/proposals/index_component.rb b/app/components/admin/proposals/index_component.rb index ba35ee196..1ca5ef298 100644 --- a/app/components/admin/proposals/index_component.rb +++ b/app/components/admin/proposals/index_component.rb @@ -9,4 +9,12 @@ class Admin::Proposals::IndexComponent < ApplicationComponent def title t("admin.proposals.index.title") end + + private + + def successful_proposals_link + if Proposal.successful.any? + link_to t("admin.questions.index.successful_proposals_tab"), successful_admin_proposals_path + end + end end diff --git a/app/views/admin/poll/questions/_successful_proposals.html.erb b/app/components/admin/proposals/successful_component.html.erb similarity index 84% rename from app/views/admin/poll/questions/_successful_proposals.html.erb rename to app/components/admin/proposals/successful_component.html.erb index 669d76c94..2a3680acc 100644 --- a/app/views/admin/poll/questions/_successful_proposals.html.erb +++ b/app/components/admin/proposals/successful_component.html.erb @@ -1,3 +1,9 @@ +<% provide :main_class, "admin-proposals-successful" %> + +<%= back_link_to admin_proposals_path %> + +<%= header %> + @@ -6,7 +12,7 @@ - <% @proposals.each do |proposal| %> + <% proposals.each do |proposal| %>
    <%= proposal.title %> diff --git a/app/components/admin/proposals/successful_component.rb b/app/components/admin/proposals/successful_component.rb new file mode 100644 index 000000000..553485665 --- /dev/null +++ b/app/components/admin/proposals/successful_component.rb @@ -0,0 +1,12 @@ +class Admin::Proposals::SuccessfulComponent < ApplicationComponent + include Header + attr_reader :proposals + + def initialize(proposals) + @proposals = proposals + end + + def title + t("admin.questions.index.successful_proposals_tab") + end +end diff --git a/app/controllers/admin/poll/questions_controller.rb b/app/controllers/admin/poll/questions_controller.rb index 3981f652b..19b659158 100644 --- a/app/controllers/admin/poll/questions_controller.rb +++ b/app/controllers/admin/poll/questions_controller.rb @@ -4,14 +4,7 @@ class Admin::Poll::QuestionsController < Admin::Poll::BaseController load_and_authorize_resource :poll load_resource class: "Poll::Question" - authorize_resource except: [:new, :index] - - def index - @polls = Poll.not_budget - @questions = @questions.search(search_params).page(params[:page]).order("created_at DESC") - - @proposals = Proposal.successful.sort_by_confidence_score - end + authorize_resource except: :new def new proposal = Proposal.find(params[:proposal_id]) if params[:proposal_id].present? @@ -61,8 +54,4 @@ class Admin::Poll::QuestionsController < Admin::Poll::BaseController attributes = [:poll_id, :question, :proposal_id, votation_type_attributes: [:vote_type, :max_votes]] [*attributes, translation_params(Poll::Question)] end - - def search_params - params.permit(:poll_id, :search) - end end diff --git a/app/controllers/admin/proposals_controller.rb b/app/controllers/admin/proposals_controller.rb index 5e9e52b49..a0c2770d1 100644 --- a/app/controllers/admin/proposals_controller.rb +++ b/app/controllers/admin/proposals_controller.rb @@ -6,7 +6,11 @@ class Admin::ProposalsController < Admin::BaseController has_orders %w[created_at] - before_action :load_proposal, except: :index + before_action :load_proposal, except: [:index, :successful] + + def successful + @proposals = Proposal.successful.sort_by_confidence_score + end def show end diff --git a/app/models/poll/question.rb b/app/models/poll/question.rb index c55320560..f1015bba7 100644 --- a/app/models/poll/question.rb +++ b/app/models/poll/question.rb @@ -1,6 +1,5 @@ class Poll::Question < ApplicationRecord include Measurable - include Searchable acts_as_paranoid column: :hidden_at include ActsAsParanoidAliases @@ -30,25 +29,9 @@ class Poll::Question < ApplicationRecord delegate :multiple?, :vote_type, to: :votation_type, allow_nil: true - scope :by_poll_id, ->(poll_id) { where(poll_id: poll_id) } - scope :sort_for_list, -> { order(Arel.sql("poll_questions.proposal_id IS NULL"), :created_at) } scope :for_render, -> { includes(:author, :proposal) } - def self.search(params) - results = all - results = results.by_poll_id(params[:poll_id]) if params[:poll_id].present? - results = results.pg_search(params[:search]) if params[:search].present? - results - end - - def searchable_values - { title => "A", - proposal&.title => "A", - author.username => "C", - author_visible_name => "C" } - end - def copy_attributes_from_proposal(proposal) if proposal.present? self.author = proposal.author diff --git a/app/views/admin/poll/questions/_filter_subnav.html.erb b/app/views/admin/poll/questions/_filter_subnav.html.erb deleted file mode 100644 index 7f641d390..000000000 --- a/app/views/admin/poll/questions/_filter_subnav.html.erb +++ /dev/null @@ -1,12 +0,0 @@ -
      -
    • - <%= link_to "#tab-questions" do %> - <%= t("admin.questions.index.questions_tab") %> - <% end %> -
      • -
    • - <%= link_to "#tab-successful-proposals" do %> - <%= t("admin.questions.index.successful_proposals_tab") %> - <% end %> -
      • -
    diff --git a/app/views/admin/poll/questions/_questions.html.erb b/app/views/admin/poll/questions/_questions.html.erb deleted file mode 100644 index e764107de..000000000 --- a/app/views/admin/poll/questions/_questions.html.erb +++ /dev/null @@ -1,38 +0,0 @@ -<%= render Admin::Poll::Questions::FilterComponent.new(@polls) %> - -<% if @questions.count == 0 %> -
    - <%= t("admin.questions.index.no_questions") %> -
    -<% else %> - - - - - - - - - - <% @questions.each do |question| %> - - - - - - <% end %> - -
    <%= t("admin.questions.index.table_question") %><%= t("admin.questions.index.table_poll") %><%= t("admin.actions.actions") %>
    <%= question.title %> - <% if question.poll.present? %> - <%= question.poll.name %> - <% else %> - <%= t("admin.questions.index.poll_not_assigned") %> - <% end %> - - <%= render Admin::TableActionsComponent.new(question) do |actions| %> - <%= actions.action(:options, text: t("admin.polls.show.edit_answers")) %> - <% end %> -
    - - <%= paginate @questions %> -<% end %> diff --git a/app/views/admin/poll/questions/index.html.erb b/app/views/admin/poll/questions/index.html.erb deleted file mode 100644 index 6f704e489..000000000 --- a/app/views/admin/poll/questions/index.html.erb +++ /dev/null @@ -1,18 +0,0 @@ -

    <%= t("admin.questions.index.title") %>

    - -<%= link_to t("admin.questions.index.create"), new_admin_question_path, - class: "button float-right" %> - -<%= render "search" %> - -
    - <%= render "filter_subnav" %> - -
    - <%= render "questions" %> -
    - -
    - <%= render "successful_proposals" %> -
    -
    diff --git a/app/views/admin/proposals/successful.html.erb b/app/views/admin/proposals/successful.html.erb new file mode 100644 index 000000000..d3c3c9c62 --- /dev/null +++ b/app/views/admin/proposals/successful.html.erb @@ -0,0 +1 @@ +<%= render Admin::Proposals::SuccessfulComponent.new(@proposals) %> diff --git a/config/locales/en/admin.yml b/config/locales/en/admin.yml index 0f4ae62ee..d842a34fa 100644 --- a/config/locales/en/admin.yml +++ b/config/locales/en/admin.yml @@ -1134,18 +1134,11 @@ en: multiple_description: "Allows to choose multiple answers. It's possible to set the maximum number of answers." questions: index: - title: "Questions" create: "Create question" - no_questions: "There are no questions." - filter_poll: Filter by Poll select_poll: Select Poll - questions_tab: "Questions" successful_proposals_tab: "Successful proposals" create_question: "Create question" table_proposal: "Proposal" - table_question: "Question" - table_poll: "Poll" - poll_not_assigned: "Poll not assigned" edit: title: "Edit Question" form: diff --git a/config/locales/en/general.yml b/config/locales/en/general.yml index d62b8a1f5..4ee75c137 100644 --- a/config/locales/en/general.yml +++ b/config/locales/en/general.yml @@ -569,7 +569,6 @@ en: support: "You just have to click on the button that you will see below 'Support this proposal' and you can inform yourself about before promoting it. Only the proposals that achieve the maximum support will be carried out by the City Council, and I thought that you, I'm sure you help me achieve it!" share: "And if you also do me the great favor of sharing my proposal with your friends, family and contacts, it would be perfect!" polls: - all: "All" dates: "From %{open_at} to %{closed_at}" final_date: "Final recounts/Results" index: diff --git a/config/locales/es/admin.yml b/config/locales/es/admin.yml index 41848b570..ffa0f58f4 100644 --- a/config/locales/es/admin.yml +++ b/config/locales/es/admin.yml @@ -1134,18 +1134,11 @@ es: multiple_description: "Permite elegir más de una respuesta. Se puede elegir el número máximo de respuestas." questions: index: - title: "Preguntas de votaciones" create: "Crear pregunta ciudadana" - no_questions: "No hay ninguna pregunta ciudadana." - filter_poll: Filtrar por votación select_poll: Seleccionar votación - questions_tab: "Preguntas" successful_proposals_tab: "Propuestas que han superado el umbral" create_question: "Crear pregunta para votación" table_proposal: "Propuesta" - table_question: "Pregunta" - table_poll: "Votación" - poll_not_assigned: "Votación no asignada" edit: title: "Editar pregunta ciudadana" form: diff --git a/config/locales/es/general.yml b/config/locales/es/general.yml index ff88aca9c..458f437a8 100644 --- a/config/locales/es/general.yml +++ b/config/locales/es/general.yml @@ -569,7 +569,6 @@ es: support: "Tan sólo tienes que hacer clic en el botón que verás a continuación 'Apoyar esta propuesta' y directamente podrás informarte acerca de ella antes de impulsarla. Sólo las propuestas que consigan el máximo apoyo se llevarán a cabo por parte del Ayuntamiento, y he pensado que tú ¡seguro que me ayudas a lograrlo!" share: "Y si además, me haces el gran favor de compartir mi propuesta con tus amigos, familiares y contactos ¡sería perfecto!" polls: - all: "Todas" dates: "Desde el %{open_at} hasta el %{closed_at}" final_date: "Recuento final/Resultados" index: diff --git a/config/routes/admin.rb b/config/routes/admin.rb index e0eec7867..7407e6736 100644 --- a/config/routes/admin.rb +++ b/config/routes/admin.rb @@ -45,6 +45,10 @@ namespace :admin do resources :debates, only: [:index, :show] resources :proposals, only: [:index, :show, :update] do + collection do + get :successful + end + member do patch :select patch :deselect @@ -192,7 +196,7 @@ namespace :admin do end end - resources :questions, shallow: true do + resources :questions, except: :index, shallow: true do resources :options, except: [:index, :show], controller: "questions/options", shallow: false resources :options, only: [], controller: "questions/options" do resources :images, controller: "questions/options/images" diff --git a/spec/components/admin/poll/questions/filter_component_spec.rb b/spec/components/admin/poll/questions/filter_component_spec.rb deleted file mode 100644 index 3da7270ad..000000000 --- a/spec/components/admin/poll/questions/filter_component_spec.rb +++ /dev/null @@ -1,9 +0,0 @@ -require "rails_helper" - -describe Admin::Poll::Questions::FilterComponent do - it "renders a button to submit the form" do - render_inline Admin::Poll::Questions::FilterComponent.new([]) - - expect(page).to have_button "Filter" - end -end diff --git a/spec/components/admin/proposals/index_component_spec.rb b/spec/components/admin/proposals/index_component_spec.rb new file mode 100644 index 000000000..e1620e76c --- /dev/null +++ b/spec/components/admin/proposals/index_component_spec.rb @@ -0,0 +1,35 @@ +require "rails_helper" + +describe Admin::Proposals::IndexComponent, controller: Admin::ProposalsController do + around do |example| + with_request_url(Rails.application.routes.url_helpers.admin_proposals_path) { example.run } + end + + describe "#successful_proposals_link" do + it "is shown when there are successful proposals" do + create(:proposal, :successful) + + render_inline Admin::Proposals::IndexComponent.new(Proposal.page(1)) + + expect(page).to have_link "Successful proposals" + end + + it "is not shown when there aren't any successful proposals" do + create(:proposal) + + render_inline Admin::Proposals::IndexComponent.new(Proposal.page(1)) + + expect(page).not_to have_link "Successful proposals" + end + + it "is shown when there are successful proposals on a previous page" do + allow(Proposal).to receive(:default_per_page).and_return(1) + create(:proposal, :successful) + create(:proposal) + + render_inline Admin::Proposals::IndexComponent.new(Proposal.order(:id).page(2)) + + expect(page).to have_link "Successful proposals" + end + end +end diff --git a/spec/system/admin/poll/questions_spec.rb b/spec/system/admin/poll/questions_spec.rb index b71f92db5..127dca219 100644 --- a/spec/system/admin/poll/questions_spec.rb +++ b/spec/system/admin/poll/questions_spec.rb @@ -118,10 +118,9 @@ describe "Admin poll questions", :admin do create(:poll, :future, name: "Proposals") proposal = create(:proposal, :successful) - visit admin_proposal_path(proposal) - - expect(page).to have_content("This proposal has reached the required supports") - click_link "Add this proposal to a poll to be voted" + visit admin_proposals_path + click_link "Successful proposals" + click_link "Create question" expect(page).to have_current_path(new_admin_question_path, ignore_query: true) expect(page).to have_field("Question", with: proposal.title) @@ -130,11 +129,7 @@ describe "Admin poll questions", :admin do click_button "Save" - expect(page).to have_content(proposal.title) - - visit admin_questions_path - - expect(page).to have_content(proposal.title) + expect(page).to have_content proposal.title end scenario "Update" do diff --git a/spec/system/budget_polls/questions_spec.rb b/spec/system/budget_polls/questions_spec.rb deleted file mode 100644 index bc96e8e0c..000000000 --- a/spec/system/budget_polls/questions_spec.rb +++ /dev/null @@ -1,13 +0,0 @@ -require "rails_helper" - -describe "Poll Questions", :admin do - scenario "Do not display polls associated to a budget" do - create(:poll, name: "Citizen Proposal Poll") - create(:poll, :for_budget, name: "Participatory Budget Poll") - - visit admin_questions_path - - expect(page).to have_select("poll_id", text: "Citizen Proposal Poll") - expect(page).not_to have_select("poll_id", text: "Participatory Budget Poll") - end -end From 6089a9249f9a7324be6762f33b86dfa9e9d21b84 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Javi=20Mart=C3=ADn?= Date: Wed, 5 Mar 2025 23:55:52 +0100 Subject: [PATCH 08/11] Remove obsolete Admin::Api::BaseController class This class isn't used since commit 14454bdd4. --- app/controllers/admin/api/base_controller.rb | 3 --- 1 file changed, 3 deletions(-) delete mode 100644 app/controllers/admin/api/base_controller.rb diff --git a/app/controllers/admin/api/base_controller.rb b/app/controllers/admin/api/base_controller.rb deleted file mode 100644 index 8e8cd4138..000000000 --- a/app/controllers/admin/api/base_controller.rb +++ /dev/null @@ -1,3 +0,0 @@ -class Admin::Api::BaseController < Admin::BaseController - protect_from_forgery with: :null_session -end From 5ba6e7b692a2fcb15acf673f1669ae90c268b3b4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Javi=20Mart=C3=ADn?= Date: Thu, 13 Mar 2025 02:45:01 +0100 Subject: [PATCH 09/11] Remove redeemable code I don't think this feature it was ever used. It was introduced in commit 49dec6061 as part of a feature that was removed in commits 1cd47da9d and c45a0bd8ac. --- .../users/registrations_controller.rb | 11 ++-------- app/models/user.rb | 2 +- app/views/users/registrations/new.html.erb | 5 ----- config/locales/en/activerecord.yml | 1 - config/locales/es/activerecord.yml | 1 - ...0313014205_remove_users_redeemable_code.rb | 5 +++++ db/schema.rb | 3 +-- spec/system/registration_form_spec.rb | 20 ------------------- 8 files changed, 9 insertions(+), 39 deletions(-) create mode 100644 db/migrate/20250313014205_remove_users_redeemable_code.rb diff --git a/app/controllers/users/registrations_controller.rb b/app/controllers/users/registrations_controller.rb index b170b32a2..49bf4f8de 100644 --- a/app/controllers/users/registrations_controller.rb +++ b/app/controllers/users/registrations_controller.rb @@ -6,9 +6,7 @@ class Users::RegistrationsController < Devise::RegistrationsController invisible_captcha only: [:create], honeypot: :address, scope: :user def new - super do |user| - user.use_redeemable_code = true if params[:use_redeemable_code].present? - end + super end def create @@ -64,18 +62,13 @@ class Users::RegistrationsController < Devise::RegistrationsController private def sign_up_params - if params[:user].present? && params[:user][:redeemable_code].blank? - params[:user].delete(:redeemable_code) - end - params.require(:user).permit(allowed_params) end def allowed_params [ :username, :email, :password, - :password_confirmation, :terms_of_service, :locale, - :redeemable_code + :password_confirmation, :terms_of_service, :locale ] end diff --git a/app/models/user.rb b/app/models/user.rb index 8ba6d0f4c..4f71af75a 100644 --- a/app/models/user.rb +++ b/app/models/user.rb @@ -89,7 +89,7 @@ class User < ApplicationRecord accepts_nested_attributes_for :organization, update_only: true - attr_accessor :skip_password_validation, :use_redeemable_code, :login + attr_accessor :skip_password_validation, :login scope :administrators, -> { joins(:administrator) } scope :moderators, -> { joins(:moderator) } diff --git a/app/views/users/registrations/new.html.erb b/app/views/users/registrations/new.html.erb index 145f33e3e..324146151 100644 --- a/app/views/users/registrations/new.html.erb +++ b/app/views/users/registrations/new.html.erb @@ -15,7 +15,6 @@
    - <%= f.hidden_field :use_redeemable_code %> <%= f.hidden_field :locale, value: I18n.locale %> <%= f.text_field :username, autofocus: true, maxlength: User.username_max_length, @@ -30,10 +29,6 @@ <%= f.password_field :password_confirmation, autocomplete: "off", label: t("devise_views.users.registrations.new.password_confirmation_label") %> - <% if resource.use_redeemable_code %> - <%= f.text_field :redeemable_code %> - <% end %> - <%= f.check_box :terms_of_service, label: t("devise_views.users.registrations.new.terms", terms: new_window_link_to(t("devise_views.users.registrations.new.terms_link"), diff --git a/config/locales/en/activerecord.yml b/config/locales/en/activerecord.yml index 17f39b6dc..47f5fe23a 100644 --- a/config/locales/en/activerecord.yml +++ b/config/locales/en/activerecord.yml @@ -296,7 +296,6 @@ en: public_interests: "Keep the elements I follow public" recommended_debates: "Recommend debates to me" recommended_proposals: "Recommend proposals to me" - redeemable_code: "Verification code received via email" direct_message: title: "Title" body: "Message" diff --git a/config/locales/es/activerecord.yml b/config/locales/es/activerecord.yml index a2ba75682..3fe8f2540 100644 --- a/config/locales/es/activerecord.yml +++ b/config/locales/es/activerecord.yml @@ -296,7 +296,6 @@ es: public_interests: "Mostrar públicamente los elementos que sigo" recommended_debates: "Mostrar recomendaciones en el listado de debates" recommended_proposals: "Mostrar recomendaciones en el listado de propuestas" - redeemable_code: "Código de verificación por carta (opcional)" direct_message: title: "Título" body: "Mensaje" diff --git a/db/migrate/20250313014205_remove_users_redeemable_code.rb b/db/migrate/20250313014205_remove_users_redeemable_code.rb new file mode 100644 index 000000000..79db34579 --- /dev/null +++ b/db/migrate/20250313014205_remove_users_redeemable_code.rb @@ -0,0 +1,5 @@ +class RemoveUsersRedeemableCode < ActiveRecord::Migration[7.0] + def change + remove_column :users, :redeemable_code, :string + end +end diff --git a/db/schema.rb b/db/schema.rb index ab8291ece..a3c4a7b45 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -10,7 +10,7 @@ # # It's strongly recommended that you check this file into your version control system. -ActiveRecord::Schema[7.0].define(version: 2025_02_22_222739) do +ActiveRecord::Schema[7.0].define(version: 2025_03_13_014205) do # These are extensions that must be enabled in order to support this database enable_extension "pg_trgm" enable_extension "plpgsql" @@ -1611,7 +1611,6 @@ ActiveRecord::Schema[7.0].define(version: 2025_02_22_222739) do t.string "locale" t.string "oauth_email" t.integer "geozone_id" - t.string "redeemable_code" t.string "gender", limit: 10 t.datetime "date_of_birth", precision: nil t.boolean "email_digest", default: true diff --git a/spec/system/registration_form_spec.rb b/spec/system/registration_form_spec.rb index ab7df5ce2..48ce98c1c 100644 --- a/spec/system/registration_form_spec.rb +++ b/spec/system/registration_form_spec.rb @@ -38,26 +38,6 @@ describe "Registration form" do expect(page).to have_content "can't be blank" end - scenario "do not save blank redeemable codes" do - visit new_user_registration_path(use_redeemable_code: "true") - - fill_in "user_username", with: "NewUserWithCode77" - fill_in "user_email", with: "new@consul.dev" - fill_in "user_password", with: "password" - fill_in "user_password_confirmation", with: "password" - fill_in "user_redeemable_code", with: " " - check "user_terms_of_service" - - click_button "Register" - - expect(page).to have_title "Confirm your email address" - expect(page).to have_content "Thank you for registering" - - new_user = User.last - expect(new_user.username).to eq("NewUserWithCode77") - expect(new_user.redeemable_code).to be nil - end - scenario "Create with invisible_captcha honeypot field", :no_js do visit new_user_registration_path From 71742f72b0cbf65f3cb61857a0be58af1858a84d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Javi=20Mart=C3=ADn?= Date: Mon, 24 Mar 2025 14:31:39 +0100 Subject: [PATCH 10/11] Remove obsolete "let" blocks in tests setup These blocks are no longer used: * `allowed_phase_list` isn't used since commit 04605d5d5 * `level_two_user` isn't used since commit 26d14cbd0 * `heading` in `budgets/stats_spec` was added in c2457e36a but never used * `translatable` was added in 44d137a4c but it's overwritten in all the contexts. * `annotation` isn't used since commit 79d00e7b9 * `admin` in `tags/budget_investments_spec` isn't used since 8a2e15980 * `budget` in `welcome_spec` was added in 87be6f302 but never used --- spec/system/admin/translatable_spec.rb | 2 -- spec/system/budgets/budgets_spec.rb | 4 +--- spec/system/budgets/stats_spec.rb | 3 +-- spec/system/comments/legislation_annotations_spec.rb | 1 - spec/system/tags/budget_investments_spec.rb | 1 - spec/system/welcome_spec.rb | 2 -- 6 files changed, 2 insertions(+), 11 deletions(-) diff --git a/spec/system/admin/translatable_spec.rb b/spec/system/admin/translatable_spec.rb index 8a8dc8128..707682aea 100644 --- a/spec/system/admin/translatable_spec.rb +++ b/spec/system/admin/translatable_spec.rb @@ -130,8 +130,6 @@ describe "Admin edit translatable records", :admin do end context "Add an invalid translation" do - let(:translatable) { create(:budget_investment) } - context "Input field" do let(:translatable) { create(:budget, main_link_url: "https://consuldemocracy.org") } diff --git a/spec/system/budgets/budgets_spec.rb b/spec/system/budgets/budgets_spec.rb index 9b6207af5..17d0a9fc8 100644 --- a/spec/system/budgets/budgets_spec.rb +++ b/spec/system/budgets/budgets_spec.rb @@ -1,9 +1,7 @@ require "rails_helper" describe "Budgets" do - let(:budget) { create(:budget) } - let(:level_two_user) { create(:user, :level_two) } - let(:allowed_phase_list) { ["balloting", "reviewing_ballots", "finished"] } + let(:budget) { create(:budget) } context "Load" do before { budget.update(slug: "budget_slug") } diff --git a/spec/system/budgets/stats_spec.rb b/spec/system/budgets/stats_spec.rb index b6bd86977..e426121fc 100644 --- a/spec/system/budgets/stats_spec.rb +++ b/spec/system/budgets/stats_spec.rb @@ -1,8 +1,7 @@ require "rails_helper" describe "Stats" do - let(:budget) { create(:budget, :finished) } - let(:heading) { create(:budget_heading, budget: budget, price: 1000) } + let(:budget) { create(:budget, :finished) } context "Load" do before { budget.update(slug: "budget_slug") } diff --git a/spec/system/comments/legislation_annotations_spec.rb b/spec/system/comments/legislation_annotations_spec.rb index e439be1dd..22d169430 100644 --- a/spec/system/comments/legislation_annotations_spec.rb +++ b/spec/system/comments/legislation_annotations_spec.rb @@ -2,7 +2,6 @@ require "rails_helper" describe "Commenting legislation annotations" do let(:user) { create(:user) } - let(:annotation) { create(:legislation_annotation, author: user) } describe "Merged comment threads" do let!(:draft_version) { create(:legislation_draft_version, :published) } diff --git a/spec/system/tags/budget_investments_spec.rb b/spec/system/tags/budget_investments_spec.rb index 8f49284dd..3f3d4cdac 100644 --- a/spec/system/tags/budget_investments_spec.rb +++ b/spec/system/tags/budget_investments_spec.rb @@ -10,7 +10,6 @@ describe "Tags" do end let!(:tag_medio_ambiente) { create(:tag, :category, name: "Medio Ambiente") } let!(:tag_economia) { create(:tag, :category, name: "Economía") } - let(:admin) { create(:administrator).user } scenario "Index" do earth = create(:budget_investment, heading: heading, tag_list: tag_medio_ambiente.name) diff --git a/spec/system/welcome_spec.rb b/spec/system/welcome_spec.rb index 79d4b1af5..584365be9 100644 --- a/spec/system/welcome_spec.rb +++ b/spec/system/welcome_spec.rb @@ -1,8 +1,6 @@ require "rails_helper" describe "Welcome screen" do - let(:budget) { create(:budget) } - it_behaves_like "remotely_translatable", :proposal, "root_path", {} it_behaves_like "remotely_translatable", :debate, "root_path", {} it_behaves_like "remotely_translatable", :legislation_process, "root_path", {} From a72799de8d607f311e3e7307d7265d07cd98b101 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Javi=20Mart=C3=ADn?= Date: Mon, 24 Mar 2025 14:52:01 +0100 Subject: [PATCH 11/11] Remove redundant "let" block An identical `let` block had already been defined inside the `describe "Public activity"` block, so there was no need to define it again. --- spec/system/users_spec.rb | 2 -- 1 file changed, 2 deletions(-) diff --git a/spec/system/users_spec.rb b/spec/system/users_spec.rb index 4d9d1e31c..204fa2673 100644 --- a/spec/system/users_spec.rb +++ b/spec/system/users_spec.rb @@ -213,8 +213,6 @@ describe "Users" do end describe "User email" do - let(:user) { create(:user) } - scenario "is not shown if no user logged in" do visit user_path(user) expect(page).not_to have_content(user.email)