even sync with meetings (#90)

* udpate gems * fix tests * some test fixes * fix tests * update civi syncs
Platoniq · Oct 28, 2021 · 6058f78 · 6058f78
1 parent dd0bc77
commit 6058f78
Show file tree

Hide file tree

Showing 35 changed files with 267 additions and 918 deletions.
diff --git a/.github/run_erblint.sh b/.github/run_erblint.sh
diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml
@@ -35,6 +35,7 @@ jobs:
       - run: bundle exec mdl *.md
         name: Lint Markdown files
 
-      - run: ./.github/run_erblint.sh
-        name: Lint ERB files
-
+      - name: Lint and Rubocop
+        run: |
+          bundle exec rubocop -P
+          bundle exec erblint app/**/*.erb
diff --git a/.github/workflows/test_api.yml b/.github/workflows/test_api.yml
diff --git a/Gemfile b/Gemfile
@@ -13,7 +13,7 @@ gem "decidim-consultations", DECIDIM_VERSION
 gem "catcomu-managers", path: "./catcomu-managers"
 gem "decidim-civicrm", git: "https://github.com/Platoniq/decidim-module-civicrm", branch: "main"
 
-gem "decidim-decidim_awesome", git: "https://github.com/Platoniq/decidim-module-decidim_awesome", branch: "main"
+gem "decidim-decidim_awesome", "~> 0.7.2"
 gem "decidim-direct_verifications", git: "https://github.com/Platoniq/decidim-verifications-direct_verifications"
 gem "decidim-navigation_maps", "~> 1.2.0"
 

diff --git a/Gemfile.lock b/Gemfile.lock
@@ -1,6 +1,6 @@
 GIT
   remote: https://github.com/Platoniq/decidim
-  revision: f6522fe9dd4ff41bb6b1cb8b664934b4dbf10b94
+  revision: e05b4bf52c22231399b43f66191ff879f001658b
   branch: temp/0.24
   specs:
     decidim (0.24.3)
@@ -222,32 +222,21 @@ GIT
 
 GIT
   remote: https://github.com/Platoniq/decidim-module-civicrm
-  revision: 8ceba92ac5a8a4f7f60dce6f93c68b31d583d3fe
+  revision: a9e00f640a807e5f1b3098d48a2453d606b8eac3
   branch: main
   specs:
     decidim-civicrm (0.3)
       decidim-admin (~> 0.3)
       decidim-core (~> 0.3)
       decidim-verifications (~> 0.3)
 
-GIT
-  remote: https://github.com/Platoniq/decidim-module-decidim_awesome
-  revision: 3df1e5a39684907fbec164fc5ccc3d3911f20e52
-  branch: main
-  specs:
-    decidim-decidim_awesome (0.7.1)
-      decidim-admin (>= 0.23.0, < 0.25)
-      decidim-core (>= 0.23.0, < 0.25)
-      redcarpet (~> 3.4)
-      sassc (~> 2.3)
-
 GIT
   remote: https://github.com/Platoniq/decidim-verifications-direct_verifications
-  revision: 42bf6e7eaea3d40a78b6972608f33e1e49749838
+  revision: 46ba2fad0e02bb8bf8c61867262bba783890e03a
   specs:
-    decidim-direct_verifications (0.22.1)
-      decidim-admin (>= 0.22.0)
-      decidim-core (>= 0.22.0)
+    decidim-direct_verifications (1.0)
+      decidim-admin (>= 0.23.0)
+      decidim-core (>= 0.23.0)
 
 PATH
   remote: catcomu-managers
@@ -331,13 +320,14 @@ GEM
       parser (>= 2.4)
       smart_properties
     bindex (0.8.1)
-    bootsnap (1.7.5)
+    bootsnap (1.9.1)
       msgpack (~> 1.0)
     browser (2.7.1)
     builder (3.2.4)
     byebug (11.1.3)
-    capybara (3.35.3)
+    capybara (3.36.0)
       addressable
+      matrix
       mini_mime (>= 0.1.3)
       nokogiri (~> 1.8)
       rack (>= 1.6.0)
@@ -364,7 +354,7 @@ GEM
       actionpack (>= 3.0)
       cells (>= 4.1.6, < 5.0.0)
     charlock_holmes (0.7.7)
-    chef-utils (17.2.29)
+    chef-utils (17.6.18)
       concurrent-ruby
     childprocess (3.0.0)
     chronic (0.10.2)
@@ -391,6 +381,10 @@ GEM
     db-query-matchers (0.9.0)
       activesupport (>= 4.0, <= 6.0)
       rspec (~> 3.0)
+    decidim-decidim_awesome (0.7.2)
+      decidim-admin (>= 0.23.0, < 0.25)
+      decidim-core (>= 0.23.0, < 0.25)
+      sassc (~> 2.3)
     decidim-navigation_maps (1.2.0)
       decidim-admin (>= 0.24, < 0.25)
       decidim-core (>= 0.24, < 0.25)
@@ -443,7 +437,7 @@ GEM
     erbse (0.1.4)
       temple
     erubi (1.10.0)
-    et-orbi (1.2.4)
+    et-orbi (1.2.5)
       tzinfo
     etherpad-lite (0.3.0)
       rest-client (>= 1.6)
@@ -456,7 +450,7 @@ GEM
     factory_bot_rails (4.11.1)
       factory_bot (~> 4.11.1)
       railties (>= 3.0.0)
-    faker (2.18.0)
+    faker (2.19.0)
       i18n (>= 1.6, < 2)
     faraday (1.8.0)
       faraday-em_http (~> 1.0)
@@ -481,7 +475,7 @@ GEM
     file_validators (2.3.0)
       activemodel (>= 3.2)
       mime-types (>= 1.0)
-    fog-aws (3.10.0)
+    fog-aws (3.12.0)
       fog-core (~> 2.1)
       fog-json (~> 1.1)
       fog-xml (~> 0.1)
@@ -496,7 +490,7 @@ GEM
       multi_json (~> 1.10)
     fog-local (0.7.0)
       fog-core (>= 1.27, < 3.0)
-    fog-xml (0.1.3)
+    fog-xml (0.1.4)
       fog-core
       nokogiri (>= 1.5.11, < 2.0.0)
     formatador (0.3.0)
@@ -510,16 +504,16 @@ GEM
       activesupport (>= 4.1, < 6.0)
       railties (>= 4.1, < 6.0)
       tzinfo (~> 1.2, >= 1.2.2)
-    fugit (1.5.0)
+    fugit (1.5.2)
       et-orbi (~> 1.1, >= 1.1.8)
       raabro (~> 1.4)
-    geocoder (1.6.7)
+    geocoder (1.7.0)
     globalid (0.5.2)
       activesupport (>= 5.0)
     graphiql-rails (1.4.11)
       railties
       sprockets-rails
-    graphql (1.12.16)
+    graphql (1.12.17)
     hashdiff (1.0.1)
     hashie (4.1.0)
     health_check (3.1.0)
@@ -545,7 +539,7 @@ GEM
       terminal-table (>= 1.5.1)
     icalendar (2.7.1)
       ice_cube (~> 0.16)
-    ice_cube (0.16.3)
+    ice_cube (0.16.4)
     ice_nine (0.11.2)
     image_processing (1.12.1)
       mini_magick (>= 4.9.5, < 5)
@@ -580,11 +574,11 @@ GEM
       addressable (~> 2.7)
     letter_opener (1.7.0)
       launchy (~> 2.2)
-    letter_opener_web (1.4.0)
+    letter_opener_web (1.4.1)
       actionmailer (>= 3.2)
       letter_opener (~> 1.0)
       railties (>= 3.2)
-    listen (3.5.1)
+    listen (3.7.0)
       rb-fsevent (~> 0.10, >= 0.10.3)
       rb-inotify (~> 0.9, >= 0.9.10)
     loofah (2.3.1)
@@ -593,6 +587,7 @@ GEM
     mail (2.7.1)
       mini_mime (>= 0.1.1)
     marcel (1.0.2)
+    matrix (0.4.2)
     mdl (0.11.0)
       kramdown (~> 2.3)
       kramdown-parser-gfm (~> 1.1)
@@ -604,7 +599,7 @@ GEM
       mime-types-data (~> 3.2015)
     mime-types-data (3.2021.0901)
     mini_magick (4.11.0)
-    mini_mime (1.1.1)
+    mini_mime (1.1.2)
     mini_portile2 (2.5.3)
     minitest (5.14.4)
     mixlib-cli (2.1.8)
@@ -658,7 +653,7 @@ GEM
     paper_trail (10.3.1)
       activerecord (>= 4.2)
       request_store (~> 1.1)
-    parallel (1.20.1)
+    parallel (1.21.0)
     parser (3.0.2.0)
       ast (~> 2.4.1)
     pg (1.1.4)
@@ -681,10 +676,10 @@ GEM
       eventmachine_httpserver
       http_parser.rb (~> 0.6.0)
       multi_json
-    puma (5.3.2)
+    puma (5.5.2)
       nio4r (~> 2.0)
     raabro (1.4.0)
-    racc (1.5.2)
+    racc (1.6.0)
     rack (2.2.3)
     rack-attack (6.5.0)
       rack (>= 1.0, < 3)
@@ -740,7 +735,7 @@ GEM
       virtus (~> 1.0.5)
       wisper (>= 1.6.1)
     redcarpet (3.5.1)
-    redis (4.4.0)
+    redis (4.5.1)
     regexp_parser (2.1.1)
     request_store (1.5.0)
       rack (>= 1.4)
@@ -757,9 +752,9 @@ GEM
       rspec-core (~> 3.9.0)
       rspec-expectations (~> 3.9.0)
       rspec-mocks (~> 3.9.0)
-    rspec-cells (0.3.5)
+    rspec-cells (0.3.7)
       cells (>= 4.0.0, < 6.0.0)
-      rspec-rails (< 5.0)
+      rspec-rails (< 6.0)
     rspec-core (3.9.3)
       rspec-support (~> 3.9.3)
     rspec-expectations (3.9.4)
@@ -793,7 +788,7 @@ GEM
       rubocop-ast (>= 0.5.0)
       ruby-progressbar (~> 1.7)
       unicode-display_width (>= 1.4.0, < 2.0)
-    rubocop-ast (1.7.0)
+    rubocop-ast (1.12.0)
       parser (>= 3.0.1.1)
     rubocop-faker (1.1.0)
       faker (>= 2.12.0)
@@ -828,18 +823,18 @@ GEM
     selenium-webdriver (3.142.7)
       childprocess (>= 0.5, < 4.0)
       rubyzip (>= 1.2.2)
-    sentry-rails (4.6.1)
+    sentry-rails (4.7.3)
       railties (>= 5.0)
-      sentry-ruby-core (~> 4.6.0)
-    sentry-ruby (4.6.1)
+      sentry-ruby-core (~> 4.7.0)
+    sentry-ruby (4.7.3)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       faraday (>= 1.0)
-      sentry-ruby-core (= 4.6.1)
-    sentry-ruby-core (4.6.1)
+      sentry-ruby-core (= 4.7.3)
+    sentry-ruby-core (4.7.3)
       concurrent-ruby
       faraday
     seven_zip_ruby (1.3.0)
-    sidekiq (6.2.1)
+    sidekiq (6.2.2)
       connection_pool (>= 2.2.2)
       rack (~> 2.0)
       redis (>= 4.2.0)
@@ -852,7 +847,7 @@ GEM
     simplecov-cobertura (1.3.1)
       simplecov (~> 0.8)
     simplecov-html (0.12.3)
-    smart_properties (1.15.0)
+    smart_properties (1.16.3)
     social-share-button (1.2.4)
       coffee-rails
     spreadsheet (1.3.0)
@@ -876,7 +871,7 @@ GEM
     system_test_html_screenshots (0.1.2)
       actionpack (>= 5.2, < 6.0.a)
     temple (0.8.2)
-    terminal-table (3.0.1)
+    terminal-table (3.0.2)
       unicode-display_width (>= 1.1.1, < 3)
     thor (1.1.0)
     thread_safe (0.3.6)
@@ -893,7 +888,7 @@ GEM
     unf (0.1.4)
       unf_ext
     unf_ext (0.0.8)
-    unicode-display_width (1.7.0)
+    unicode-display_width (1.8.0)
     valid_email2 (2.3.1)
       activemodel (>= 3.2)
       mail (~> 2.5)
@@ -910,8 +905,8 @@ GEM
       activemodel (>= 5.0)
       bindex (>= 0.4.0)
       railties (>= 5.0)
-    webmock (3.13.0)
-      addressable (>= 2.3.6)
+    webmock (3.14.0)
+      addressable (>= 2.8.0)
       crack (>= 0.3.2)
       hashdiff (>= 0.4.0, < 2.0.0)
     websocket-driver (0.7.5)
@@ -939,7 +934,7 @@ DEPENDENCIES
   decidim-alternative_landing!
   decidim-civicrm!
   decidim-consultations!
-  decidim-decidim_awesome!
+  decidim-decidim_awesome (~> 0.7.2)
   decidim-dev!
   decidim-direct_verifications!
   decidim-navigation_maps (~> 1.2.0)

diff --git a/...decidim/participatory_process_override.rb → ...decidim/participatory_process_override.rb b/...decidim/participatory_process_override.rb → ...decidim/participatory_process_override.rb
diff --git a/...rocesses/process_filters_cell_override.rb → ...rocesses/process_filters_cell_override.rb b/...rocesses/process_filters_cell_override.rb → ...rocesses/process_filters_cell_override.rb