From b44a42d7f8ddc32046b815cf24ca45ccfa42ec42 Mon Sep 17 00:00:00 2001 From: Armand Fardeau Date: Fri, 20 May 2022 16:53:08 +0200 Subject: [PATCH] Bump decidim (#9) * Bump decidim * Fix i18n spec * Fix authentication * Remove useless files --- Gemfile.lock | 685 ++++++++---------- ...ographic_authorization_handler_manifest.js | 0 .../icon.svg | 1 - .../application_helper.rb | 10 - .../application_record.rb | 10 - .../version.rb | 4 +- spec/i18n_spec.rb | 4 +- spec/system/authentication_spec.rb | 17 + 8 files changed, 332 insertions(+), 399 deletions(-) delete mode 100644 app/assets/config/decidim_socio_demographic_authorization_handler_manifest.js delete mode 100644 app/assets/images/decidim/socio_demographic_authorization_handler/icon.svg delete mode 100644 app/helpers/decidim/socio_demographic_authorization_handler/application_helper.rb delete mode 100644 app/models/decidim/socio_demographic_authorization_handler/application_record.rb diff --git a/Gemfile.lock b/Gemfile.lock index f97e8d8..a961191 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,78 +1,66 @@ GIT remote: https://github.com/decidim/decidim - revision: 44fb937b3aee7022ab135b383e1c138c57a2a90f - branch: release/0.24-stable + revision: 5455ffe38454a22a8feccbafda7ecf1e1ace652b + branch: release/0.25-stable specs: - decidim (0.24.3) - decidim-accountability (= 0.24.3) - decidim-admin (= 0.24.3) - decidim-api (= 0.24.3) - decidim-assemblies (= 0.24.3) - decidim-blogs (= 0.24.3) - decidim-budgets (= 0.24.3) - decidim-comments (= 0.24.3) - decidim-core (= 0.24.3) - decidim-debates (= 0.24.3) - decidim-forms (= 0.24.3) - decidim-generators (= 0.24.3) - decidim-meetings (= 0.24.3) - decidim-pages (= 0.24.3) - decidim-participatory_processes (= 0.24.3) - decidim-proposals (= 0.24.3) - decidim-sortitions (= 0.24.3) - decidim-surveys (= 0.24.3) - decidim-system (= 0.24.3) - decidim-templates (= 0.24.3) - decidim-verifications (= 0.24.3) - decidim-accountability (0.24.3) - decidim-comments (= 0.24.3) - decidim-core (= 0.24.3) - kaminari (~> 1.2, >= 1.2.1) - searchlight (~> 4.1) - decidim-admin (0.24.3) + 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) active_link_to (~> 1.0) - decidim-core (= 0.24.3) + decidim-core (= 0.25.2) devise (~> 4.7) devise-i18n (~> 1.2) - devise_invitable (~> 1.7) - jquery-rails (~> 4.4) - sassc (~> 2.4.0) - sassc-rails (~> 2.1.2) - decidim-api (0.24.3) - graphiql-rails (~> 1.4, < 1.5) + devise_invitable (~> 2.0) + decidim-api (0.25.2) graphql (~> 1.12, >= 1.12.3) rack-cors (~> 1.0) redcarpet (~> 3.5, >= 3.5.1) - sprockets-es6 (~> 0.9.2) - decidim-assemblies (0.24.3) - decidim-core (= 0.24.3) - decidim-blogs (0.24.3) - decidim-admin (= 0.24.3) - decidim-comments (= 0.24.3) - decidim-core (= 0.24.3) - jquery-tmpl-rails (~> 1.1) - kaminari (~> 1.2, >= 1.2.1) - decidim-budgets (0.24.3) - decidim-comments (= 0.24.3) - decidim-core (= 0.24.3) - kaminari (~> 1.2, >= 1.2.1) - searchlight (~> 4.1) - decidim-comments (0.24.3) - decidim-core (= 0.24.3) - jquery-rails (~> 4.4) + 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.24.3) + decidim-core (0.25.2) active_link_to (~> 1.0) + acts_as_list (~> 0.9) anchored (~> 1.1) - autoprefixer-rails (~> 8.0) batch-loader (~> 1.2) browser (~> 2.7) carrierwave (~> 2.2.1) cells-erb (~> 0.1.0) - cells-rails (~> 0.0.9) + cells-rails (~> 0.1.3) charlock_holmes (~> 0.7) date_validator (~> 0.9.0) - decidim-api (= 0.24.3) + decidim-api (= 0.25.2) devise (~> 4.7) devise-i18n (~> 1.2) diffy (~> 3.3) @@ -81,21 +69,19 @@ GIT etherpad-lite (~> 0.3) file_validators (~> 2.1) fog-local (~> 0.6) - foundation-rails (~> 6.6, < 6.7) - foundation_rails_helper (~> 3.0) + foundation_rails_helper geocoder (~> 1.5) hashdiff (>= 0.4.0, < 2.0.0) invisible_captcha (~> 0.12) - jquery-rails (~> 4.4) kaminari (~> 1.2, >= 1.2.1) loofah (~> 2.3.1) mini_magick (~> 4.9) mustache (~> 1.1.0) nobspw (~> 0.6.0) - omniauth (~> 1.9) + omniauth (~> 2.0) omniauth-facebook (~> 5.0) - omniauth-google-oauth2 (~> 0.7) - omniauth-rails_csrf_protection (~> 0.1) + omniauth-google-oauth2 (~> 1.0) + omniauth-rails_csrf_protection (~> 1.0) omniauth-twitter (~> 1.4) paper_trail (~> 10.3) pg (~> 1.1.4, < 2) @@ -103,181 +89,178 @@ GIT premailer-rails (~> 1.10) rack (~> 2.2, >= 2.2.3) rack-attack (~> 6.0) - rails (~> 5.2.6) - rails-i18n (~> 5.0) + rails (~> 6.0.4) + 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) - sassc (~> 2.4.0) - sassc-rails (~> 2.1.2) + searchlight (~> 4.1) seven_zip_ruby (~> 1.3) social-share-button (~> 1.2, >= 1.2.1) - spreadsheet (~> 1.2) - sprockets (~> 3.7, < 4) - sprockets-es6 (~> 0.9.2) truncato (~> 0.7) - uglifier (~> 4.1) valid_email2 (~> 2.1) + webpacker (= 6.0.0.rc.5) wisper (~> 2.0) - decidim-debates (0.24.3) - decidim-comments (= 0.24.3) - decidim-core (= 0.24.3) - kaminari (~> 1.2, >= 1.2.1) - searchlight (~> 4.1) - decidim-dev (0.24.3) + decidim-debates (0.25.2) + decidim-comments (= 0.25.2) + decidim-core (= 0.25.2) + decidim-dev (0.25.2) + axe-core-rspec (~> 4.1.0) byebug (~> 11.0) capybara (~> 3.24) - db-query-matchers (~> 0.9.0) - decidim (= 0.24.3) - erb_lint (~> 0.0.28) + db-query-matchers (~> 0.10.0) + decidim (= 0.25.2) + erb_lint (~> 0.0.35) factory_bot_rails (~> 4.8) i18n-tasks (~> 0.9.18) mdl (~> 0.5) nokogiri (~> 1.11, >= 1.11.4) - puffing-billy (~> 2.4.0) puma (~> 5.0) rails-controller-testing (~> 1.0) rspec-cells (~> 0.3.4) rspec-html-matchers (~> 0.9.1) - rspec-rails (~> 3.7) + rspec-rails (~> 4.0) rspec-retry (~> 0.6.2) rspec_junit_formatter (~> 0.3.0) rubocop (~> 0.92.0) - rubocop-rails (~> 2.0) - rubocop-rspec (~> 1.21) + 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.1.1) - vcr (~> 6.0) + system_test_html_screenshots (~> 0.2) + w3c_rspec_validators (~> 0.3.0) webmock (~> 3.6) wisper-rspec (~> 1.0) - decidim-forms (0.24.3) - decidim-core (= 0.24.3) - wicked_pdf (~> 1.4) + decidim-forms (0.25.2) + decidim-core (= 0.25.2) + wicked_pdf (~> 2.1) wkhtmltopdf-binary (~> 0.12) - decidim-generators (0.24.3) - decidim-core (= 0.24.3) - decidim-meetings (0.24.3) - cells-erb (~> 0.1.0) - cells-rails (~> 0.0.9) - decidim-core (= 0.24.3) - decidim-forms (= 0.24.3) + 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) icalendar (~> 2.5) - jquery-tmpl-rails (~> 1.1) - kaminari (~> 1.2, >= 1.2.1) - searchlight (~> 4.1) - decidim-pages (0.24.3) - decidim-core (= 0.24.3) - decidim-participatory_processes (0.24.3) - decidim-core (= 0.24.3) - decidim-proposals (0.24.3) - acts_as_list (~> 0.9) - cells-erb (~> 0.1.0) - cells-rails (~> 0.0.9) - decidim-comments (= 0.24.3) - decidim-core (= 0.24.3) + 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) - kaminari (~> 1.2, >= 1.2.1) - ransack (~> 2.1.1) redcarpet (~> 3.5, >= 3.5.1) - decidim-sortitions (0.24.3) - decidim-admin (= 0.24.3) - decidim-comments (= 0.24.3) - decidim-core (= 0.24.3) - decidim-proposals (= 0.24.3) - decidim-surveys (0.24.3) - decidim-core (= 0.24.3) - decidim-forms (= 0.24.3) - decidim-templates (= 0.24.3) - decidim-system (0.24.3) + 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) active_link_to (~> 1.0) - decidim-core (= 0.24.3) + decidim-core (= 0.25.2) devise (~> 4.7) devise-i18n (~> 1.2) - devise_invitable (~> 1.7) - jquery-rails (~> 4.4) - sassc (~> 2.4.0) - sassc-rails (~> 2.1.2) - decidim-templates (0.24.3) - decidim-core (= 0.24.3) - decidim-forms (= 0.24.3) - decidim-verifications (0.24.3) - decidim-core (= 0.24.3) + 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) PATH remote: . specs: - decidim-socio_demographic_authorization_handler (0.24.3) - decidim-core (= 0.24.3) + decidim-socio_demographic_authorization_handler (0.25.2) + decidim-core (= 0.25.2) GEM remote: https://rubygems.org/ specs: - actioncable (5.2.6) - actionpack (= 5.2.6) + actioncable (6.0.5) + actionpack (= 6.0.5) nio4r (~> 2.0) websocket-driver (>= 0.6.1) - actionmailer (5.2.6) - actionpack (= 5.2.6) - actionview (= 5.2.6) - activejob (= 5.2.6) + actionmailbox (6.0.5) + actionpack (= 6.0.5) + activejob (= 6.0.5) + activerecord (= 6.0.5) + activestorage (= 6.0.5) + activesupport (= 6.0.5) + mail (>= 2.7.1) + actionmailer (6.0.5) + actionpack (= 6.0.5) + actionview (= 6.0.5) + activejob (= 6.0.5) mail (~> 2.5, >= 2.5.4) rails-dom-testing (~> 2.0) - actionpack (5.2.6) - actionview (= 5.2.6) - activesupport (= 5.2.6) + actionpack (6.0.5) + actionview (= 6.0.5) + activesupport (= 6.0.5) rack (~> 2.0, >= 2.0.8) rack-test (>= 0.6.3) rails-dom-testing (~> 2.0) - rails-html-sanitizer (~> 1.0, >= 1.0.2) - actionview (5.2.6) - activesupport (= 5.2.6) + 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) + nokogiri (>= 1.8.5) + actionview (6.0.5) + activesupport (= 6.0.5) builder (~> 3.1) erubi (~> 1.4) rails-dom-testing (~> 2.0) - rails-html-sanitizer (~> 1.0, >= 1.0.3) + rails-html-sanitizer (~> 1.1, >= 1.2.0) active_link_to (1.0.5) actionpack addressable - activejob (5.2.6) - activesupport (= 5.2.6) + activejob (6.0.5) + activesupport (= 6.0.5) globalid (>= 0.3.6) - activemodel (5.2.6) - activesupport (= 5.2.6) - activerecord (5.2.6) - activemodel (= 5.2.6) - activesupport (= 5.2.6) - arel (>= 9.0) - activestorage (5.2.6) - actionpack (= 5.2.6) - activerecord (= 5.2.6) - marcel (~> 1.0.0) - activesupport (5.2.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) + marcel (~> 1.0) + activesupport (6.0.5) concurrent-ruby (~> 1.0, >= 1.0.2) i18n (>= 0.7, < 2) minitest (~> 5.1) tzinfo (~> 1.1) + zeitwerk (~> 2.2, >= 2.2.2) acts_as_list (0.9.19) activerecord (>= 3.0) addressable (2.8.0) public_suffix (>= 2.0.2, < 5.0) anchored (1.1.0) - arel (9.0.0) ast (2.4.2) - autoprefixer-rails (8.6.5) - execjs + axe-core-api (4.4.0) + dumb_delegator + virtus + axe-core-rspec (4.1.0) + axe-core-api + dumb_delegator + virtus axiom-types (0.1.1) descendants_tracker (~> 0.0.4) ice_nine (~> 0.11.0) thread_safe (~> 0.3, >= 0.3.1) - babel-source (5.8.35) - babel-transpiler (0.7.0) - babel-source (>= 4.0, < 6) - execjs (~> 2.0) batch-loader (1.5.0) - bcrypt (3.1.16) + bcrypt (3.1.18) better_html (1.0.16) actionview (>= 4.0) activesupport (>= 4.0) @@ -287,12 +270,12 @@ GEM parser (>= 2.4) smart_properties bindex (0.8.1) - bootsnap (1.8.1) - msgpack (~> 1.0) + bootsnap (1.11.1) + msgpack (~> 1.2) browser (2.7.1) builder (3.2.4) byebug (11.1.3) - capybara (3.36.0) + capybara (3.37.1) addressable matrix mini_mime (>= 0.1.3) @@ -317,11 +300,11 @@ GEM cells-erb (0.1.0) cells (~> 4.0) erbse (>= 0.1.1) - cells-rails (0.0.9) - actionpack (>= 3.0) + cells-rails (0.1.5) + actionpack (>= 5.0) cells (>= 4.1.6, < 5.0.0) charlock_holmes (0.7.7) - chef-utils (17.7.29) + chef-utils (17.10.0) concurrent-ruby childprocess (3.0.0) coercible (1.0.0) @@ -334,38 +317,37 @@ GEM execjs coffee-script-source (1.12.2) concurrent-ruby (1.1.10) - cookiejar (0.3.3) crack (0.4.5) rexml crass (1.0.6) - css_parser (1.10.0) + css_parser (1.11.0) addressable date_validator (0.9.0) activemodel activesupport - db-query-matchers (0.9.0) - activesupport (>= 4.0, <= 6.0) + db-query-matchers (0.10.0) + activesupport (>= 4.0, < 7) rspec (~> 3.0) 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.0) + devise (4.8.1) bcrypt (~> 3.0) orm_adapter (~> 0.1) railties (>= 4.1.0) responders warden (~> 1.2.3) - devise-i18n (1.10.1) + devise-i18n (1.10.2) devise (>= 4.8.0) - devise_invitable (1.7.5) - actionmailer (>= 4.1.0) - devise (>= 4.0.0) - diff-lcs (1.4.4) + devise_invitable (2.0.6) + actionmailer (>= 5.0) + devise (>= 4.6) + diff-lcs (1.5.0) diffy (3.4.0) - doc2text (0.4.3) - nokogiri (~> 1.11.1) + doc2text (0.4.5) + nokogiri (>= 1.13.2, < 1.14.0) rubyzip (~> 2.3.0) docile (1.4.0) domain_name (0.5.20190701) @@ -373,16 +355,7 @@ GEM doorkeeper (5.5.4) railties (>= 5) doorkeeper-i18n (4.0.1) - em-http-request (1.1.7) - addressable (>= 2.3.4) - cookiejar (!= 0.3.1) - em-socksify (>= 0.3) - eventmachine (>= 1.0.3) - http_parser.rb (>= 0.6.0) - em-socksify (0.3.2) - eventmachine (>= 1.0.0.beta.4) - em-synchrony (1.0.6) - eventmachine (>= 1.0.0.beta.1) + dumb_delegator (1.0.0) equalizer (0.0.11) erb_lint (0.0.37) activesupport @@ -395,11 +368,9 @@ GEM erbse (0.1.4) temple erubi (1.10.0) - etherpad-lite (0.3.0) + etherpad-lite (0.3.1) rest-client (>= 1.6) - eventmachine (1.2.7) - eventmachine_httpserver (0.2.1) - excon (0.88.0) + excon (0.92.3) execjs (2.8.1) factory_bot (4.11.1) activesupport (>= 3.0.0) @@ -408,54 +379,31 @@ GEM railties (>= 3.0.0) faker (2.21.0) i18n (>= 1.8.11, < 2) - faraday (1.8.0) - faraday-em_http (~> 1.0) - faraday-em_synchrony (~> 1.0) - faraday-excon (~> 1.1) - faraday-httpclient (~> 1.0.1) - faraday-net_http (~> 1.0) - faraday-net_http_persistent (~> 1.1) - faraday-patron (~> 1.0) - faraday-rack (~> 1.0) - multipart-post (>= 1.2, < 3) + faraday (2.3.0) + faraday-net_http (~> 2.0) ruby2_keywords (>= 0.0.4) - faraday-em_http (1.0.0) - faraday-em_synchrony (1.0.0) - faraday-excon (1.1.0) - faraday-httpclient (1.0.1) - faraday-net_http (1.0.1) - faraday-net_http_persistent (1.2.0) - faraday-patron (1.0.0) - faraday-rack (1.0.0) - ffi (1.15.3) + faraday-net_http (2.0.3) + ffi (1.15.5) file_validators (2.3.0) activemodel (>= 3.2) mime-types (>= 1.0) - fog-core (2.2.4) + fog-core (2.3.0) builder excon (~> 0.71) - formatador (~> 0.2) + formatador (>= 0.2, < 2.0) mime-types - fog-local (0.7.0) + fog-local (0.8.0) fog-core (>= 1.27, < 3.0) - formatador (0.3.0) - foundation-rails (6.6.2.0) - railties (>= 3.1.0) - sass (>= 3.3.0) - sprockets-es6 (>= 0.9.0) - foundation_rails_helper (3.0.0) - actionpack (>= 4.1, < 6.0) - activemodel (>= 4.1, < 6.0) - activesupport (>= 4.1, < 6.0) - railties (>= 4.1, < 6.0) - tzinfo (~> 1.2, >= 1.2.2) - geocoder (1.7.0) - globalid (0.5.2) + formatador (1.1.0) + foundation_rails_helper (4.0.1) + actionpack (>= 4.1, < 7.1) + 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) - graphiql-rails (1.4.11) - railties - sprockets-rails - graphql (1.13.0) + graphql (1.13.12) hashdiff (1.0.1) hashie (5.0.0) highline (2.0.3) @@ -464,10 +412,9 @@ GEM http-accept (1.7.0) http-cookie (1.0.4) domain_name (~> 0.5) - http_parser.rb (0.6.0) i18n (1.10.0) concurrent-ruby (~> 1.0) - i18n-tasks (0.9.35) + i18n-tasks (0.9.37) activesupport (>= 4.0.2) ast (>= 2.1.0) erubi @@ -481,43 +428,38 @@ GEM ice_cube (~> 0.16) ice_cube (0.16.4) ice_nine (0.11.2) - image_processing (1.12.1) + image_processing (1.12.2) mini_magick (>= 4.9.5, < 5) ruby-vips (>= 2.0.17, < 3) invisible_captcha (0.13.0) rails (>= 3.2.0) - jquery-rails (4.4.0) - rails-dom-testing (>= 1, < 3) - railties (>= 4.2.0) - thor (>= 0.14, < 2.0) - jquery-tmpl-rails (1.1.0) - rails (>= 3.1.0) + json (2.6.2) jwt (2.3.0) - kaminari (1.2.1) + kaminari (1.2.2) activesupport (>= 4.1.0) - kaminari-actionview (= 1.2.1) - kaminari-activerecord (= 1.2.1) - kaminari-core (= 1.2.1) - kaminari-actionview (1.2.1) + kaminari-actionview (= 1.2.2) + kaminari-activerecord (= 1.2.2) + kaminari-core (= 1.2.2) + kaminari-actionview (1.2.2) actionview - kaminari-core (= 1.2.1) - kaminari-activerecord (1.2.1) + kaminari-core (= 1.2.2) + kaminari-activerecord (1.2.2) activerecord - kaminari-core (= 1.2.1) - kaminari-core (1.2.1) - kramdown (2.3.1) + kaminari-core (= 1.2.2) + kaminari-core (1.2.2) + kramdown (2.4.0) rexml kramdown-parser-gfm (1.1.0) kramdown (~> 2.0) launchy (2.5.0) addressable (~> 2.7) - letter_opener (1.7.0) - launchy (~> 2.2) - letter_opener_web (1.4.0) + letter_opener (1.8.1) + launchy (>= 2.2, < 3) + letter_opener_web (1.4.1) actionmailer (>= 3.2) letter_opener (~> 1.0) railties (>= 3.2) - listen (3.7.0) + listen (3.7.1) rb-fsevent (~> 0.10, >= 0.10.3) rb-inotify (~> 0.9, >= 0.9.10) loofah (2.3.1) @@ -536,55 +478,55 @@ GEM method_source (1.0.0) mime-types (3.4.1) mime-types-data (~> 3.2015) - mime-types-data (3.2021.1115) + mime-types-data (3.2022.0105) mini_magick (4.11.0) - mini_mime (1.1.1) - mini_portile2 (2.5.3) - minitest (5.14.4) + mini_mime (1.1.2) + mini_portile2 (2.8.0) + minitest (5.15.0) mixlib-cli (2.1.8) mixlib-config (3.0.9) tomlrb - mixlib-shellout (3.2.5) + mixlib-shellout (3.2.7) chef-utils - msgpack (1.4.2) + msgpack (1.5.1) multi_json (1.15.0) multi_xml (0.6.0) - multipart-post (2.1.1) mustache (1.1.1) netrc (0.11.0) nio4r (2.5.8) nobspw (0.6.2) - nokogiri (1.11.7) - mini_portile2 (~> 2.5.0) + nokogiri (1.13.6) + mini_portile2 (~> 2.8.0) racc (~> 1.4) - nokogiri (1.11.7-x86_64-darwin) + nokogiri (1.13.6-x86_64-darwin) racc (~> 1.4) - oauth (0.5.8) - oauth2 (1.4.7) - faraday (>= 0.8, < 2.0) + oauth (0.5.10) + oauth2 (1.4.9) + faraday (>= 0.17.3, < 3.0) jwt (>= 1.0, < 3.0) multi_json (~> 1.3) multi_xml (~> 0.5) rack (>= 1.2, < 3) - omniauth (1.9.1) + omniauth (2.1.0) hashie (>= 3.4.6) - rack (>= 1.6.2, < 3) + rack (>= 2.2.3) + rack-protection omniauth-facebook (5.0.0) omniauth-oauth2 (~> 1.2) - omniauth-google-oauth2 (0.8.2) + omniauth-google-oauth2 (1.0.1) jwt (>= 2.0) oauth2 (~> 1.1) - omniauth (~> 1.1) - omniauth-oauth2 (>= 1.6) + omniauth (~> 2.0) + omniauth-oauth2 (~> 1.7.1) 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 (0.1.2) + omniauth-rails_csrf_protection (1.0.1) actionpack (>= 4.2) - omniauth (>= 1.3.1) + omniauth (~> 2.0) omniauth-twitter (1.4.0) omniauth-oauth (~> 1.1) rack @@ -592,51 +534,49 @@ GEM paper_trail (10.3.1) activerecord (>= 4.2) request_store (~> 1.1) - parallel (1.21.0) - parser (3.0.3.1) + parallel (1.22.1) + parser (3.1.2.0) ast (~> 2.4.1) pg (1.1.4) - pg_search (2.3.5) + pg_search (2.3.6) activerecord (>= 5.2) activesupport (>= 5.2) - premailer (1.15.0) + premailer (1.16.0) addressable css_parser (>= 1.6.0) htmlentities (>= 4.0.0) premailer-rails (1.11.1) actionmailer (>= 3) premailer (~> 1.7, >= 1.7.9) - public_suffix (4.0.6) - puffing-billy (2.4.1) - addressable (~> 2.5) - em-http-request (~> 1.1, >= 1.1.0) - em-synchrony - eventmachine (~> 1.2) - eventmachine_httpserver - http_parser.rb (~> 0.6.0) - multi_json - puma (5.5.2) + public_suffix (4.0.7) + puma (5.6.4) nio4r (~> 2.0) - racc (1.5.2) + racc (1.6.0) rack (2.2.3) - rack-attack (6.5.0) + rack-attack (6.6.1) rack (>= 1.0, < 3) rack-cors (1.1.1) rack (>= 2.0.0) + rack-protection (2.2.0) + rack + rack-proxy (0.7.2) + rack rack-test (1.1.0) rack (>= 1.0, < 3) - rails (5.2.6) - actioncable (= 5.2.6) - actionmailer (= 5.2.6) - actionpack (= 5.2.6) - actionview (= 5.2.6) - activejob (= 5.2.6) - activemodel (= 5.2.6) - activerecord (= 5.2.6) - activestorage (= 5.2.6) - activesupport (= 5.2.6) + 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 (= 5.2.6) + railties (= 6.0.5) sprockets-rails (>= 2.0.0) rails-controller-testing (1.0.5) actionpack (>= 5.0.1.rc1) @@ -647,23 +587,22 @@ GEM nokogiri (>= 1.6) rails-html-sanitizer (1.4.2) loofah (~> 2.3) - rails-i18n (5.1.3) + rails-i18n (6.0.0) i18n (>= 0.7, < 2) - railties (>= 5.0, < 6) - railties (5.2.6) - actionpack (= 5.2.6) - activesupport (= 5.2.6) + railties (>= 6.0.0, < 7) + railties (6.0.5) + actionpack (= 6.0.5) + activesupport (= 6.0.5) method_source rake (>= 0.8.7) - thor (>= 0.19.0, < 2.0) - rainbow (3.0.0) + thor (>= 0.20.3, < 2.0) + rainbow (3.1.1) rake (13.0.6) - ransack (2.1.1) - actionpack (>= 5.0) - activerecord (>= 5.0) - activesupport (>= 5.0) + ransack (2.4.2) + activerecord (>= 5.2.4) + activesupport (>= 5.2.4) i18n - rb-fsevent (0.11.0) + rb-fsevent (0.11.1) rb-inotify (0.10.1) ffi (~> 1.0) rectify (0.13.0) @@ -673,9 +612,9 @@ GEM virtus (~> 1.0.5) wisper (>= 1.6.1) redcarpet (3.5.1) - redis (4.5.1) - regexp_parser (2.1.1) - request_store (1.5.0) + redis (4.6.0) + regexp_parser (2.4.0) + request_store (1.5.1) rack (>= 1.4) responders (3.0.1) actionpack (>= 5.0) @@ -686,35 +625,35 @@ GEM mime-types (>= 1.16, < 4.0) netrc (~> 0.8) rexml (3.2.5) - rspec (3.9.0) - rspec-core (~> 3.9.0) - rspec-expectations (~> 3.9.0) - rspec-mocks (~> 3.9.0) + rspec (3.11.0) + rspec-core (~> 3.11.0) + rspec-expectations (~> 3.11.0) + rspec-mocks (~> 3.11.0) rspec-cells (0.3.7) cells (>= 4.0.0, < 6.0.0) rspec-rails (< 6.0) - rspec-core (3.9.3) - rspec-support (~> 3.9.3) - rspec-expectations (3.9.4) + rspec-core (3.11.0) + rspec-support (~> 3.11.0) + rspec-expectations (3.11.0) diff-lcs (>= 1.2.0, < 2.0) - rspec-support (~> 3.9.0) + rspec-support (~> 3.11.0) rspec-html-matchers (0.9.4) nokogiri (~> 1) rspec (>= 3.0.0.a, < 4) - rspec-mocks (3.9.1) + rspec-mocks (3.11.1) diff-lcs (>= 1.2.0, < 2.0) - rspec-support (~> 3.9.0) - rspec-rails (3.9.1) - actionpack (>= 3.0) - activesupport (>= 3.0) - railties (>= 3.0) - rspec-core (~> 3.9.0) - rspec-expectations (~> 3.9.0) - rspec-mocks (~> 3.9.0) - rspec-support (~> 3.9.0) + rspec-support (~> 3.11.0) + rspec-rails (4.1.2) + actionpack (>= 4.2) + activesupport (>= 4.2) + railties (>= 4.2) + rspec-core (~> 3.10) + rspec-expectations (~> 3.10) + rspec-mocks (~> 3.10) + rspec-support (~> 3.10) rspec-retry (0.6.2) rspec-core (> 3.3) - rspec-support (3.9.4) + rspec-support (3.11.0) rspec_junit_formatter (0.3.0) rspec-core (>= 2, < 4, != 2.12.0) rubocop (0.92.0) @@ -726,8 +665,8 @@ GEM rubocop-ast (>= 0.5.0) ruby-progressbar (~> 1.7) unicode-display_width (>= 1.4.0, < 2.0) - rubocop-ast (1.13.0) - parser (>= 3.0.1.1) + rubocop-ast (1.18.0) + parser (>= 3.1.1.0) rubocop-faker (1.1.0) faker (>= 2.12.0) rubocop (>= 0.82.0) @@ -735,32 +674,21 @@ GEM activesupport (>= 4.2.0) rack (>= 1.1) rubocop (>= 0.90.0, < 2.0) - rubocop-rspec (1.44.1) + rubocop-rspec (1.43.2) rubocop (~> 0.87) - rubocop-ast (>= 0.7.1) - ruby-ole (1.2.12.2) ruby-progressbar (1.11.0) ruby-vips (2.1.4) ffi (~> 1.12) ruby2_keywords (0.0.5) + rubyXL (3.4.25) + nokogiri (>= 1.10.8) + rubyzip (>= 1.3.0) rubyzip (2.3.2) - 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) - sassc (2.4.0) - ffi (~> 1.9) - sassc-rails (2.1.2) - railties (>= 4.0.0) - sassc (>= 2.0) - sprockets (> 3.0) - sprockets-rails - tilt searchlight (4.1.0) selenium-webdriver (3.142.7) childprocess (>= 0.5, < 4.0) rubyzip (>= 1.2.2) + semantic_range (3.0.0) seven_zip_ruby (1.3.0) simplecov (0.19.1) docile (~> 1.1) @@ -768,33 +696,27 @@ GEM simplecov-cobertura (1.3.1) simplecov (~> 0.8) simplecov-html (0.12.3) - smart_properties (1.16.3) + smart_properties (1.17.0) social-share-button (1.2.4) coffee-rails - spreadsheet (1.3.0) - ruby-ole spring (2.1.1) spring-watcher-listen (2.0.1) listen (>= 2.7, < 4.0) spring (>= 1.2, < 3.0) - sprockets (3.7.2) + sprockets (4.0.3) concurrent-ruby (~> 1.0) rack (> 1, < 3) - sprockets-es6 (0.9.2) - babel-source (>= 5.8.11) - babel-transpiler - sprockets (>= 3.0.0) - sprockets-rails (3.4.1) + sprockets-rails (3.4.2) actionpack (>= 5.2) activesupport (>= 5.2) sprockets (>= 3.0.0) ssrf_filter (1.0.7) - system_test_html_screenshots (0.1.2) - actionpack (>= 5.2, < 6.0.a) + system_test_html_screenshots (0.2.0) + actionpack (>= 5.2, < 6.1.a) temple (0.8.2) terminal-table (3.0.2) unicode-display_width (>= 1.1.1, < 3) - thor (1.1.0) + thor (1.2.1) thread_safe (0.3.6) tilt (2.0.10) tomlrb (2.0.1) @@ -808,17 +730,24 @@ GEM execjs (>= 0.3.0, < 3) unf (0.1.4) unf_ext - unf_ext (0.0.8) + unf_ext (0.0.8.1) unicode-display_width (1.8.0) valid_email2 (2.3.1) activemodel (>= 3.2) mail (~> 2.5) - vcr (6.0.0) virtus (1.0.5) 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 + w3c_validators + w3c_validators (1.3.7) + json (>= 1.8) + nokogiri (~> 1.6) + rexml (~> 3.2) warden (1.2.9) rack (>= 2.0.9) web-console (3.7.0) @@ -830,16 +759,22 @@ GEM addressable (>= 2.8.0) crack (>= 0.3.2) hashdiff (>= 0.4.0, < 2.0.0) + webpacker (6.0.0.rc.5) + activesupport (>= 5.2) + rack-proxy (>= 0.6.1) + railties (>= 5.2) + semantic_range (>= 2.3.0) websocket-driver (0.7.5) websocket-extensions (>= 0.1.0) websocket-extensions (0.1.5) - wicked_pdf (1.4.0) + wicked_pdf (2.6.2) activesupport wisper (2.0.1) wisper-rspec (1.1.0) wkhtmltopdf-binary (0.12.6.5) xpath (3.2.0) nokogiri (~> 1.8) + zeitwerk (2.5.4) PLATFORMS ruby diff --git a/app/assets/config/decidim_socio_demographic_authorization_handler_manifest.js b/app/assets/config/decidim_socio_demographic_authorization_handler_manifest.js deleted file mode 100644 index e69de29..0000000 diff --git a/app/assets/images/decidim/socio_demographic_authorization_handler/icon.svg b/app/assets/images/decidim/socio_demographic_authorization_handler/icon.svg deleted file mode 100644 index 1db0293..0000000 --- a/app/assets/images/decidim/socio_demographic_authorization_handler/icon.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/app/helpers/decidim/socio_demographic_authorization_handler/application_helper.rb b/app/helpers/decidim/socio_demographic_authorization_handler/application_helper.rb deleted file mode 100644 index f4a7812..0000000 --- a/app/helpers/decidim/socio_demographic_authorization_handler/application_helper.rb +++ /dev/null @@ -1,10 +0,0 @@ -# frozen_string_literal: true - -module Decidim - module SocioDemographicAuthorizationHandler - # Custom helpers, scoped to the socio_demographic_authorization_handler engine. - # - module ApplicationHelper - end - end -end diff --git a/app/models/decidim/socio_demographic_authorization_handler/application_record.rb b/app/models/decidim/socio_demographic_authorization_handler/application_record.rb deleted file mode 100644 index 2cf59f8..0000000 --- a/app/models/decidim/socio_demographic_authorization_handler/application_record.rb +++ /dev/null @@ -1,10 +0,0 @@ -# frozen_string_literal: true - -module Decidim - module SocioDemographicAuthorizationHandler - # Abstract class from which all models in this engine inherit. - class ApplicationRecord < ActiveRecord::Base - self.abstract_class = true - end - end -end diff --git a/lib/decidim/socio_demographic_authorization_handler/version.rb b/lib/decidim/socio_demographic_authorization_handler/version.rb index 1fc2a34..71ede9e 100644 --- a/lib/decidim/socio_demographic_authorization_handler/version.rb +++ b/lib/decidim/socio_demographic_authorization_handler/version.rb @@ -4,11 +4,11 @@ module Decidim # This holds the decidim-meetings version. module SocioDemographicAuthorizationHandler def self.version - "0.24.3" + "0.25.2" end def self.decidim_version - "release/0.24-stable" + "release/0.25-stable" end end end diff --git a/spec/i18n_spec.rb b/spec/i18n_spec.rb index 61b98ee..02011e3 100644 --- a/spec/i18n_spec.rb +++ b/spec/i18n_spec.rb @@ -7,7 +7,9 @@ ENV["ENFORCED_LOCALES"].presence || "en" end - let(:i18n) { I18n::Tasks::BaseTask.new({ locales: locales.split(",") }, config_file: nil) } + let(:i18n) do + I18n::Tasks::BaseTask.new(config_file: nil, locales: locales.split(",")) + end let(:missing_keys) { i18n.missing_keys } let(:unused_keys) { i18n.unused_keys } let(:non_normalized_paths) { i18n.non_normalized_paths } diff --git a/spec/system/authentication_spec.rb b/spec/system/authentication_spec.rb index 6347720..97ce179 100644 --- a/spec/system/authentication_spec.rb +++ b/spec/system/authentication_spec.rb @@ -92,11 +92,14 @@ before do OmniAuth.config.test_mode = true OmniAuth.config.mock_auth[:facebook] = omniauth_hash + OmniAuth.config.add_camelization "facebook", "FaceBook" + OmniAuth.config.request_validation_phase = ->(env) {} if OmniAuth.config.respond_to?(:request_validation_phase) end after do OmniAuth.config.test_mode = false OmniAuth.config.mock_auth[:facebook] = nil + OmniAuth.config.camelizations.delete("facebook") end context "when the user has confirmed the email in facebook" do @@ -128,11 +131,15 @@ before do OmniAuth.config.test_mode = true OmniAuth.config.mock_auth[:twitter] = omniauth_hash + + OmniAuth.config.add_camelization "twitter", "Twitter" + OmniAuth.config.request_validation_phase = ->(env) {} if OmniAuth.config.respond_to?(:request_validation_phase) end after do OmniAuth.config.test_mode = false OmniAuth.config.mock_auth[:twitter] = nil + OmniAuth.config.camelizations.delete("twitter") end context "when the response doesn't include the email" do @@ -199,11 +206,15 @@ before do OmniAuth.config.test_mode = true OmniAuth.config.mock_auth[:google_oauth2] = omniauth_hash + + OmniAuth.config.add_camelization "google_oauth2", "GoogleOauth" + OmniAuth.config.request_validation_phase = ->(env) {} if OmniAuth.config.respond_to?(:request_validation_phase) end after do OmniAuth.config.test_mode = false OmniAuth.config.mock_auth[:google_oauth2] = nil + OmniAuth.config.camelizations.delete("google_oauth2") end it "creates a new User" do @@ -469,11 +480,14 @@ before do OmniAuth.config.test_mode = true OmniAuth.config.mock_auth[:facebook] = omniauth_hash + OmniAuth.config.add_camelization "facebook", "FaceBook" + OmniAuth.config.request_validation_phase = ->(env) {} if OmniAuth.config.respond_to?(:request_validation_phase) end after do OmniAuth.config.test_mode = false OmniAuth.config.mock_auth[:facebook] = nil + OmniAuth.config.camelizations.delete("facebook") end describe "Sign in" do @@ -565,11 +579,14 @@ before do OmniAuth.config.test_mode = true OmniAuth.config.mock_auth[:facebook] = omniauth_hash + OmniAuth.config.add_camelization "facebook", "FaceBook" + OmniAuth.config.request_validation_phase = ->(env) {} if OmniAuth.config.respond_to?(:request_validation_phase) end after do OmniAuth.config.test_mode = false OmniAuth.config.mock_auth[:facebook] = nil + OmniAuth.config.camelizations.delete("facebook") end describe "Sign Up" do