diff --git a/Gemfile b/Gemfile index d431f3c3..e708f13d 100644 --- a/Gemfile +++ b/Gemfile @@ -36,6 +36,11 @@ gem "base64", "0.2.0" gem "stringio", "3.2.0" gem "strscan", "3.1.2" +# Pinned to < 4.0 because openssl 4.0.x's Buffering::Buffer undef's `<<`, +# which clashes with prism's `String#append_as_bytes` polyfill and breaks +# rubocop's remote-config HTTPS fetch. +gem "openssl", "< 4.0" + group :development, :test do gem "byebug", platform: :mri gem "decidim-dev", DECIDIM_VERSION diff --git a/Gemfile.lock b/Gemfile.lock index 99869b09..251efda2 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -9,7 +9,7 @@ GIT GIT remote: https://github.com/PopulateTools/decidim-module-decidim_awesome.git - revision: 6413d030a7de01189cccb9cd96931d183c173769 + revision: b3202b99a23902eeb5b5fbd1acd5be51d9e44784 branch: autoblock_with_attachments_030 specs: decidim-decidim_awesome (0.13.2) @@ -721,7 +721,7 @@ GEM omniauth-oauth (~> 1.1) rack open4 (1.3.4) - openssl (4.0.0) + openssl (3.3.2) orm_adapter (0.5.0) ostruct (0.6.3) paper_trail (16.0.0) @@ -748,7 +748,7 @@ GEM actionmailer (>= 3) net-smtp premailer (~> 1.7, >= 1.7.9) - prism (1.9.0) + prism (1.8.0) pry (0.16.0) coderay (~> 1.1) method_source (~> 1.0) @@ -1064,6 +1064,7 @@ DEPENDENCIES letter_opener_web listen (~> 3.7.0) mini_magick (~> 4.9) + openssl (< 4.0) pry-rails puma (>= 3.12.2) rspec-rails diff --git a/app/decorators/decidim/admin/selective_newsletter_form_decorator.rb b/app/decorators/decidim/admin/selective_newsletter_form_decorator.rb index 2c939cac..84d75b24 100644 --- a/app/decorators/decidim/admin/selective_newsletter_form_decorator.rb +++ b/app/decorators/decidim/admin/selective_newsletter_form_decorator.rb @@ -1,6 +1,7 @@ # frozen_string_literal: true module Decidim::Admin::SelectiveNewsletterFormDecorator + # rubocop:disable Metrics/CyclomaticComplexity, Metrics/PerceivedComplexity def self.decorate Decidim::Admin::SelectiveNewsletterForm.class_eval do include Decidim::TranslatableAttributes @@ -76,6 +77,7 @@ def only_selected_users_selected? end end end + # rubocop:enable Metrics/CyclomaticComplexity, Metrics/PerceivedComplexity end Decidim::Admin::SelectiveNewsletterFormDecorator.decorate diff --git a/decidim-age_action_authorization/decidim-age_action_authorization.gemspec b/decidim-age_action_authorization/decidim-age_action_authorization.gemspec index 7eef706f..5d7266c0 100644 --- a/decidim-age_action_authorization/decidim-age_action_authorization.gemspec +++ b/decidim-age_action_authorization/decidim-age_action_authorization.gemspec @@ -14,7 +14,7 @@ Gem::Specification.new do |s| s.homepage = "https://github.com/diputacioBCN/decidim-diba" s.license = "AGPLv3" - s.required_ruby_version = ">= 3.2.6" + s.required_ruby_version = ">= 3.3.4" s.files = Dir["{app,config,db,lib}/**/*", "MIT-LICENSE", "Rakefile", "README.md"] diff --git a/decidim-census/decidim-census.gemspec b/decidim-census/decidim-census.gemspec index 847342ef..e5e81428 100644 --- a/decidim-census/decidim-census.gemspec +++ b/decidim-census/decidim-census.gemspec @@ -18,7 +18,7 @@ Gem::Specification.new do |s| s.files = Dir["{app,config,db,lib}/**/*", "MIT-LICENSE", "Rakefile", "README.md"] - s.required_ruby_version = ">= 3.2.6" + s.required_ruby_version = ">= 3.3.4" CENSUS_DECIDIM_VERSION = "~>#{Decidim::Census::VERSION}".freeze diff --git a/decidim-census/spec/controllers/decidim/census/admin/censuses_controller_spec.rb b/decidim-census/spec/controllers/decidim/census/admin/censuses_controller_spec.rb index ae71590a..66920ddd 100644 --- a/decidim-census/spec/controllers/decidim/census/admin/censuses_controller_spec.rb +++ b/decidim-census/spec/controllers/decidim/census/admin/censuses_controller_spec.rb @@ -7,12 +7,12 @@ routes { Decidim::Census::AdminEngine.routes } let(:organization) do - create :organization, - available_authorizations: ["census_authorization_handler"] + create(:organization, + available_authorizations: ["census_authorization_handler"]) end let(:user) do - create :user, :confirmed, :admin_terms_accepted, organization:, admin: true, nickname: "nickname" + create(:user, :confirmed, :admin_terms_accepted, organization:, admin: true, nickname: "nickname") end before do diff --git a/decidim-census/spec/jobs/decidim/census/remove_duplicates_job_spec.rb b/decidim-census/spec/jobs/decidim/census/remove_duplicates_job_spec.rb index 19ac0b77..5fd54280 100644 --- a/decidim-census/spec/jobs/decidim/census/remove_duplicates_job_spec.rb +++ b/decidim-census/spec/jobs/decidim/census/remove_duplicates_job_spec.rb @@ -3,8 +3,8 @@ require "spec_helper" RSpec.describe Decidim::Census::RemoveDuplicatesJob do - let(:org1) { create :organization } - let(:org2) { create :organization } + let(:org1) { create(:organization) } + let(:org2) { create(:organization) } it "remove duplicates in the database" do %w(AAA BBB AAA AAA).each do |doc| diff --git a/decidim-census/spec/models/decidim/census/census_datum_spec.rb b/decidim-census/spec/models/decidim/census/census_datum_spec.rb index 221e1fad..f0ee3e0b 100644 --- a/decidim-census/spec/models/decidim/census/census_datum_spec.rb +++ b/decidim-census/spec/models/decidim/census/census_datum_spec.rb @@ -2,7 +2,7 @@ require "spec_helper" RSpec.describe Decidim::Census::CensusDatum do - let(:organization) { create :organization } + let(:organization) { create(:organization) } CensusDatum = Decidim::Census::CensusDatum diff --git a/decidim-census/spec/models/decidim/census/status_spec.rb b/decidim-census/spec/models/decidim/census/status_spec.rb index 2d8230d9..5752358c 100644 --- a/decidim-census/spec/models/decidim/census/status_spec.rb +++ b/decidim-census/spec/models/decidim/census/status_spec.rb @@ -3,7 +3,7 @@ require "spec_helper" RSpec.describe Decidim::Census::Status do - let(:organization) { create :organization } + let(:organization) { create(:organization) } it "returns last import date" do last = create(:census_datum, organization:) diff --git a/decidim-diba_census_api/app/services/ephemeral_diba_census_api_authorization_handler.rb b/decidim-diba_census_api/app/services/ephemeral_diba_census_api_authorization_handler.rb index 572b7dd5..967faefc 100644 --- a/decidim-diba_census_api/app/services/ephemeral_diba_census_api_authorization_handler.rb +++ b/decidim-diba_census_api/app/services/ephemeral_diba_census_api_authorization_handler.rb @@ -2,7 +2,7 @@ # An AuthorizationHandler that uses the DibaCensusApiService to create ephemeral authorizations class EphemeralDibaCensusApiAuthorizationHandler < DibaCensusApiAuthorizationHandler - def to_partial_path + def to_partial_path "diba_census_api_authorization/form" end end diff --git a/decidim-diba_census_api/decidim-diba_census_api.gemspec b/decidim-diba_census_api/decidim-diba_census_api.gemspec index 45e8777c..ad3abf2b 100644 --- a/decidim-diba_census_api/decidim-diba_census_api.gemspec +++ b/decidim-diba_census_api/decidim-diba_census_api.gemspec @@ -10,7 +10,7 @@ Gem::Specification.new do |s| s.email = ["daniel.gomez@marsbased.com"] s.license = "AGPL-3.0" s.homepage = "https://github.com/diputacioBCN/decidim-diba" - s.required_ruby_version = ">= 3.2.6" + s.required_ruby_version = ">= 3.3.4" s.name = "decidim-diba_census_api" s.summary = "AuthorizationHandler provider against the Diputació of Barcelona Census API" diff --git a/decidim-diba_census_api/spec/controllers/decidim/diba_census_api/admin/api_configs_controller_spec.rb b/decidim-diba_census_api/spec/controllers/decidim/diba_census_api/admin/api_configs_controller_spec.rb index afe2c700..504f7c8f 100644 --- a/decidim-diba_census_api/spec/controllers/decidim/diba_census_api/admin/api_configs_controller_spec.rb +++ b/decidim-diba_census_api/spec/controllers/decidim/diba_census_api/admin/api_configs_controller_spec.rb @@ -7,12 +7,12 @@ routes { Decidim::DibaCensusApi::AdminEngine.routes } let(:organization) do - create :organization, - available_authorizations: ["diba_census_api_authorization_handler"] + create(:organization, + available_authorizations: ["diba_census_api_authorization_handler"]) end let(:user) do - create :user, :confirmed, :admin_terms_accepted, organization:, admin: true, nickname: "nickname" + create(:user, :confirmed, :admin_terms_accepted, organization:, admin: true, nickname: "nickname") end before do diff --git a/decidim-ldap/decidim-ldap.gemspec b/decidim-ldap/decidim-ldap.gemspec index 872410e0..94769a37 100644 --- a/decidim-ldap/decidim-ldap.gemspec +++ b/decidim-ldap/decidim-ldap.gemspec @@ -18,7 +18,7 @@ Gem::Specification.new do |s| s.files = Dir["{app,config,db,lib}/**/*", "MIT-LICENSE", "Rakefile", "README.md"] - s.required_ruby_version = ">= 3.2.6" + s.required_ruby_version = ">= 3.3.4" LDAP_DECIDIM_VERSION = "~> #{Decidim::Ldap::VERSION}".freeze diff --git a/spec/system/homepage_spec.rb b/spec/system/homepage_spec.rb index 807f0836..cd108908 100644 --- a/spec/system/homepage_spec.rb +++ b/spec/system/homepage_spec.rb @@ -15,11 +15,11 @@ before do I18n.with_locale(:en) do - create :content_block, organization:, scope_name: :homepage, manifest_name: :hero - create :content_block, organization:, scope_name: :homepage, manifest_name: :sub_hero - create :content_block, organization:, scope_name: :homepage, manifest_name: :highlighted_content_banner - create :content_block, organization:, scope_name: :homepage, manifest_name: :how_to_participate - create :content_block, organization:, scope_name: :homepage, manifest_name: :footer_sub_hero + create(:content_block, organization:, scope_name: :homepage, manifest_name: :hero) + create(:content_block, organization:, scope_name: :homepage, manifest_name: :sub_hero) + create(:content_block, organization:, scope_name: :homepage, manifest_name: :highlighted_content_banner) + create(:content_block, organization:, scope_name: :homepage, manifest_name: :how_to_participate) + create(:content_block, organization:, scope_name: :homepage, manifest_name: :footer_sub_hero) end switch_to_host(organization.host) diff --git a/spec/system/newsletter_settings_spec.rb b/spec/system/newsletter_settings_spec.rb index 582e7905..b3f5c2bd 100644 --- a/spec/system/newsletter_settings_spec.rb +++ b/spec/system/newsletter_settings_spec.rb @@ -7,14 +7,14 @@ let(:footer_logo) { Decidim::Dev.test_file("avatar.jpg", "image/jpeg") } let(:organization) { create(:organization, logo: organization_logo, official_img_footer: footer_logo, twitter_handler: "twitter", facebook_handler: "") } let!(:admin) { create(:user, :admin, :confirmed, organization:) } - let!(:newsletter) { create :newsletter, :sent, total_recipients: 1 } + let!(:newsletter) { create(:newsletter, :sent, total_recipients: 1) } let!(:content_block) do - create :content_block, + create(:content_block, organization:, manifest_name: :basic_only_text, scope_name: :newsletter_template, scoped_resource_id: newsletter.id, - settings: + settings:) end let(:settings) do {