Skip to content

Commit edee8c4

Browse files
Merge pull request #162 from DiputacioBarcelona/fix_supports_export
Fix supports export
2 parents 02c245c + 9991367 commit edee8c4

15 files changed

Lines changed: 34 additions & 26 deletions

File tree

Gemfile

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,11 @@ gem "base64", "0.2.0"
3636
gem "stringio", "3.2.0"
3737
gem "strscan", "3.1.2"
3838

39+
# Pinned to < 4.0 because openssl 4.0.x's Buffering::Buffer undef's `<<`,
40+
# which clashes with prism's `String#append_as_bytes` polyfill and breaks
41+
# rubocop's remote-config HTTPS fetch.
42+
gem "openssl", "< 4.0"
43+
3944
group :development, :test do
4045
gem "byebug", platform: :mri
4146
gem "decidim-dev", DECIDIM_VERSION

Gemfile.lock

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ GIT
99

1010
GIT
1111
remote: https://github.com/PopulateTools/decidim-module-decidim_awesome.git
12-
revision: 6413d030a7de01189cccb9cd96931d183c173769
12+
revision: b3202b99a23902eeb5b5fbd1acd5be51d9e44784
1313
branch: autoblock_with_attachments_030
1414
specs:
1515
decidim-decidim_awesome (0.13.2)
@@ -721,7 +721,7 @@ GEM
721721
omniauth-oauth (~> 1.1)
722722
rack
723723
open4 (1.3.4)
724-
openssl (4.0.0)
724+
openssl (3.3.2)
725725
orm_adapter (0.5.0)
726726
ostruct (0.6.3)
727727
paper_trail (16.0.0)
@@ -748,7 +748,7 @@ GEM
748748
actionmailer (>= 3)
749749
net-smtp
750750
premailer (~> 1.7, >= 1.7.9)
751-
prism (1.9.0)
751+
prism (1.8.0)
752752
pry (0.16.0)
753753
coderay (~> 1.1)
754754
method_source (~> 1.0)
@@ -1064,6 +1064,7 @@ DEPENDENCIES
10641064
letter_opener_web
10651065
listen (~> 3.7.0)
10661066
mini_magick (~> 4.9)
1067+
openssl (< 4.0)
10671068
pry-rails
10681069
puma (>= 3.12.2)
10691070
rspec-rails

app/decorators/decidim/admin/selective_newsletter_form_decorator.rb

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
# frozen_string_literal: true
22

33
module Decidim::Admin::SelectiveNewsletterFormDecorator
4+
# rubocop:disable Metrics/CyclomaticComplexity, Metrics/PerceivedComplexity
45
def self.decorate
56
Decidim::Admin::SelectiveNewsletterForm.class_eval do
67
include Decidim::TranslatableAttributes
@@ -76,6 +77,7 @@ def only_selected_users_selected?
7677
end
7778
end
7879
end
80+
# rubocop:enable Metrics/CyclomaticComplexity, Metrics/PerceivedComplexity
7981
end
8082

8183
Decidim::Admin::SelectiveNewsletterFormDecorator.decorate

decidim-age_action_authorization/decidim-age_action_authorization.gemspec

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ Gem::Specification.new do |s|
1414
s.homepage = "https://github.com/diputacioBCN/decidim-diba"
1515
s.license = "AGPLv3"
1616

17-
s.required_ruby_version = ">= 3.2.6"
17+
s.required_ruby_version = ">= 3.3.4"
1818

1919
s.files = Dir["{app,config,db,lib}/**/*", "MIT-LICENSE", "Rakefile", "README.md"]
2020

decidim-census/decidim-census.gemspec

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ Gem::Specification.new do |s|
1818

1919
s.files = Dir["{app,config,db,lib}/**/*", "MIT-LICENSE", "Rakefile", "README.md"]
2020

21-
s.required_ruby_version = ">= 3.2.6"
21+
s.required_ruby_version = ">= 3.3.4"
2222

2323
CENSUS_DECIDIM_VERSION = "~>#{Decidim::Census::VERSION}".freeze
2424

decidim-census/spec/controllers/decidim/census/admin/censuses_controller_spec.rb

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,12 +7,12 @@
77
routes { Decidim::Census::AdminEngine.routes }
88

99
let(:organization) do
10-
create :organization,
11-
available_authorizations: ["census_authorization_handler"]
10+
create(:organization,
11+
available_authorizations: ["census_authorization_handler"])
1212
end
1313

1414
let(:user) do
15-
create :user, :confirmed, :admin_terms_accepted, organization:, admin: true, nickname: "nickname"
15+
create(:user, :confirmed, :admin_terms_accepted, organization:, admin: true, nickname: "nickname")
1616
end
1717

1818
before do

decidim-census/spec/jobs/decidim/census/remove_duplicates_job_spec.rb

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@
33
require "spec_helper"
44

55
RSpec.describe Decidim::Census::RemoveDuplicatesJob do
6-
let(:org1) { create :organization }
7-
let(:org2) { create :organization }
6+
let(:org1) { create(:organization) }
7+
let(:org2) { create(:organization) }
88

99
it "remove duplicates in the database" do
1010
%w(AAA BBB AAA AAA).each do |doc|

decidim-census/spec/models/decidim/census/census_datum_spec.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
require "spec_helper"
44
RSpec.describe Decidim::Census::CensusDatum do
5-
let(:organization) { create :organization }
5+
let(:organization) { create(:organization) }
66

77
CensusDatum = Decidim::Census::CensusDatum
88

decidim-census/spec/models/decidim/census/status_spec.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
require "spec_helper"
44

55
RSpec.describe Decidim::Census::Status do
6-
let(:organization) { create :organization }
6+
let(:organization) { create(:organization) }
77

88
it "returns last import date" do
99
last = create(:census_datum, organization:)

decidim-diba_census_api/app/services/ephemeral_diba_census_api_authorization_handler.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
# An AuthorizationHandler that uses the DibaCensusApiService to create ephemeral authorizations
44
class EphemeralDibaCensusApiAuthorizationHandler < DibaCensusApiAuthorizationHandler
5-
def to_partial_path
5+
def to_partial_path
66
"diba_census_api_authorization/form"
77
end
88
end

0 commit comments

Comments
 (0)