Skip to content

Commit

Permalink
Upgrade to Decidim v0.27 (#65)
Browse files Browse the repository at this point in the history
* Upgrade to Ruby 3.0.6

* Upgrade to Decidim 0.27

* Fix Rubocop

* Return broadcast(:invalid) instead of InvalidError

* Fix changes due to rubocop

* Rubocopify

* Fix SDGs filter

* Fix challenges filters

* Fix problems filters

* Fix solutions filters and update challenge

* Change CHANGELOG

* Fix command tests

* Fix SDGs tests

* Extract duplicated code

* Fix tests and move shared code to a command helper

---------

Co-authored-by: Oliver Valls <[email protected]>
Co-authored-by: Laura Jaime <[email protected]>
  • Loading branch information
3 people authored Nov 20, 2023
1 parent 7934d64 commit 4500aac
Show file tree
Hide file tree
Showing 85 changed files with 828 additions and 1,440 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/challenges_system_tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ on:
pull_request:

env:
RUBY_VERSION: 2.7.5
RUBY_VERSION: 3.0.6

jobs:
test-report:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/linters.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ on:
pull_request:

env:
RUBY_VERSION: 2.7.5
RUBY_VERSION: 3.0.6

jobs:
test-report:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/problems_system_tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ on:
pull_request:

env:
RUBY_VERSION: 2.7.5
RUBY_VERSION: 3.0.6

jobs:
test-report:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/sgds_system_tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ on:
pull_request:

env:
RUBY_VERSION: 2.7.5
RUBY_VERSION: 3.0.6

jobs:
test-report:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/solutions_system_tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ on:
pull_request:

env:
RUBY_VERSION: 2.7.5
RUBY_VERSION: 3.0.6

jobs:
test-report:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ on:
pull_request:

env:
RUBY_VERSION: 2.7.5
RUBY_VERSION: 3.0.6

jobs:
test-report:
Expand Down
1 change: 1 addition & 0 deletions .node-version
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
16.9.1
10 changes: 5 additions & 5 deletions .rubocop.yml
Original file line number Diff line number Diff line change
Expand Up @@ -65,12 +65,12 @@ AllCops:
# If a value is specified for TargetRubyVersion then it is used.
# Else if .ruby-version exists and it contains an MRI version it is used.
# Otherwise we fallback to the oldest officially supported Ruby version (2.0).
TargetRubyVersion: 2.7
TargetRubyVersion: 3.0

RSpec:
Patterns:
- "(?:^|/)spec/"
- "(?:^|/)test/"
RSpec:
Include:
- "(?:^|/)spec/"
- "(?:^|/)test/"

# Indent private/protected/public as deep as method definitions
Layout/AccessModifierIndentation:
Expand Down
2 changes: 1 addition & 1 deletion .ruby-version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
2.7.5
3.0.6
8 changes: 8 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,14 @@ Following Semantic Versioning 2.

## next version:

## Version 0.3.0 (MINOR)
- Increase minimum Decidim version to 0.27.4
- Refactor scope, category and SDG filters with Ransack
- Fix when save challenge in CRUD solutions when there is a associated problem.

## Version 0.2.1 (MINOR)
- Upgrade module's Ruby to 3.0.6

## Version 0.2.0 (MINOR)
- Increase minimum Decidim version to 0.26.2

Expand Down
9 changes: 6 additions & 3 deletions Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ source "https://rubygems.org"

ruby RUBY_VERSION

DECIDIM_VERSION = { git: "https://github.com/decidim/decidim", branch: "release/0.26-stable" }.freeze
DECIDIM_VERSION = { git: "https://github.com/decidim/decidim", branch: "release/0.27-stable" }.freeze

gem "decidim", DECIDIM_VERSION
gem "decidim-challenges", path: "."
Expand All @@ -16,6 +16,9 @@ gem "uglifier", "~> 4.1"
# More exactly in comments in the homepage and in processes cards in the processes listing
gem "nokogiri", "1.13.3"

# temporal solution while gems embrace new psych 4 (the default in Ruby 3.1) behavior.
gem "psych", "< 4"

group :development, :test do
gem "byebug", ">= 11.1.3"
gem "decidim-dev", DECIDIM_VERSION
Expand All @@ -28,7 +31,7 @@ group :development do
gem "faker"
gem "letter_opener_web", "~> 1.3"
gem "listen", "~> 3.1"
gem "spring", "~> 2.0"
gem "spring-watcher-listen", "~> 2.0"
gem "spring"
gem "spring-watcher-listen"
gem "web-console", "~> 3.5"
end
Loading

0 comments on commit 4500aac

Please sign in to comment.