Fix capistrano configuration and CI (#165)

* Fix capistrano configuration

* Fix CI

* Bump ubuntu version in CI

* Fix specs

* Remove duplicated -y

Author: fblupi

.github/workflows/decidim_ci.yml

@@ -2,13 +2,13 @@ name: "[CI] Decidim"
 on: [push]
 
 env:
-  RUBY_VERSION: 3.3.4
-  NODE_VERSION: 18.17.1
+  RUBY_VERSION: 3.4.7
+  NODE_VERSION: 22.14.0
 
 jobs:
   tests:
     name: Tests
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
     services:
       postgres:
         image: postgres:13
@@ -31,6 +31,8 @@ jobs:
       - uses: actions/checkout@v2.0.0
         with:
           fetch-depth: 1
+      - name: Install required libraries
+        run: sudo apt-get update && sudo apt-get install -y libicu-dev imagemagick libvips libvips-tools
       - uses: ruby/setup-ruby@v1
         with:
           ruby-version: ${{ env.RUBY_VERSION }}

Capfile

@@ -31,6 +31,7 @@ install_plugin Capistrano::SCM::Git
 # require "capistrano/rvm"
 require "capistrano/rbenv"
 # require "capistrano/chruby"
+require "capistrano/nvm"
 require "capistrano/bundler"
 require "capistrano/puma"
 require "capistrano/rails/assets"

Gemfile

@@ -42,6 +42,7 @@ group :development do
   gem "capistrano"
   gem "capistrano3-puma", "~> 6.0"
   gem "capistrano-bundler"
+  gem "capistrano-nvm", require: false
   gem "capistrano-passenger"
   gem "capistrano-rails"
   gem "capistrano-rails-console"

Gemfile.lock

@@ -140,6 +140,8 @@ GEM
       sshkit (>= 1.9.0)
     capistrano-bundler (2.2.0)
       capistrano (~> 3.1)
+    capistrano-nvm (0.0.7)
+      capistrano (~> 3.1)
     capistrano-passenger (0.2.1)
       capistrano (~> 3.0)
     capistrano-rails (1.7.0)
@@ -1107,6 +1109,7 @@ DEPENDENCIES
   byebug
   capistrano
   capistrano-bundler
+  capistrano-nvm
   capistrano-passenger
   capistrano-rails
   capistrano-rails-console
@@ -1179,6 +1182,7 @@ CHECKSUMS
   byebug (13.0.0) sha256=d2263efe751941ca520fa29744b71972d39cbc41839496706f5d9b22e92ae05d
   capistrano (3.20.1) sha256=b0d54ba5cf49bb194998bf6b427e889aa36ed05f545ecf7cc37acb9d529e9ae9
   capistrano-bundler (2.2.0) sha256=47b4cf2ea17ea132bb0a5cabc5663443f5190a54f4da5b322d04e1558ff1468c
+  capistrano-nvm (0.0.7) sha256=08840032d33705052a7d101781302c2938b56f28ea4d640ab3cba34f1ee8210f
   capistrano-passenger (0.2.1) sha256=07a1d25edd5c1d909c19d4fe45fe2ea5f11200569f6967f6bff1d605ade98e13
   capistrano-rails (1.7.0) sha256=aca57455e8c5435785e0f938e16aa5b79c263694a755e1dca1c5d1743b40aae7
   capistrano-rails-console (2.3.0) sha256=32fc936a8f142837d1da8a9067d224356db7c9beb1baa63a64be6527421332bc

config/deploy.rb

@@ -1,14 +1,18 @@
 # frozen_string_literal: true
 
 # config valid for current version and patch releases of Capistrano
-lock "~> 3.19.2"
+lock "~> 3.20.1"
 
 SSHKit.config.command_map[:sidekiq] = 'bundle exec sidekiq'
 SSHKit.config.command_map[:sidekiqctl] = 'bundle exec sidekiqctl'
 
 set :rbenv_type, :user
 set :rbenv_ruby, '3.4.7'
 
+set :nvm_type, :user # or :system, depends on your nvm setup
+set :nvm_node, "v22.14.0"
+set :nvm_map_bins, %w(node npm rake)
+
 set :application, "metadecidim"
 set :repo_url, "https://github.com/decidim/metadecidim.git"
 
@@ -57,8 +61,7 @@
   task :decidim_webpacker_install do
     on roles(:all) do
       within release_path do
-        execute :'. ~/.nvm/nvm.sh'
-        execute 'npm', 'ci'
+        execute :npm, 'ci'
       end
     end
   end

package-lock.json

@@ -19,8 +19,8 @@
     "shakapacker": "^9.7.0"
   },
   "engines": {
-    "node": "18.17.1",
-    "npm": "9.6.7",
+    "node": "22.14.0",
+    "npm": ">=10.0.0",
     "yarn": "~1.22.1"
   }
 }

package.json

@@ -13,7 +13,7 @@
   describe 'Sign Up' do
     context 'when using email and password' do
       it 'ask confirmations on new Users' do
-        find('a[href="/users/sign_up"').click
+        visit decidim.new_user_registration_path
 
         within '.new_user' do
           fill_in :registration_user_email, with: 'user@example.org'

spec/features/authentication_spec.rb

@@ -13,7 +13,7 @@
     visit decidim.root_path
     # By default there isn't any Content Block enabled, so we search a content from the header
     within ".main-bar" do
-      expect(page).to have_content('Help')
+      expect(page).to have_content('Log in')
     end
   end
 end

spec/features/homepage_spec.rb

@@ -7,14 +7,6 @@
   let(:user) { create :user, :confirmed }
 
   before do
-    Decidim::ContentBlock.create!(
-      organization:,
-      scope_name: :homepage,
-      scoped_resource_id: nil,
-      manifest_name: :global_menu,
-      published_at: Time.zone.now
-    )
-
     switch_to_host(organization.host)
   end
 
@@ -36,7 +28,9 @@
     it "the main menu has the Metadecidim elements" do
       visit decidim.root_path
 
-      within "#home__menu" do
+      find("#main-dropdown-summary-desktop").click
+
+      within "#breadcrumb-main-dropdown-desktop" do
         expect(page).to have_content("Start here")
         expect(page).to have_content("Participate")
         expect(page).to have_content("The Association")
@@ -65,7 +59,7 @@
     it "the breadcrumb menu has the Metadecidim elements" do
       visit decidim.pages_path
 
-      find("a.menu-bar__breadcrumb-desktop__dropdown-trigger").sibling("button[data-controller='dropdown']").hover
+      find("#main-dropdown-summary-desktop").click
 
       within "#breadcrumb-main-dropdown-desktop" do
         expect(page).to have_content("Home")
@@ -89,7 +83,9 @@
       end
 
       specify "the menu is translated" do
-        within "#home__menu" do
+        find("#main-dropdown-summary-desktop").click
+
+        within "#breadcrumb-main-dropdown-desktop" do
           expect(page).to have_content("Comença aquí")
           expect(page).to have_content("Participa")
           expect(page).to have_content("L'Associació")
@@ -108,7 +104,7 @@
       end
 
       specify "the menu is customized" do
-        click_on "Main menu"
+        find("#main-dropdown-summary-mobile").click
 
         within "#breadcrumb-main-dropdown-mobile" do
           expect(page).to have_content("Home")