Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
7 changes: 4 additions & 3 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down Expand Up @@ -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)
Expand All @@ -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)
Expand Down Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
@@ -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
Expand Down Expand Up @@ -76,6 +77,7 @@ def only_selected_users_selected?
end
end
end
# rubocop:enable Metrics/CyclomaticComplexity, Metrics/PerceivedComplexity
end

Decidim::Admin::SelectiveNewsletterFormDecorator.decorate
Original file line number Diff line number Diff line change
Expand Up @@ -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"]

Expand Down
2 changes: 1 addition & 1 deletion decidim-census/decidim-census.gemspec
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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|
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
2 changes: 1 addition & 1 deletion decidim-census/spec/models/decidim/census/status_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -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:)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
2 changes: 1 addition & 1 deletion decidim-diba_census_api/decidim-diba_census_api.gemspec
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion decidim-ldap/decidim-ldap.gemspec
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
10 changes: 5 additions & 5 deletions spec/system/homepage_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
6 changes: 3 additions & 3 deletions spec/system/newsletter_settings_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -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
{
Expand Down
Loading