From 3056fa5265a2890be8456c66250fe1343e2296c6 Mon Sep 17 00:00:00 2001 From: AyakorK Date: Thu, 6 Feb 2025 15:38:50 +0100 Subject: [PATCH 1/4] fix: Try to fix tests using gemfile from the dcd-app --- gemfiles/Gemfile | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/gemfiles/Gemfile b/gemfiles/Gemfile index 98f93b2..eec7555 100644 --- a/gemfiles/Gemfile +++ b/gemfiles/Gemfile @@ -11,23 +11,25 @@ gem "decidim-admin", DECIDIM_VERSION gem "decidim-core", DECIDIM_VERSION gem "decidim-gallery", path: ".." -gem "bootsnap", "~> 1.7" +gem "bootsnap", "~> 1.4" gem "faker", "~> 2.14" -gem "rspec", "~> 3.0" +gem "rspec", "~> 3.13" group :development, :test do + gem "brakeman", "~> 5.1" gem "byebug", "~> 11.0", platform: :mri - - gem "decidim-dev", DECIDIM_VERSION + gem "climate_control", "~> 1.2" + gem "decidim-dev", "~> #{DECIDIM_VERSION}.0" + gem "parallel_tests" end group :development do gem "letter_opener_web", "~> 1.3" gem "listen", "~> 3.1" - gem "rubocop-faker", "~> 1.1" + gem "rubocop-faker" gem "spring", "~> 2.0" gem "spring-watcher-listen", "~> 2.0" - gem "web-console" + gem "web-console", "~> 4.1" end group :test do From d06eb19ae16844e019ea35a7645c6e1f113f2dc3 Mon Sep 17 00:00:00 2001 From: AyakorK Date: Thu, 6 Feb 2025 15:44:14 +0100 Subject: [PATCH 2/4] fix: Fix tests --- gemfiles/Gemfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gemfiles/Gemfile b/gemfiles/Gemfile index eec7555..fd9412a 100644 --- a/gemfiles/Gemfile +++ b/gemfiles/Gemfile @@ -19,7 +19,7 @@ group :development, :test do gem "brakeman", "~> 5.1" gem "byebug", "~> 11.0", platform: :mri gem "climate_control", "~> 1.2" - gem "decidim-dev", "~> #{DECIDIM_VERSION}.0" + gem "decidim-dev", DECIDIM_VERSION gem "parallel_tests" end From d9154d97cc016b697dabf9352a066f23f98b75e9 Mon Sep 17 00:00:00 2001 From: AyakorK Date: Fri, 7 Feb 2025 15:04:46 +0100 Subject: [PATCH 3/4] fix: Try to add concurrent-ruby to fix the issue --- gemfiles/Gemfile | 2 ++ gemfiles/decidim_0.26.gemfile | 2 ++ 2 files changed, 4 insertions(+) diff --git a/gemfiles/Gemfile b/gemfiles/Gemfile index fd9412a..429dc61 100644 --- a/gemfiles/Gemfile +++ b/gemfiles/Gemfile @@ -15,6 +15,8 @@ gem "bootsnap", "~> 1.4" gem "faker", "~> 2.14" gem "rspec", "~> 3.13" +gem "concurrent-ruby", "~> 1.1" + group :development, :test do gem "brakeman", "~> 5.1" gem "byebug", "~> 11.0", platform: :mri diff --git a/gemfiles/decidim_0.26.gemfile b/gemfiles/decidim_0.26.gemfile index 88c57c7..598590e 100644 --- a/gemfiles/decidim_0.26.gemfile +++ b/gemfiles/decidim_0.26.gemfile @@ -15,6 +15,8 @@ gem "bootsnap", "~> 1.7" gem "faker", "~> 2.14" gem "rspec", "~> 3.0" +gem "concurrent-ruby", "~> 1.1" + group :development, :test do gem "byebug", "~> 11.0", platform: :mri From 76226c23e36bc6cf729bf4a92c1ea636c296b4ce Mon Sep 17 00:00:00 2001 From: AyakorK Date: Fri, 7 Feb 2025 15:25:41 +0100 Subject: [PATCH 4/4] fix: Add gems to ensure the loading of Active support record and rails --- gemfiles/Gemfile | 6 ++++-- gemfiles/decidim_0.26.gemfile | 7 ++++--- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/gemfiles/Gemfile b/gemfiles/Gemfile index 429dc61..38d760f 100644 --- a/gemfiles/Gemfile +++ b/gemfiles/Gemfile @@ -11,12 +11,14 @@ gem "decidim-admin", DECIDIM_VERSION gem "decidim-core", DECIDIM_VERSION gem "decidim-gallery", path: ".." +gem "activerecord", "~> 6.1" +gem "activesupport", "~> 6.1" +gem "rails", "~> 6.1.0" + gem "bootsnap", "~> 1.4" gem "faker", "~> 2.14" gem "rspec", "~> 3.13" -gem "concurrent-ruby", "~> 1.1" - group :development, :test do gem "brakeman", "~> 5.1" gem "byebug", "~> 11.0", platform: :mri diff --git a/gemfiles/decidim_0.26.gemfile b/gemfiles/decidim_0.26.gemfile index 598590e..d603f0a 100644 --- a/gemfiles/decidim_0.26.gemfile +++ b/gemfiles/decidim_0.26.gemfile @@ -11,15 +11,16 @@ gem "decidim-admin", DECIDIM_VERSION gem "decidim-core", DECIDIM_VERSION gem "decidim-gallery", path: ".." +gem "activerecord", "~> 6.0" +gem "activesupport", "~> 6.0" +gem "rails", "~> 6.0.0" + gem "bootsnap", "~> 1.7" gem "faker", "~> 2.14" gem "rspec", "~> 3.0" -gem "concurrent-ruby", "~> 1.1" - group :development, :test do gem "byebug", "~> 11.0", platform: :mri - gem "decidim-dev", DECIDIM_VERSION end