Skip to content

Commit

Permalink
Upgrade Decidim 0.28 (#82)
Browse files Browse the repository at this point in the history
* init upgrade

* workflows

* rubocop config

* styles

* edit note form

* change photo galary

* fix photo form

* fix lib tests

* fix stylelint

* fix rubocop

* fix some tests, fix hide button

* fix hide button color

* fix snippets for map builder

* fix javascript_pack_tag

* fix new proposal form

* change the order of the sections

* change new proposal form

* fix gallery

* fix stylelint

* adapt the number of steps in the visualization for repoting proposals. Remove non used override

* Fix proposal answer templates (#84)

* remove extra code, override controller

* remove extra premissions spec

* fir order of avaliablity_options

* steps css

* fix tests

* fix non-system tests

* remove overriden file

* further cleaning of templates

* fix proposals tests

* fix edit notes specs

* fix edit notes links specs

* fix edit notes links specs

* fix reporting proposals in admin

* scope everything under reporting proposals. fix template management

* fix valuators bug using templates

* fix unit specs

* fix admin specs

* fix custom validations

* fix autocomplete in geocoding

* fix styles

* fix linked resources

* fix more tests

* fix editing proposals

* fix test

* fix comparizon overrides

* fix proposals tests

* fix additional buttons

* fix camera device

---------

Co-authored-by: Ivan Vergés <[email protected]>
  • Loading branch information
antopalidi and microstudi authored May 6, 2024
1 parent 899e38c commit 5527b48
Show file tree
Hide file tree
Showing 208 changed files with 6,442 additions and 8,740 deletions.
6 changes: 3 additions & 3 deletions .github/workflows/lint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,16 +8,16 @@ on:

env:
CI: "true"
RUBY_VERSION: 3.0.6
NODE_VERSION: 16.9.1
RUBY_VERSION: 3.1.1
NODE_VERSION: 18.17.1

jobs:
lint-report:
name: Linting
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v4
with:
fetch-depth: 1

Expand Down
20 changes: 17 additions & 3 deletions .github/workflows/test_integration.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@ on:
env:
CI: "true"
SIMPLECOV: "true"
RUBY_VERSION: 3.0.6
NODE_VERSION: 16.9.1
RUBY_VERSION: 3.1.1
NODE_VERSION: 18.17.1
RAILS_ENV: test
DATABASE_USERNAME: postgres
DATABASE_PASSWORD: postgres
Expand All @@ -34,7 +34,7 @@ jobs:

steps:

- uses: actions/checkout@v3
- uses: actions/checkout@v4
with:
fetch-depth: 1

Expand Down Expand Up @@ -98,6 +98,20 @@ jobs:
with:
fetch-depth: 1

- uses: nanasess/setup-chromedriver@v2
with:
chromedriver-version: 119.0.6045.105

- name: List Chrome
run: apt list --installed | grep chrome

- name: Remove Chrome
run: sudo apt remove google-chrome-stable

- uses: browser-actions/setup-chrome@v1
with:
chrome-version: 119.0.6045.105

- uses: ruby/setup-ruby@v1
with:
ruby-version: ${{ env.RUBY_VERSION }}
Expand Down
22 changes: 18 additions & 4 deletions .github/workflows/test_unit.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@ on:
env:
CI: "true"
SIMPLECOV: "true"
RUBY_VERSION: 3.0.6
NODE_VERSION: 16.9.1
RUBY_VERSION: 3.1.1
NODE_VERSION: 18.17.1

jobs:
test-unit:
Expand All @@ -34,10 +34,24 @@ jobs:
DATABASE_HOST: localhost

steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v4
with:
fetch-depth: 1

- uses: nanasess/setup-chromedriver@v2
with:
chromedriver-version: 119.0.6045.105

- name: List Chrome
run: apt list --installed | grep chrome

- name: Remove Chrome
run: sudo apt remove google-chrome-stable

- uses: browser-actions/setup-chrome@v1
with:
chrome-version: 119.0.6045.105

- uses: ruby/setup-ruby@v1
with:
ruby-version: ${{ env.RUBY_VERSION }}
Expand All @@ -52,4 +66,4 @@ jobs:
- name: Upload coverage reports to Codecov
uses: codecov/codecov-action@v3
with:
token: ${{ secrets.CODECOV_TOKEN }}
token: ${{ secrets.CODECOV_TOKEN }}
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -25,3 +25,5 @@ development_app
*.gem
node_modules/
npm_debug.log
tailwind.config.js
.rubocop-http*
4 changes: 1 addition & 3 deletions .rubocop.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,2 @@
inherit_from:
- .rubocop_ruby.yml
- .rubocop_rails.yml
- .rubocop-disabled.yml
- https://raw.githubusercontent.com/decidim/decidim/release/0.28-stable/.rubocop.yml
3 changes: 1 addition & 2 deletions .rubocop_ruby.yml
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ 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: 3.0
TargetRubyVersion: 3.1

# RSpec:
# Patterns:
Expand Down Expand Up @@ -1765,4 +1765,3 @@ Faker/DeprecatedArguments:
questions:
- number
- supplemental

2 changes: 1 addition & 1 deletion .ruby-version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
3.0.6
3.1.1
11 changes: 6 additions & 5 deletions Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,8 @@ gem "decidim", DECIDIM_VERSION
gem "decidim-reporting_proposals", path: "."

gem "bootsnap", "~> 1.7"
gem "faker", "~> 2.14"
gem "faker", "~> 3.2"
gem "puma", ">= 6.3.1"
gem "rspec", "~> 3.0"

group :development, :test do
Expand All @@ -28,11 +29,11 @@ group :development, :test do
end

group :development do
gem "letter_opener_web", "~> 2.0"
gem "letter_opener_web"
gem "listen", "~> 3.1"
gem "rubocop-faker"
gem "spring"
gem "spring-watcher-listen"
gem "rubocop-faker", "~> 1.1"
gem "spring", "~> 2.0"
gem "spring-watcher-listen", "~> 2.0"
gem "web-console"
end

Expand Down
Loading

0 comments on commit 5527b48

Please sign in to comment.