Merge branch 'develop' of github.com:decidim/decidim into feature/upg…

…rade-carierwave2.1
decidim · Jan 26, 2021 · e57d7e0 · e57d7e0
2 parents f3f944b + 65de00e
commit e57d7e0
Show file tree

Hide file tree

Showing 254 changed files with 5,218 additions and 1,070 deletions.
diff --git a/.eslintrc.json b/.eslintrc.json
@@ -31,7 +31,8 @@
         "SVGInjector": false,
         "require": false,
         "DecidimAdmin": false,
-        "L": false
+        "L": false,
+        "decidimBulletinBoard": false
     },
     "rules": {
         "accessor-pairs": "error",

diff --git a/.github/workflows/README.md b/.github/workflows/README.md
@@ -15,7 +15,7 @@ Individual workflows with changes:
 - run: bundle install --path vendor/bundle --jobs 4 --retry 3
   name: Install Ruby deps
 - run: cp -R vendor/bundle decidim-generators
-- run: bundle exec rake
+- run: bundle exec rspec
   name: RSpec
   working-directory: ${{ env.DECIDIM_MODULE }}
 ```

diff --git a/.github/workflows/ci_accountability.yml b/.github/workflows/ci_accountability.yml
@@ -54,7 +54,7 @@ jobs:
       - run: mkdir -p ./spec/decidim_dummy_app/tmp/screenshots
         name: Create the screenshots folder
       - uses: nanasess/setup-chromedriver@v1.0.1
-      - run: bundle exec rake
+      - run: bundle exec rspec
         name: RSpec
         working-directory: ${{ env.DECIDIM_MODULE }}
       - run: ./.github/upload_coverage.sh $DECIDIM_MODULE $GITHUB_EVENT_PATH

diff --git a/.github/workflows/ci_admin.yml b/.github/workflows/ci_admin.yml
@@ -54,7 +54,7 @@ jobs:
       - run: mkdir -p ./spec/decidim_dummy_app/tmp/screenshots
         name: Create the screenshots folder
       - uses: nanasess/setup-chromedriver@v1.0.1
-      - run: bundle exec rake
+      - run: bundle exec rspec
         name: RSpec
         working-directory: ${{ env.DECIDIM_MODULE }}
       - run: ./.github/upload_coverage.sh $DECIDIM_MODULE $GITHUB_EVENT_PATH

diff --git a/.github/workflows/ci_api.yml b/.github/workflows/ci_api.yml
@@ -54,7 +54,7 @@ jobs:
       - run: mkdir -p ./spec/decidim_dummy_app/tmp/screenshots
         name: Create the screenshots folder
       - uses: nanasess/setup-chromedriver@v1.0.1
-      - run: bundle exec rake
+      - run: bundle exec rspec
         name: RSpec
         working-directory: ${{ env.DECIDIM_MODULE }}
       - run: ./.github/upload_coverage.sh $DECIDIM_MODULE $GITHUB_EVENT_PATH

diff --git a/.github/workflows/ci_assemblies.yml b/.github/workflows/ci_assemblies.yml
@@ -54,7 +54,7 @@ jobs:
       - run: mkdir -p ./spec/decidim_dummy_app/tmp/screenshots
         name: Create the screenshots folder
       - uses: nanasess/setup-chromedriver@v1.0.1
-      - run: bundle exec rake
+      - run: bundle exec rspec
         name: RSpec
         working-directory: ${{ env.DECIDIM_MODULE }}
       - run: ./.github/upload_coverage.sh $DECIDIM_MODULE $GITHUB_EVENT_PATH

diff --git a/.github/workflows/ci_blogs.yml b/.github/workflows/ci_blogs.yml
@@ -54,7 +54,7 @@ jobs:
       - run: mkdir -p ./spec/decidim_dummy_app/tmp/screenshots
         name: Create the screenshots folder
       - uses: nanasess/setup-chromedriver@v1.0.1
-      - run: bundle exec rake
+      - run: bundle exec rspec
         name: RSpec
         working-directory: ${{ env.DECIDIM_MODULE }}
       - run: ./.github/upload_coverage.sh $DECIDIM_MODULE $GITHUB_EVENT_PATH

diff --git a/.github/workflows/ci_budgets.yml b/.github/workflows/ci_budgets.yml
@@ -54,7 +54,7 @@ jobs:
       - run: mkdir -p ./spec/decidim_dummy_app/tmp/screenshots
         name: Create the screenshots folder
       - uses: nanasess/setup-chromedriver@v1.0.1
-      - run: bundle exec rake
+      - run: bundle exec rspec
         name: RSpec
         working-directory: ${{ env.DECIDIM_MODULE }}
       - run: ./.github/upload_coverage.sh $DECIDIM_MODULE $GITHUB_EVENT_PATH

diff --git a/.github/workflows/ci_comments.yml b/.github/workflows/ci_comments.yml
@@ -62,7 +62,7 @@ jobs:
       - run: mkdir -p ./spec/decidim_dummy_app/tmp/screenshots
         name: Create the screenshots folder
       - uses: nanasess/setup-chromedriver@v1.0.1
-      - run: bundle exec rake
+      - run: bundle exec rspec
         name: RSpec
         working-directory: ${{ env.DECIDIM_MODULE }}
       - run: ./.github/upload_coverage.sh $DECIDIM_MODULE $GITHUB_EVENT_PATH

diff --git a/.github/workflows/ci_conferences.yml b/.github/workflows/ci_conferences.yml
@@ -54,7 +54,7 @@ jobs:
       - run: mkdir -p ./spec/decidim_dummy_app/tmp/screenshots
         name: Create the screenshots folder
       - uses: nanasess/setup-chromedriver@v1.0.1
-      - run: bundle exec rake
+      - run: bundle exec rspec
         name: RSpec
         working-directory: ${{ env.DECIDIM_MODULE }}
       - run: ./.github/upload_coverage.sh $DECIDIM_MODULE $GITHUB_EVENT_PATH

diff --git a/.github/workflows/ci_consultations.yml b/.github/workflows/ci_consultations.yml
@@ -54,7 +54,7 @@ jobs:
       - run: mkdir -p ./spec/decidim_dummy_app/tmp/screenshots
         name: Create the screenshots folder
       - uses: nanasess/setup-chromedriver@v1.0.1
-      - run: bundle exec rake
+      - run: bundle exec rspec
         name: RSpec
         working-directory: ${{ env.DECIDIM_MODULE }}
       - run: ./.github/upload_coverage.sh $DECIDIM_MODULE $GITHUB_EVENT_PATH

diff --git a/.github/workflows/ci_debates.yml b/.github/workflows/ci_debates.yml
@@ -54,7 +54,7 @@ jobs:
       - run: mkdir -p ./spec/decidim_dummy_app/tmp/screenshots
         name: Create the screenshots folder
       - uses: nanasess/setup-chromedriver@v1.0.1
-      - run: bundle exec rake
+      - run: bundle exec rspec
         name: RSpec
         working-directory: ${{ env.DECIDIM_MODULE }}
       - run: ./.github/upload_coverage.sh $DECIDIM_MODULE $GITHUB_EVENT_PATH

diff --git a/.github/workflows/ci_elections.yml b/.github/workflows/ci_elections.yml
@@ -54,7 +54,7 @@ jobs:
       - run: mkdir -p ./spec/decidim_dummy_app/tmp/screenshots
         name: Create the screenshots folder
       - uses: nanasess/setup-chromedriver@v1.0.1
-      - run: bundle exec rake
+      - run: bundle exec rspec
         name: RSpec
         working-directory: ${{ env.DECIDIM_MODULE }}
       - run: ./.github/upload_coverage.sh $DECIDIM_MODULE $GITHUB_EVENT_PATH

diff --git a/.github/workflows/ci_forms.yml b/.github/workflows/ci_forms.yml
@@ -54,7 +54,7 @@ jobs:
       - run: mkdir -p ./spec/decidim_dummy_app/tmp/screenshots
         name: Create the screenshots folder
       - uses: nanasess/setup-chromedriver@v1.0.1
-      - run: bundle exec rake
+      - run: bundle exec rspec
         name: RSpec
         working-directory: ${{ env.DECIDIM_MODULE }}
       - run: ./.github/upload_coverage.sh $DECIDIM_MODULE $GITHUB_EVENT_PATH

diff --git a/.github/workflows/ci_generators.yml b/.github/workflows/ci_generators.yml
@@ -52,7 +52,7 @@ jobs:
       - run: bundle install --jobs 4 --retry 3
         name: Install Ruby deps
         working-directory: ${{ env.DECIDIM_MODULE }}
-      - run: bundle exec rake
+      - run: bundle exec rspec
         name: RSpec
         working-directory: ${{ env.DECIDIM_MODULE }}
       - run: ./.github/upload_coverage.sh $DECIDIM_MODULE $GITHUB_EVENT_PATH

diff --git a/.github/workflows/ci_initiatives.yml b/.github/workflows/ci_initiatives.yml
@@ -54,7 +54,7 @@ jobs:
       - run: mkdir -p ./spec/decidim_dummy_app/tmp/screenshots
         name: Create the screenshots folder
       - uses: nanasess/setup-chromedriver@v1.0.1
-      - run: bundle exec rake
+      - run: bundle exec rspec
         name: RSpec
         working-directory: ${{ env.DECIDIM_MODULE }}
       - run: ./.github/upload_coverage.sh $DECIDIM_MODULE $GITHUB_EVENT_PATH

diff --git a/.github/workflows/ci_pages.yml b/.github/workflows/ci_pages.yml
@@ -54,7 +54,7 @@ jobs:
       - run: mkdir -p ./spec/decidim_dummy_app/tmp/screenshots
         name: Create the screenshots folder
       - uses: nanasess/setup-chromedriver@v1.0.1
-      - run: bundle exec rake
+      - run: bundle exec rspec
         name: RSpec
         working-directory: ${{ env.DECIDIM_MODULE }}
       - run: ./.github/upload_coverage.sh $DECIDIM_MODULE $GITHUB_EVENT_PATH

diff --git a/.github/workflows/ci_participatory_processes.yml b/.github/workflows/ci_participatory_processes.yml
@@ -54,7 +54,7 @@ jobs:
       - run: mkdir -p ./spec/decidim_dummy_app/tmp/screenshots
         name: Create the screenshots folder
       - uses: nanasess/setup-chromedriver@v1.0.1
-      - run: bundle exec rake
+      - run: bundle exec rspec
         name: RSpec
         working-directory: ${{ env.DECIDIM_MODULE }}
       - run: ./.github/upload_coverage.sh $DECIDIM_MODULE $GITHUB_EVENT_PATH

diff --git a/.github/workflows/ci_sortitions.yml b/.github/workflows/ci_sortitions.yml
@@ -54,7 +54,7 @@ jobs:
       - run: mkdir -p ./spec/decidim_dummy_app/tmp/screenshots
         name: Create the screenshots folder
       - uses: nanasess/setup-chromedriver@v1.0.1
-      - run: bundle exec rake
+      - run: bundle exec rspec
         name: RSpec
         working-directory: ${{ env.DECIDIM_MODULE }}
       - run: ./.github/upload_coverage.sh $DECIDIM_MODULE $GITHUB_EVENT_PATH

diff --git a/.github/workflows/ci_surveys.yml b/.github/workflows/ci_surveys.yml
@@ -54,7 +54,7 @@ jobs:
       - run: mkdir -p ./spec/decidim_dummy_app/tmp/screenshots
         name: Create the screenshots folder
       - uses: nanasess/setup-chromedriver@v1.0.1
-      - run: bundle exec rake
+      - run: bundle exec rspec
         name: RSpec
         working-directory: ${{ env.DECIDIM_MODULE }}
       - run: ./.github/upload_coverage.sh $DECIDIM_MODULE $GITHUB_EVENT_PATH

diff --git a/.github/workflows/ci_system.yml b/.github/workflows/ci_system.yml
@@ -54,7 +54,7 @@ jobs:
       - run: mkdir -p ./spec/decidim_dummy_app/tmp/screenshots
         name: Create the screenshots folder
       - uses: nanasess/setup-chromedriver@v1.0.1
-      - run: bundle exec rake
+      - run: bundle exec rspec
         name: RSpec
         working-directory: ${{ env.DECIDIM_MODULE }}
       - run: ./.github/upload_coverage.sh $DECIDIM_MODULE $GITHUB_EVENT_PATH

diff --git a/.github/workflows/ci_templates.yml b/.github/workflows/ci_templates.yml
@@ -68,7 +68,7 @@ jobs:
       - run: mkdir -p ./spec/decidim_dummy_app/tmp/screenshots
         name: Create the screenshots folder
       - uses: nanasess/setup-chromedriver@v1.0.1
-      - run: bundle exec rake
+      - run: bundle exec rspec
         name: RSpec
         working-directory: ${{ env.DECIDIM_MODULE }}
       - run: ./.github/upload_coverage.sh $DECIDIM_MODULE $GITHUB_EVENT_PATH

diff --git a/.github/workflows/ci_verifications.yml b/.github/workflows/ci_verifications.yml
@@ -54,7 +54,7 @@ jobs:
       - run: mkdir -p ./spec/decidim_dummy_app/tmp/screenshots
         name: Create the screenshots folder
       - uses: nanasess/setup-chromedriver@v1.0.1
-      - run: bundle exec rake
+      - run: bundle exec rspec
         name: RSpec
         working-directory: ${{ env.DECIDIM_MODULE }}
       - run: ./.github/upload_coverage.sh $DECIDIM_MODULE $GITHUB_EVENT_PATH

diff --git a/Gemfile.lock b/Gemfile.lock
@@ -142,6 +142,7 @@ PATH
       i18n-tasks (~> 0.9.18)
       mdl (~> 0.5)
       nokogiri (>= 1.10.8)
+      puffing-billy (~> 2.4.0)
       puma (>= 4.3)
       rails-controller-testing (~> 1.0)
       rspec-cells (~> 0.3.4)
@@ -160,7 +161,7 @@ PATH
       webmock (~> 3.6)
       wisper-rspec (~> 1.0)
     decidim-elections (0.24.0.dev)
-      decidim-bulletin_board (= 0.2.0)
+      decidim-bulletin_board (= 0.6.1)
       decidim-core (= 0.24.0.dev)
       decidim-forms (= 0.24.0.dev)
       decidim-proposals (= 0.24.0.dev)
@@ -308,13 +309,13 @@ GEM
     browser (2.7.1)
     builder (3.2.4)
     byebug (11.1.3)
-    capybara (3.33.0)
+    capybara (3.35.0)
       addressable
       mini_mime (>= 0.1.3)
       nokogiri (~> 1.8)
       rack (>= 1.6.0)
       rack-test (>= 0.6.3)
-      regexp_parser (~> 1.5)
+      regexp_parser (>= 1.5, < 3.0)
       xpath (~> 3.2)
     carrierwave (2.1.0)
       activemodel (>= 5.0.0)
@@ -335,7 +336,7 @@ GEM
       actionpack (>= 3.0)
       cells (>= 4.1.6, < 5.0.0)
     charlock_holmes (0.7.7)
-    chef-utils (16.6.14)
+    chef-utils (16.9.29)
     childprocess (3.0.0)
     coercible (1.0.0)
       descendants_tracker (~> 0.0.1)
@@ -348,7 +349,9 @@ GEM
     coffee-script-source (1.12.2)
     colorize (0.8.1)
     concurrent-ruby (1.1.7)
-    crack (0.4.4)
+    cookiejar (0.3.3)
+    crack (0.4.5)
+      rexml
     crass (1.0.6)
     css_parser (1.8.0)
       addressable
@@ -358,12 +361,11 @@ GEM
     db-query-matchers (0.9.0)
       activesupport (>= 4.0, <= 6.0)
       rspec (~> 3.0)
-    decidim-bulletin_board (0.2.0)
-      activemodel (~> 5.0, >= 5.0.0.1)
-      activesupport (~> 5.0, >= 5.0.0.1)
+    decidim-bulletin_board (0.6.1)
       byebug (~> 11.0)
       graphlient (~> 0.4.0)
-      jwt
+      jwt (~> 2.2.2)
+      rails (>= 5.0.0)
       wisper (~> 2.0.0)
     declarative-builder (0.1.0)
       declarative-option (< 0.2.0)
@@ -392,20 +394,32 @@ GEM
     doorkeeper (5.4.0)
       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)
     equalizer (0.0.11)
-    erb_lint (0.0.35)
+    erb_lint (0.0.37)
       activesupport
       better_html (~> 1.0.7)
       html_tokenizer
       parser (>= 2.7.1.4)
       rainbow
-      rubocop (~> 0.79)
+      rubocop
       smart_properties
     erbse (0.1.4)
       temple
     erubi (1.9.0)
     etherpad-lite (0.3.0)
       rest-client (>= 1.6)
+    eventmachine (1.2.7)
+    eventmachine_httpserver (0.2.1)
     excon (0.78.1)
     execjs (2.7.0)
     factory_bot (4.11.1)
@@ -463,9 +477,10 @@ GEM
     http-accept (1.7.0)
     http-cookie (1.0.3)
       domain_name (~> 0.5)
+    http_parser.rb (0.6.0)
     i18n (1.8.5)
       concurrent-ruby (~> 1.0)
-    i18n-tasks (0.9.31)
+    i18n-tasks (0.9.33)
       activesupport (>= 4.0.2)
       ast (>= 2.1.0)
       erubi
@@ -543,7 +558,7 @@ GEM
     mixlib-cli (2.1.8)
     mixlib-config (3.0.9)
       tomlrb
-    mixlib-shellout (3.1.7)
+    mixlib-shellout (3.2.2)
       chef-utils
     msgpack (1.3.3)
     multi_json (1.15.0)
@@ -606,6 +621,14 @@ GEM
       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.0.0)
       nio4r (~> 2.0)
     racc (1.5.2)
@@ -723,10 +746,10 @@ GEM
     rubocop-faker (1.1.0)
       faker (>= 2.12.0)
       rubocop (>= 0.82.0)
-    rubocop-rails (2.8.1)
+    rubocop-rails (2.9.1)
       activesupport (>= 4.2.0)
       rack (>= 1.1)
-      rubocop (>= 0.87.0)
+      rubocop (>= 0.90.0, < 2.0)
     rubocop-rspec (1.43.2)
       rubocop (~> 0.87)
     ruby-ole (1.2.12.2)
@@ -787,7 +810,7 @@ GEM
     thor (1.0.1)
     thread_safe (0.3.6)
     tilt (2.0.10)
-    tomlrb (1.3.0)
+    tomlrb (2.0.1)
     truncato (0.7.11)
       htmlentities (~> 4.3.1)
       nokogiri (>= 1.7.0, <= 2.0)
@@ -818,7 +841,7 @@ GEM
       activemodel (>= 5.0)
       bindex (>= 0.4.0)
       railties (>= 5.0)
-    webmock (3.9.3)
+    webmock (3.11.1)
       addressable (>= 2.3.6)
       crack (>= 0.3.2)
       hashdiff (>= 0.4.0, < 2.0.0)