From f31fbe17b3d88ee7e5ccbb9bcf121d05a8e81b04 Mon Sep 17 00:00:00 2001 From: Laura Jaime Date: Tue, 16 Jul 2024 17:06:29 +0200 Subject: [PATCH 1/3] Upgrade to Decidim v0.27 --- .node-version | 1 + .ruby-version | 2 +- CHANGELOG.md | 3 + Gemfile | 4 +- Gemfile.lock | 772 +++++++++--------- decidim-idcat_mobil.gemspec | 2 +- lib/decidim/idcat_mobil/version.rb | 4 +- .../idcat_mobil/verification_job_spec.rb | 10 +- 8 files changed, 421 insertions(+), 377 deletions(-) create mode 100644 .node-version diff --git a/.node-version b/.node-version new file mode 100644 index 0000000..06e7515 --- /dev/null +++ b/.node-version @@ -0,0 +1 @@ +16.9.1 diff --git a/.ruby-version b/.ruby-version index 1f7da99..2451c27 100644 --- a/.ruby-version +++ b/.ruby-version @@ -1 +1 @@ -2.7.7 +3.0.7 diff --git a/CHANGELOG.md b/CHANGELOG.md index 4e0b60b..4203deb 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,7 +2,10 @@ Following Semantic Versioning 2. ## next version: + +## Version 0.4.0 (MINOR) - DOC: Define the correct icon_path configuration value in README +- Bump Ruby version to 3.0.7 ## Version 0.3.0 (MINOR) - Update omniauth-idcat_mobil: Send the client_id and the client_secret during the AuthToken retrieval. diff --git a/Gemfile b/Gemfile index f39eb75..de5cf88 100644 --- a/Gemfile +++ b/Gemfile @@ -12,8 +12,8 @@ gemspec group :development, :test do gem "bootsnap" gem "byebug" - gem "decidim", "~> 0.25.2" - gem "decidim-dev", "~> 0.25.2" + gem "decidim" + gem "decidim-dev" gem "faker", "~> 2.19" gem "rubocop" gem "rubocop-rspec" diff --git a/Gemfile.lock b/Gemfile.lock index e37580f..5338b5d 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,46 +1,48 @@ PATH remote: . specs: - decidim-idcat_mobil (0.3.0) - decidim (>= 0.25.2) - decidim-core (>= 0.25.2) + decidim-idcat_mobil (0.4.0) + decidim (>= 0.27.0) + decidim-core (>= 0.27.0) omniauth-idcat_mobil (~> 0.5.0) GEM remote: https://rubygems.org/ specs: - actioncable (6.0.5) - actionpack (= 6.0.5) + actioncable (6.1.7.8) + actionpack (= 6.1.7.8) + activesupport (= 6.1.7.8) nio4r (~> 2.0) websocket-driver (>= 0.6.1) - actionmailbox (6.0.5) - actionpack (= 6.0.5) - activejob (= 6.0.5) - activerecord (= 6.0.5) - activestorage (= 6.0.5) - activesupport (= 6.0.5) + actionmailbox (6.1.7.8) + actionpack (= 6.1.7.8) + activejob (= 6.1.7.8) + activerecord (= 6.1.7.8) + activestorage (= 6.1.7.8) + activesupport (= 6.1.7.8) mail (>= 2.7.1) - actionmailer (6.0.5) - actionpack (= 6.0.5) - actionview (= 6.0.5) - activejob (= 6.0.5) + actionmailer (6.1.7.8) + actionpack (= 6.1.7.8) + actionview (= 6.1.7.8) + activejob (= 6.1.7.8) + activesupport (= 6.1.7.8) mail (~> 2.5, >= 2.5.4) rails-dom-testing (~> 2.0) - actionpack (6.0.5) - actionview (= 6.0.5) - activesupport (= 6.0.5) - rack (~> 2.0, >= 2.0.8) + actionpack (6.1.7.8) + actionview (= 6.1.7.8) + activesupport (= 6.1.7.8) + rack (~> 2.0, >= 2.0.9) rack-test (>= 0.6.3) rails-dom-testing (~> 2.0) rails-html-sanitizer (~> 1.0, >= 1.2.0) - actiontext (6.0.5) - actionpack (= 6.0.5) - activerecord (= 6.0.5) - activestorage (= 6.0.5) - activesupport (= 6.0.5) + actiontext (6.1.7.8) + actionpack (= 6.1.7.8) + activerecord (= 6.1.7.8) + activestorage (= 6.1.7.8) + activesupport (= 6.1.7.8) nokogiri (>= 1.8.5) - actionview (6.0.5) - activesupport (= 6.0.5) + actionview (6.1.7.8) + activesupport (= 6.1.7.8) builder (~> 3.1) erubi (~> 1.4) rails-dom-testing (~> 2.0) @@ -48,32 +50,33 @@ GEM active_link_to (1.0.5) actionpack addressable - activejob (6.0.5) - activesupport (= 6.0.5) + activejob (6.1.7.8) + activesupport (= 6.1.7.8) globalid (>= 0.3.6) - activemodel (6.0.5) - activesupport (= 6.0.5) - activerecord (6.0.5) - activemodel (= 6.0.5) - activesupport (= 6.0.5) - activestorage (6.0.5) - actionpack (= 6.0.5) - activejob (= 6.0.5) - activerecord (= 6.0.5) + activemodel (6.1.7.8) + activesupport (= 6.1.7.8) + activerecord (6.1.7.8) + activemodel (= 6.1.7.8) + activesupport (= 6.1.7.8) + activestorage (6.1.7.8) + actionpack (= 6.1.7.8) + activejob (= 6.1.7.8) + activerecord (= 6.1.7.8) + activesupport (= 6.1.7.8) marcel (~> 1.0) - activesupport (6.0.5) + mini_mime (>= 1.1.0) + activesupport (6.1.7.8) concurrent-ruby (~> 1.0, >= 1.0.2) - i18n (>= 0.7, < 2) - minitest (~> 5.1) - tzinfo (~> 1.1) - zeitwerk (~> 2.2, >= 2.2.2) + i18n (>= 1.6, < 2) + minitest (>= 5.1) + tzinfo (~> 2.0) + zeitwerk (~> 2.3) acts_as_list (0.9.19) activerecord (>= 3.0) - addressable (2.8.0) - public_suffix (>= 2.0.2, < 5.0) - anchored (1.1.0) + addressable (2.8.7) + public_suffix (>= 2.0.2, < 7.0) ast (2.4.2) - axe-core-api (4.4.0) + axe-core-api (4.9.1) dumb_delegator virtus axe-core-rspec (4.1.0) @@ -84,8 +87,9 @@ GEM descendants_tracker (~> 0.0.4) ice_nine (~> 0.11.0) thread_safe (~> 0.3, >= 0.3.1) + base64 (0.2.0) batch-loader (1.5.0) - bcrypt (3.1.18) + bcrypt (3.1.20) better_html (1.0.16) actionview (>= 4.0) activesupport (>= 4.0) @@ -94,22 +98,23 @@ GEM html_tokenizer (~> 0.0.6) parser (>= 2.4) smart_properties + bigdecimal (3.1.8) bindex (0.8.1) - bootsnap (1.12.0) + bootsnap (1.18.3) msgpack (~> 1.2) browser (2.7.1) - builder (3.2.4) + builder (3.3.0) byebug (11.1.3) - capybara (3.37.1) + capybara (3.40.0) addressable matrix mini_mime (>= 0.1.3) - nokogiri (~> 1.8) + nokogiri (~> 1.11) rack (>= 1.6.0) rack-test (>= 0.6.3) regexp_parser (>= 1.5, < 3.0) xpath (~> 3.2) - carrierwave (2.2.2) + carrierwave (2.2.6) activemodel (>= 5.0.0) activesupport (>= 5.0.0) addressable (~> 2.6) @@ -128,10 +133,10 @@ GEM cells-rails (0.1.5) actionpack (>= 5.0) cells (>= 4.1.6, < 5.0.0) - charlock_holmes (0.7.7) - chef-utils (17.10.0) + charlock_holmes (0.7.9) + chef-utils (18.5.0) concurrent-ruby - childprocess (3.0.0) + childprocess (4.1.0) coercible (1.0.0) descendants_tracker (~> 0.0.1) coffee-rails (5.0.0) @@ -141,218 +146,213 @@ GEM coffee-script-source execjs coffee-script-source (1.12.2) - concurrent-ruby (1.1.10) - crack (0.4.5) + commonmarker (0.23.10) + concurrent-ruby (1.3.3) + crack (1.0.0) + bigdecimal rexml crass (1.0.6) - css_parser (1.11.0) + css_parser (1.17.1) addressable - date_validator (0.9.0) - activemodel - activesupport + csv (3.3.0) + date (3.3.4) + date_validator (0.12.0) + activemodel (>= 3) + activesupport (>= 3) db-query-matchers (0.10.0) activesupport (>= 4.0, < 7) rspec (~> 3.0) - decidim (0.25.2) - decidim-accountability (= 0.25.2) - decidim-admin (= 0.25.2) - decidim-api (= 0.25.2) - decidim-assemblies (= 0.25.2) - decidim-blogs (= 0.25.2) - decidim-budgets (= 0.25.2) - decidim-comments (= 0.25.2) - decidim-core (= 0.25.2) - decidim-debates (= 0.25.2) - decidim-forms (= 0.25.2) - decidim-generators (= 0.25.2) - decidim-meetings (= 0.25.2) - decidim-pages (= 0.25.2) - decidim-participatory_processes (= 0.25.2) - decidim-proposals (= 0.25.2) - decidim-sortitions (= 0.25.2) - decidim-surveys (= 0.25.2) - decidim-system (= 0.25.2) - decidim-templates (= 0.25.2) - decidim-verifications (= 0.25.2) - decidim-accountability (0.25.2) - decidim-comments (= 0.25.2) - decidim-core (= 0.25.2) - decidim-admin (0.25.2) + decidim (0.27.6) + decidim-accountability (= 0.27.6) + decidim-admin (= 0.27.6) + decidim-api (= 0.27.6) + decidim-assemblies (= 0.27.6) + decidim-blogs (= 0.27.6) + decidim-budgets (= 0.27.6) + decidim-comments (= 0.27.6) + decidim-core (= 0.27.6) + decidim-debates (= 0.27.6) + decidim-forms (= 0.27.6) + decidim-generators (= 0.27.6) + decidim-meetings (= 0.27.6) + decidim-pages (= 0.27.6) + decidim-participatory_processes (= 0.27.6) + decidim-proposals (= 0.27.6) + decidim-sortitions (= 0.27.6) + decidim-surveys (= 0.27.6) + decidim-system (= 0.27.6) + decidim-templates (= 0.27.6) + decidim-verifications (= 0.27.6) + decidim-accountability (0.27.6) + decidim-comments (= 0.27.6) + decidim-core (= 0.27.6) + decidim-admin (0.27.6) active_link_to (~> 1.0) - decidim-core (= 0.25.2) + decidim-core (= 0.27.6) devise (~> 4.7) devise-i18n (~> 1.2) - devise_invitable (~> 2.0) - decidim-api (0.25.2) - graphql (~> 1.12, >= 1.12.3) + devise_invitable (~> 2.0, >= 2.0.9) + decidim-api (0.27.6) + decidim-core (= 0.27.6) + graphql (~> 1.12, < 1.13) + graphql-docs (~> 2.1.0) rack-cors (~> 1.0) + decidim-assemblies (0.27.6) + decidim-core (= 0.27.6) + decidim-blogs (0.27.6) + decidim-admin (= 0.27.6) + decidim-comments (= 0.27.6) + decidim-core (= 0.27.6) + decidim-budgets (0.27.6) + decidim-comments (= 0.27.6) + decidim-core (= 0.27.6) + decidim-comments (0.27.6) + decidim-core (= 0.27.6) redcarpet (~> 3.5, >= 3.5.1) - decidim-assemblies (0.25.2) - decidim-core (= 0.25.2) - decidim-blogs (0.25.2) - decidim-admin (= 0.25.2) - decidim-comments (= 0.25.2) - decidim-core (= 0.25.2) - decidim-budgets (0.25.2) - decidim-comments (= 0.25.2) - decidim-core (= 0.25.2) - decidim-comments (0.25.2) - decidim-core (= 0.25.2) - redcarpet (~> 3.5, >= 3.5.1) - decidim-core (0.25.2) + decidim-core (0.27.6) active_link_to (~> 1.0) acts_as_list (~> 0.9) - anchored (~> 1.1) batch-loader (~> 1.2) browser (~> 2.7) - carrierwave (~> 2.2.1) + carrierwave (~> 2.2.5, >= 2.2.5) cells-erb (~> 0.1.0) cells-rails (~> 0.1.3) charlock_holmes (~> 0.7) - date_validator (~> 0.9.0) - decidim-api (= 0.25.2) + date_validator (~> 0.12.0) devise (~> 4.7) devise-i18n (~> 1.2) diffy (~> 3.3) doorkeeper (~> 5.1) doorkeeper-i18n (~> 4.0) - etherpad-lite (~> 0.3) - file_validators (~> 2.1) + file_validators (~> 3.0) fog-local (~> 0.6) - foundation_rails_helper - geocoder (~> 1.5) + foundation_rails_helper (~> 4.0) + geocoder (~> 1.8) hashdiff (>= 0.4.0, < 2.0.0) invisible_captcha (~> 0.12) kaminari (~> 1.2, >= 1.2.1) - loofah (~> 2.3.1) + loofah (~> 2.19.0) + mime-types (>= 1.16, < 4.0) mini_magick (~> 4.9) - mustache (~> 1.1.0) - nobspw (~> 0.6.0) omniauth (~> 2.0) omniauth-facebook (~> 5.0) omniauth-google-oauth2 (~> 1.0) omniauth-rails_csrf_protection (~> 1.0) omniauth-twitter (~> 1.4) - paper_trail (~> 10.3) + paper_trail (~> 12.0) pg (~> 1.1.4, < 2) pg_search (~> 2.2) premailer-rails (~> 1.10) rack (~> 2.2, >= 2.2.3) rack-attack (~> 6.0) - rails (~> 6.0.4) + rails (~> 6.1.0) rails-i18n (~> 6.0) ransack (~> 2.4.1) - rectify (~> 0.13.0) redis (~> 4.1) request_store (~> 1.5.0) rubyXL (~> 3.4) rubyzip (~> 2.0) - searchlight (~> 4.1) seven_zip_ruby (~> 1.3) social-share-button (~> 1.2, >= 1.2.1) - truncato (~> 0.7) valid_email2 (~> 2.1) webpacker (= 6.0.0.rc.5) + webpush (~> 1.1) wisper (~> 2.0) - decidim-debates (0.25.2) - decidim-comments (= 0.25.2) - decidim-core (= 0.25.2) - decidim-dev (0.25.2) + decidim-debates (0.27.6) + decidim-comments (= 0.27.6) + decidim-core (= 0.27.6) + decidim-dev (0.27.6) axe-core-rspec (~> 4.1.0) byebug (~> 11.0) capybara (~> 3.24) db-query-matchers (~> 0.10.0) - decidim (= 0.25.2) + decidim (= 0.27.6) erb_lint (~> 0.0.35) factory_bot_rails (~> 4.8) i18n-tasks (~> 0.9.18) mdl (~> 0.5) - nokogiri (~> 1.11, >= 1.11.4) + nokogiri (~> 1.13) + parallel_tests (~> 3.7) puma (~> 5.0) rails-controller-testing (~> 1.0) - rspec-cells (~> 0.3.4) + rspec-cells (~> 0.3.7) rspec-html-matchers (~> 0.9.1) rspec-rails (~> 4.0) rspec-retry (~> 0.6.2) rspec_junit_formatter (~> 0.3.0) - rubocop (~> 0.92.0) - rubocop-rails (~> 2.8) - rubocop-rspec (= 1.43.2) - selenium-webdriver (~> 3.142) - simplecov (~> 0.19.0) - simplecov-cobertura (~> 1.3.1) - system_test_html_screenshots (~> 0.2) + rubocop (~> 1.28.0) + rubocop-rails (~> 2.14) + rubocop-rspec (~> 2.10) + selenium-webdriver (~> 4.1.0) + simplecov (~> 0.21.0) + simplecov-cobertura (~> 2.1.0) w3c_rspec_validators (~> 0.3.0) webmock (~> 3.6) wisper-rspec (~> 1.0) - decidim-forms (0.25.2) - decidim-core (= 0.25.2) + decidim-forms (0.27.6) + decidim-core (= 0.27.6) wicked_pdf (~> 2.1) wkhtmltopdf-binary (~> 0.12) - decidim-generators (0.25.2) - decidim-core (= 0.25.2) - decidim-meetings (0.25.2) - decidim-core (= 0.25.2) - decidim-forms (= 0.25.2) + decidim-generators (0.27.6) + decidim-core (= 0.27.6) + decidim-meetings (0.27.6) + decidim-core (= 0.27.6) + decidim-forms (= 0.27.6) icalendar (~> 2.5) - decidim-pages (0.25.2) - decidim-core (= 0.25.2) - decidim-participatory_processes (0.25.2) - decidim-core (= 0.25.2) - decidim-proposals (0.25.2) - decidim-comments (= 0.25.2) - decidim-core (= 0.25.2) - doc2text (~> 0.4.3) + decidim-pages (0.27.6) + decidim-core (= 0.27.6) + decidim-participatory_processes (0.27.6) + decidim-core (= 0.27.6) + decidim-proposals (0.27.6) + decidim-comments (= 0.27.6) + decidim-core (= 0.27.6) + doc2text (~> 0.4.5) redcarpet (~> 3.5, >= 3.5.1) - decidim-sortitions (0.25.2) - decidim-admin (= 0.25.2) - decidim-comments (= 0.25.2) - decidim-core (= 0.25.2) - decidim-proposals (= 0.25.2) - decidim-surveys (0.25.2) - decidim-core (= 0.25.2) - decidim-forms (= 0.25.2) - decidim-templates (= 0.25.2) - decidim-system (0.25.2) + decidim-sortitions (0.27.6) + decidim-admin (= 0.27.6) + decidim-comments (= 0.27.6) + decidim-core (= 0.27.6) + decidim-proposals (= 0.27.6) + decidim-surveys (0.27.6) + decidim-core (= 0.27.6) + decidim-forms (= 0.27.6) + decidim-system (0.27.6) active_link_to (~> 1.0) - decidim-core (= 0.25.2) + decidim-core (= 0.27.6) devise (~> 4.7) devise-i18n (~> 1.2) - devise_invitable (~> 2.0) - decidim-templates (0.25.2) - decidim-core (= 0.25.2) - decidim-forms (= 0.25.2) - decidim-verifications (0.25.2) - decidim-core (= 0.25.2) + devise_invitable (~> 2.0, >= 2.0.9) + decidim-templates (0.27.6) + decidim-core (= 0.27.6) + decidim-forms (= 0.27.6) + decidim-verifications (0.27.6) + decidim-core (= 0.27.6) declarative-builder (0.1.0) declarative-option (< 0.2.0) declarative-option (0.1.0) descendants_tracker (0.0.4) thread_safe (~> 0.3, >= 0.3.1) - devise (4.8.1) + devise (4.9.4) bcrypt (~> 3.0) orm_adapter (~> 0.1) railties (>= 4.1.0) responders warden (~> 1.2.3) - devise-i18n (1.10.2) - devise (>= 4.8.0) - devise_invitable (2.0.6) + devise-i18n (1.12.1) + devise (>= 4.9.0) + devise_invitable (2.0.9) actionmailer (>= 5.0) devise (>= 4.6) - diff-lcs (1.5.0) - diffy (3.4.0) - doc2text (0.4.5) - nokogiri (>= 1.13.2, < 1.14.0) + diff-lcs (1.5.1) + diffy (3.4.2) + doc2text (0.4.7) + nokogiri (>= 1.13.2, < 1.17.0) rubyzip (~> 2.3.0) docile (1.4.0) - domain_name (0.5.20190701) - unf (>= 0.0.5, < 1.0.0) - doorkeeper (5.5.4) + doorkeeper (5.7.1) railties (>= 5) doorkeeper-i18n (4.0.1) dumb_delegator (1.0.0) - equalizer (0.0.11) erb_lint (0.0.37) activesupport better_html (~> 1.0.7) @@ -363,27 +363,29 @@ GEM smart_properties erbse (0.1.4) temple - erubi (1.10.0) - etherpad-lite (0.3.1) - rest-client (>= 1.6) - excon (0.92.3) - execjs (2.8.1) + erubi (1.13.0) + escape_utils (1.3.0) + excon (0.111.0) + execjs (2.9.1) + extended-markdown-filter (0.7.0) + html-pipeline (~> 2.9) factory_bot (4.11.1) activesupport (>= 3.0.0) factory_bot_rails (4.11.1) factory_bot (~> 4.11.1) railties (>= 3.0.0) - faker (2.21.0) + faker (2.23.0) i18n (>= 1.8.11, < 2) - faraday (2.3.0) - faraday-net_http (~> 2.0) - ruby2_keywords (>= 0.0.4) - faraday-net_http (2.0.3) - ffi (1.15.5) - file_validators (2.3.0) + faraday (2.10.0) + faraday-net_http (>= 2.0, < 3.2) + logger + faraday-net_http (3.1.0) + net-http + ffi (1.17.0) + file_validators (3.0.0) activemodel (>= 3.2) mime-types (>= 1.0) - fog-core (2.3.0) + fog-core (2.4.0) builder excon (~> 0.71) formatador (>= 0.2, < 2.0) @@ -396,19 +398,32 @@ GEM activemodel (>= 4.1, < 7.1) activesupport (>= 4.1, < 7.1) railties (>= 4.1, < 7.1) - geocoder (1.8.0) - globalid (1.0.0) - activesupport (>= 5.0) - graphql (1.13.13) - hashdiff (1.0.1) + gemoji (3.0.1) + geocoder (1.8.3) + base64 (>= 0.1.0) + csv (>= 3.0.0) + globalid (1.2.1) + activesupport (>= 6.1) + graphql (1.12.24) + graphql-docs (2.1.0) + commonmarker (~> 0.16) + escape_utils (~> 1.2) + extended-markdown-filter (~> 0.4) + gemoji (~> 3.0) + graphql (~> 1.12) + html-pipeline (~> 2.9) + sass (~> 3.4) + hashdiff (1.1.0) hashie (5.0.0) - highline (2.0.3) - html_tokenizer (0.0.7) + highline (3.1.0) + reline + hkdf (0.3.0) + html-pipeline (2.14.3) + activesupport (>= 2) + nokogiri (>= 1.4) + html_tokenizer (0.0.8) htmlentities (4.3.4) - http-accept (1.7.0) - http-cookie (1.0.5) - domain_name (~> 0.5) - i18n (1.10.0) + i18n (1.14.5) concurrent-ruby (~> 1.0) i18n-tasks (0.9.37) activesupport (>= 4.0.2) @@ -420,7 +435,7 @@ GEM rails-i18n rainbow (>= 2.2.2, < 4.0) terminal-table (>= 1.5.1) - icalendar (2.7.1) + icalendar (2.10.1) ice_cube (~> 0.16) ice_cube (0.16.4) ice_nine (0.11.2) @@ -429,8 +444,10 @@ GEM ruby-vips (>= 2.0.17, < 3) invisible_captcha (0.13.0) rails (>= 3.2.0) - json (2.6.2) - jwt (2.4.1) + io-console (0.7.2) + json (2.7.2) + jwt (2.8.2) + base64 kaminari (1.2.2) activesupport (>= 4.1.0) kaminari-actionview (= 1.2.2) @@ -447,197 +464,212 @@ GEM rexml kramdown-parser-gfm (1.1.0) kramdown (~> 2.0) - launchy (2.5.0) - addressable (~> 2.7) - letter_opener (1.8.1) - launchy (>= 2.2, < 3) + launchy (2.5.2) + addressable (~> 2.8) + letter_opener (1.10.0) + launchy (>= 2.2, < 4) letter_opener_web (1.4.1) actionmailer (>= 3.2) letter_opener (~> 1.0) railties (>= 3.2) - listen (3.7.1) + listen (3.9.0) rb-fsevent (~> 0.10, >= 0.10.3) rb-inotify (~> 0.9, >= 0.9.10) - loofah (2.3.1) + logger (1.6.0) + loofah (2.19.1) crass (~> 1.0.2) nokogiri (>= 1.5.9) - mail (2.7.1) + mail (2.8.1) mini_mime (>= 0.1.1) - marcel (1.0.2) + net-imap + net-pop + net-smtp + marcel (1.0.4) matrix (0.4.2) - mdl (0.11.0) + mdl (0.13.0) kramdown (~> 2.3) kramdown-parser-gfm (~> 1.1) mixlib-cli (~> 2.1, >= 2.1.1) mixlib-config (>= 2.2.1, < 4) mixlib-shellout - method_source (1.0.0) - mime-types (3.4.1) + method_source (1.1.0) + mime-types (3.5.2) mime-types-data (~> 3.2015) - mime-types-data (3.2022.0105) - mini_magick (4.11.0) - mini_mime (1.1.2) - minitest (5.15.0) + mime-types-data (3.2024.0702) + mini_magick (4.13.2) + mini_mime (1.1.5) + minitest (5.24.1) mixlib-cli (2.1.8) - mixlib-config (3.0.9) + mixlib-config (3.0.27) tomlrb - mixlib-shellout (3.2.7) + mixlib-shellout (3.2.8) chef-utils - msgpack (1.5.2) - multi_json (1.15.0) + msgpack (1.7.2) multi_xml (0.6.0) - mustache (1.1.1) - netrc (0.11.0) - nio4r (2.5.8) - nobspw (0.6.2) - nokogiri (1.13.6-x86_64-linux) + net-http (0.4.1) + uri + net-imap (0.4.14) + date + net-protocol + net-pop (0.1.2) + net-protocol + net-protocol (0.2.2) + timeout + net-smtp (0.5.0) + net-protocol + nio4r (2.7.3) + nokogiri (1.16.6-x86_64-linux) racc (~> 1.4) - oauth (0.5.10) - oauth2 (1.4.9) + oauth (1.1.0) + oauth-tty (~> 1.0, >= 1.0.1) + snaky_hash (~> 2.0) + version_gem (~> 1.1) + oauth-tty (1.0.5) + version_gem (~> 1.1, >= 1.1.1) + oauth2 (2.0.9) faraday (>= 0.17.3, < 3.0) jwt (>= 1.0, < 3.0) - multi_json (~> 1.3) multi_xml (~> 0.5) - rack (>= 1.2, < 3) + rack (>= 1.2, < 4) + snaky_hash (~> 2.0) + version_gem (~> 1.1) omniauth (2.0.4) hashie (>= 3.4.6) rack (>= 1.6.2, < 3) rack-protection omniauth-facebook (5.0.0) omniauth-oauth2 (~> 1.2) - omniauth-google-oauth2 (1.0.1) + omniauth-google-oauth2 (1.1.2) jwt (>= 2.0) - oauth2 (~> 1.1) + oauth2 (~> 2.0) omniauth (~> 2.0) - omniauth-oauth2 (~> 1.7.1) + omniauth-oauth2 (~> 1.8) omniauth-idcat_mobil (0.5.0) omniauth (~> 2.0.4) omniauth-oauth2 (>= 1.7.2, < 2.0) omniauth-oauth (1.2.0) oauth omniauth (>= 1.0, < 3) - omniauth-oauth2 (1.7.2) - oauth2 (~> 1.4) - omniauth (>= 1.9, < 3) - omniauth-rails_csrf_protection (1.0.1) + omniauth-oauth2 (1.8.0) + oauth2 (>= 1.4, < 3) + omniauth (~> 2.0) + omniauth-rails_csrf_protection (1.0.2) actionpack (>= 4.2) omniauth (~> 2.0) omniauth-twitter (1.4.0) omniauth-oauth (~> 1.1) rack orm_adapter (0.5.0) - paper_trail (10.3.1) - activerecord (>= 4.2) + paper_trail (12.3.0) + activerecord (>= 5.2) request_store (~> 1.1) - parallel (1.22.1) - parser (3.1.2.0) + parallel (1.25.1) + parallel_tests (3.13.0) + parallel + parser (3.3.4.0) ast (~> 2.4.1) + racc pg (1.1.4) pg_search (2.3.6) activerecord (>= 5.2) activesupport (>= 5.2) - premailer (1.16.0) + premailer (1.23.0) addressable - css_parser (>= 1.6.0) + css_parser (>= 1.12.0) htmlentities (>= 4.0.0) - premailer-rails (1.11.1) + premailer-rails (1.12.0) actionmailer (>= 3) + net-smtp premailer (~> 1.7, >= 1.7.9) - public_suffix (4.0.7) - puma (5.6.4) + public_suffix (6.0.0) + puma (5.6.8) nio4r (~> 2.0) - racc (1.6.0) - rack (2.2.3.1) - rack-attack (6.6.1) - rack (>= 1.0, < 3) + racc (1.8.0) + rack (2.2.9) + rack-attack (6.7.0) + rack (>= 1.0, < 4) rack-cors (1.1.1) rack (>= 2.0.0) - rack-protection (2.2.0) - rack - rack-proxy (0.7.2) + rack-protection (3.2.0) + base64 (>= 0.1.0) + rack (~> 2.2, >= 2.2.4) + rack-proxy (0.7.7) rack - rack-test (1.1.0) - rack (>= 1.0, < 3) - rails (6.0.5) - actioncable (= 6.0.5) - actionmailbox (= 6.0.5) - actionmailer (= 6.0.5) - actionpack (= 6.0.5) - actiontext (= 6.0.5) - actionview (= 6.0.5) - activejob (= 6.0.5) - activemodel (= 6.0.5) - activerecord (= 6.0.5) - activestorage (= 6.0.5) - activesupport (= 6.0.5) - bundler (>= 1.3.0) - railties (= 6.0.5) + rack-test (2.1.0) + rack (>= 1.3) + rails (6.1.7.8) + actioncable (= 6.1.7.8) + actionmailbox (= 6.1.7.8) + actionmailer (= 6.1.7.8) + actionpack (= 6.1.7.8) + actiontext (= 6.1.7.8) + actionview (= 6.1.7.8) + activejob (= 6.1.7.8) + activemodel (= 6.1.7.8) + activerecord (= 6.1.7.8) + activestorage (= 6.1.7.8) + activesupport (= 6.1.7.8) + bundler (>= 1.15.0) + railties (= 6.1.7.8) sprockets-rails (>= 2.0.0) rails-controller-testing (1.0.5) actionpack (>= 5.0.1.rc1) actionview (>= 5.0.1.rc1) activesupport (>= 5.0.1.rc1) - rails-dom-testing (2.0.3) - activesupport (>= 4.2.0) + rails-dom-testing (2.2.0) + activesupport (>= 5.0.0) + minitest nokogiri (>= 1.6) - rails-html-sanitizer (1.4.2) - loofah (~> 2.3) + rails-html-sanitizer (1.5.0) + loofah (~> 2.19, >= 2.19.1) rails-i18n (6.0.0) i18n (>= 0.7, < 2) railties (>= 6.0.0, < 7) - railties (6.0.5) - actionpack (= 6.0.5) - activesupport (= 6.0.5) + railties (6.1.7.8) + actionpack (= 6.1.7.8) + activesupport (= 6.1.7.8) method_source - rake (>= 0.8.7) - thor (>= 0.20.3, < 2.0) + rake (>= 12.2) + thor (~> 1.0) rainbow (3.1.1) - rake (13.0.6) + rake (13.2.1) ransack (2.4.2) activerecord (>= 5.2.4) activesupport (>= 5.2.4) i18n - rb-fsevent (0.11.1) - rb-inotify (0.10.1) + rb-fsevent (0.11.2) + rb-inotify (0.11.1) ffi (~> 1.0) - rectify (0.13.0) - activemodel (>= 4.1.0) - activerecord (>= 4.1.0) - activesupport (>= 4.1.0) - virtus (~> 1.0.5) - wisper (>= 1.6.1) - redcarpet (3.5.1) - redis (4.6.0) - regexp_parser (2.5.0) + redcarpet (3.6.0) + redis (4.8.1) + regexp_parser (2.9.2) + reline (0.5.9) + io-console (~> 0.5) request_store (1.5.1) rack (>= 1.4) - responders (3.0.1) - actionpack (>= 5.0) - railties (>= 5.0) - rest-client (2.1.0) - http-accept (>= 1.7.0, < 2.0) - http-cookie (>= 1.0.2, < 2.0) - mime-types (>= 1.16, < 4.0) - netrc (~> 0.8) - rexml (3.2.5) - rspec (3.11.0) - rspec-core (~> 3.11.0) - rspec-expectations (~> 3.11.0) - rspec-mocks (~> 3.11.0) - rspec-cells (0.3.7) + responders (3.1.1) + actionpack (>= 5.2) + railties (>= 5.2) + rexml (3.3.2) + strscan + rspec (3.13.0) + rspec-core (~> 3.13.0) + rspec-expectations (~> 3.13.0) + rspec-mocks (~> 3.13.0) + rspec-cells (0.3.9) cells (>= 4.0.0, < 6.0.0) - rspec-rails (< 6.0) - rspec-core (3.11.0) - rspec-support (~> 3.11.0) - rspec-expectations (3.11.0) + rspec-rails (>= 3.0.0, < 6.2.0) + rspec-core (3.13.0) + rspec-support (~> 3.13.0) + rspec-expectations (3.13.1) diff-lcs (>= 1.2.0, < 2.0) - rspec-support (~> 3.11.0) + rspec-support (~> 3.13.0) rspec-html-matchers (0.9.4) nokogiri (~> 1) rspec (>= 3.0.0.a, < 4) - rspec-mocks (3.11.1) + rspec-mocks (3.13.1) diff-lcs (>= 1.2.0, < 2.0) - rspec-support (~> 3.11.0) + rspec-support (~> 3.13.0) rspec-rails (4.1.2) actionpack (>= 4.2) activesupport (>= 4.2) @@ -648,88 +680,93 @@ GEM rspec-support (~> 3.10) rspec-retry (0.6.2) rspec-core (> 3.3) - rspec-support (3.11.0) + rspec-support (3.13.1) rspec_junit_formatter (0.3.0) rspec-core (>= 2, < 4, != 2.12.0) - rubocop (0.92.0) + rubocop (1.28.2) parallel (~> 1.10) - parser (>= 2.7.1.5) + parser (>= 3.1.0.0) rainbow (>= 2.2.2, < 4.0) - regexp_parser (>= 1.7) + regexp_parser (>= 1.8, < 3.0) rexml - rubocop-ast (>= 0.5.0) + rubocop-ast (>= 1.17.0, < 2.0) ruby-progressbar (~> 1.7) - unicode-display_width (>= 1.4.0, < 2.0) - rubocop-ast (1.18.0) - parser (>= 3.1.1.0) - rubocop-rails (2.9.1) + unicode-display_width (>= 1.4.0, < 3.0) + rubocop-ast (1.31.3) + parser (>= 3.3.1.0) + rubocop-rails (2.15.2) activesupport (>= 4.2.0) rack (>= 1.1) - rubocop (>= 0.90.0, < 2.0) - rubocop-rspec (1.43.2) - rubocop (~> 0.87) - ruby-progressbar (1.11.0) - ruby-vips (2.1.4) + rubocop (>= 1.7.0, < 2.0) + rubocop-rspec (2.11.1) + rubocop (~> 1.19) + ruby-progressbar (1.13.0) + ruby-vips (2.2.1) ffi (~> 1.12) - ruby2_keywords (0.0.5) - rubyXL (3.4.25) + rubyXL (3.4.27) nokogiri (>= 1.10.8) rubyzip (>= 1.3.0) rubyzip (2.3.2) - searchlight (4.1.0) - selenium-webdriver (3.142.7) - childprocess (>= 0.5, < 4.0) + sass (3.7.4) + sass-listen (~> 4.0.0) + sass-listen (4.0.0) + rb-fsevent (~> 0.9, >= 0.9.4) + rb-inotify (~> 0.9, >= 0.9.7) + selenium-webdriver (4.1.0) + childprocess (>= 0.5, < 5.0) + rexml (~> 3.2, >= 3.2.5) rubyzip (>= 1.2.2) semantic_range (3.0.0) seven_zip_ruby (1.3.0) - simplecov (0.19.1) + simplecov (0.21.2) docile (~> 1.1) simplecov-html (~> 0.11) - simplecov-cobertura (1.3.1) - simplecov (~> 0.8) + simplecov_json_formatter (~> 0.1) + simplecov-cobertura (2.1.0) + rexml + simplecov (~> 0.19) simplecov-html (0.12.3) + simplecov_json_formatter (0.1.4) smart_properties (1.17.0) + snaky_hash (2.0.1) + hashie + version_gem (~> 1.1, >= 1.1.1) social-share-button (1.2.4) coffee-rails spring (2.1.1) spring-watcher-listen (2.0.1) listen (>= 2.7, < 4.0) spring (>= 1.2, < 3.0) - sprockets (4.0.3) + sprockets (4.2.1) concurrent-ruby (~> 1.0) - rack (> 1, < 3) - sprockets-rails (3.4.2) - actionpack (>= 5.2) - activesupport (>= 5.2) + rack (>= 2.2.4, < 4) + sprockets-rails (3.5.1) + actionpack (>= 6.1) + activesupport (>= 6.1) sprockets (>= 3.0.0) - ssrf_filter (1.0.7) - system_test_html_screenshots (0.2.0) - actionpack (>= 5.2, < 6.1.a) - temple (0.8.2) + ssrf_filter (1.1.2) + strscan (3.1.0) + temple (0.10.3) terminal-table (3.0.2) unicode-display_width (>= 1.1.1, < 3) - thor (1.2.1) + thor (1.3.1) thread_safe (0.3.6) - tilt (2.0.10) + tilt (2.4.0) + timeout (0.4.1) tomlrb (2.0.3) - truncato (0.7.11) - htmlentities (~> 4.3.1) - nokogiri (>= 1.7.0, <= 2.0) - tzinfo (1.2.9) - thread_safe (~> 0.1) + tzinfo (2.0.6) + concurrent-ruby (~> 1.0) uber (0.1.0) - unf (0.1.4) - unf_ext - unf_ext (0.0.8.2) - unicode-display_width (1.8.0) + unicode-display_width (2.5.0) + uri (0.13.0) valid_email2 (2.3.1) activemodel (>= 3.2) mail (~> 2.5) - virtus (1.0.5) + version_gem (1.1.4) + virtus (2.0.0) axiom-types (~> 0.1) coercible (~> 1.0) descendants_tracker (~> 0.0, >= 0.0.3) - equalizer (~> 0.0, >= 0.0.9) w3c_rspec_validators (0.3.0) rails rspec @@ -745,7 +782,7 @@ GEM activemodel (>= 5.0) bindex (>= 0.4.0) railties (>= 5.0) - webmock (3.14.0) + webmock (3.23.1) addressable (>= 2.8.0) crack (>= 0.3.2) hashdiff (>= 0.4.0, < 2.0.0) @@ -754,17 +791,20 @@ GEM rack-proxy (>= 0.6.1) railties (>= 5.2) semantic_range (>= 2.3.0) - websocket-driver (0.7.5) + webpush (1.1.0) + hkdf (~> 0.2) + jwt (~> 2.0) + websocket-driver (0.7.6) websocket-extensions (>= 0.1.0) websocket-extensions (0.1.5) - wicked_pdf (2.6.3) + wicked_pdf (2.8.0) activesupport wisper (2.0.1) wisper-rspec (1.1.0) - wkhtmltopdf-binary (0.12.6.5) + wkhtmltopdf-binary (0.12.6.7) xpath (3.2.0) nokogiri (~> 1.8) - zeitwerk (2.5.4) + zeitwerk (2.6.16) PLATFORMS x86_64-linux @@ -772,8 +812,8 @@ PLATFORMS DEPENDENCIES bootsnap byebug - decidim (~> 0.25.2) - decidim-dev (~> 0.25.2) + decidim + decidim-dev decidim-idcat_mobil! faker (~> 2.19) letter_opener_web (~> 1.3) @@ -786,7 +826,7 @@ DEPENDENCIES web-console (~> 3.5) RUBY VERSION - ruby 2.7.7p221 + ruby 3.0.7p220 BUNDLED WITH - 2.4.9 + 2.3.4 diff --git a/decidim-idcat_mobil.gemspec b/decidim-idcat_mobil.gemspec index b879ce7..2164bb3 100644 --- a/decidim-idcat_mobil.gemspec +++ b/decidim-idcat_mobil.gemspec @@ -11,7 +11,7 @@ Gem::Specification.new do |s| s.email = ["oliver.vh@coditramuntana.com"] s.license = "AGPL-3.0" s.homepage = "https://github.com/decidim/decidim-idcat_mobil" - s.required_ruby_version = ">= 2.7.5" + s.required_ruby_version = ">= 3.0.6" s.name = "decidim-idcat_mobil" s.summary = "A decidim idcat_mobil module" diff --git a/lib/decidim/idcat_mobil/version.rb b/lib/decidim/idcat_mobil/version.rb index c2cd837..f222d02 100644 --- a/lib/decidim/idcat_mobil/version.rb +++ b/lib/decidim/idcat_mobil/version.rb @@ -4,11 +4,11 @@ module Decidim module IdcatMobil def self.version # See CHANGELOG.md to see what changed - "0.3.0" + "0.4.0" end def self.decidim_version - "0.25.2" + "0.27.0" end end end diff --git a/spec/jobs/decidim/idcat_mobil/verification_job_spec.rb b/spec/jobs/decidim/idcat_mobil/verification_job_spec.rb index 2f453fe..74d4861 100644 --- a/spec/jobs/decidim/idcat_mobil/verification_job_spec.rb +++ b/spec/jobs/decidim/idcat_mobil/verification_job_spec.rb @@ -27,15 +27,15 @@ def pending_to_be_finished end # rubocop: disable Lint/ConstantDefinitionInBlock - class TestRectifyPublisher < Rectify::Command + class TestDecidimPublisher < Decidim::Command include Wisper::Publisher # rubocop: disable Lint/MissingSuper def initialize(*args); end # rubocop: enable Lint/MissingSuper end # rubocop: enable Lint/ConstantDefinitionInBlock - def stub_rectify_publisher(clazz, called_method, event_to_publish, *published_event_args) - stub_const(clazz, Class.new(TestRectifyPublisher) do + def stub_decidim_publisher(clazz, called_method, event_to_publish, *published_event_args) + stub_const(clazz, Class.new(TestDecidimPublisher) do define_method(called_method) do |*_args| publish(event_to_publish, *published_event_args) end @@ -46,7 +46,7 @@ def stub_rectify_publisher(clazz, called_method, event_to_publish, *published_ev context "when authorization is created with success" do it "notifies the user for the success" do pending_to_be_finished - stub_rectify_publisher("Decidim::Verifications::AuthorizeUser", :call, :ok) + stub_decidim_publisher("Decidim::Verifications::AuthorizeUser", :call, :ok) expect(Decidim::EventsManager) .to receive(:publish) .with( @@ -66,7 +66,7 @@ def stub_rectify_publisher(clazz, called_method, event_to_publish, *published_ev context "when authorization creation fails" do it "notifies the user for the failure" do pending_to_be_finished - stub_rectify_publisher("Decidim::Verifications::AuthorizeUser", :call, :invalid) + stub_decidim_publisher("Decidim::Verifications::AuthorizeUser", :call, :invalid) expect(Decidim::EventsManager) .to receive(:publish) .with( From 1075145155f5325007f4176e841dcf78e3644d1f Mon Sep 17 00:00:00 2001 From: Laura Jaime Date: Tue, 16 Jul 2024 17:09:23 +0200 Subject: [PATCH 2/3] Rubocopify --- config/initializers/omniauth_idcat_mobil.rb | 6 +++--- decidim-idcat_mobil.gemspec | 1 + spec/jobs/decidim/idcat_mobil/verification_job_spec.rb | 1 + 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/config/initializers/omniauth_idcat_mobil.rb b/config/initializers/omniauth_idcat_mobil.rb index 22ad38c..5daa22b 100644 --- a/config/initializers/omniauth_idcat_mobil.rb +++ b/config/initializers/omniauth_idcat_mobil.rb @@ -10,9 +10,9 @@ request = Rack::Request.new(env) organization = Decidim::Organization.find_by(host: request.host) provider_config = organization.enabled_omniauth_providers[:idcat_mobil] - env["omniauth.strategy"].options[:client_id] = provider_config[:client_id] || ENV["IDCAT_MOBIL_CLIENT_ID"] - env["omniauth.strategy"].options[:client_secret] = provider_config[:client_secret] || ENV["IDCAT_MOBIL_CLIENT_SECRET"] - env["omniauth.strategy"].options[:site] = provider_config[:site_url] || ENV["IDCAT_MOBIL_SITE_URL"] + env["omniauth.strategy"].options[:client_id] = provider_config[:client_id] || ENV.fetch("IDCAT_MOBIL_CLIENT_ID", nil) + env["omniauth.strategy"].options[:client_secret] = provider_config[:client_secret] || ENV.fetch("IDCAT_MOBIL_CLIENT_SECRET", nil) + env["omniauth.strategy"].options[:site] = provider_config[:site_url] || ENV.fetch("IDCAT_MOBIL_SITE_URL", nil) }, scope: :autenticacio_usuari ) diff --git a/decidim-idcat_mobil.gemspec b/decidim-idcat_mobil.gemspec index 2164bb3..4f3a757 100644 --- a/decidim-idcat_mobil.gemspec +++ b/decidim-idcat_mobil.gemspec @@ -23,4 +23,5 @@ Gem::Specification.new do |s| s.add_dependency "decidim-core", DECIDIM_IDCAT_MOBIL_DECIDIM_VERSION s.add_dependency "omniauth-idcat_mobil", "~> 0.5.0" s.add_development_dependency "decidim-dev", DECIDIM_IDCAT_MOBIL_DECIDIM_VERSION + s.metadata["rubygems_mfa_required"] = "true" end diff --git a/spec/jobs/decidim/idcat_mobil/verification_job_spec.rb b/spec/jobs/decidim/idcat_mobil/verification_job_spec.rb index 74d4861..6c286c2 100644 --- a/spec/jobs/decidim/idcat_mobil/verification_job_spec.rb +++ b/spec/jobs/decidim/idcat_mobil/verification_job_spec.rb @@ -33,6 +33,7 @@ class TestDecidimPublisher < Decidim::Command def initialize(*args); end # rubocop: enable Lint/MissingSuper end + # rubocop: enable Lint/ConstantDefinitionInBlock def stub_decidim_publisher(clazz, called_method, event_to_publish, *published_event_args) stub_const(clazz, Class.new(TestDecidimPublisher) do From 406054a9ed7b83d4c6e542661e0b2200b064fe32 Mon Sep 17 00:00:00 2001 From: Laura Jaime Date: Tue, 16 Jul 2024 17:10:08 +0200 Subject: [PATCH 3/3] Update Ruby version in CI --- .github/workflows/linters.yml | 2 +- .github/workflows/test.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/linters.yml b/.github/workflows/linters.yml index a35f702..dbaf88d 100644 --- a/.github/workflows/linters.yml +++ b/.github/workflows/linters.yml @@ -9,7 +9,7 @@ on: pull_request: env: - RUBY_VERSION: 2.7.7 + RUBY_VERSION: 3.0.7 jobs: test-report: diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 2e2a972..628a4b7 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -9,7 +9,7 @@ on: pull_request: env: - RUBY_VERSION: 2.7.7 + RUBY_VERSION: 3.0.7 jobs: test-module: