From 85fa5ca93fed043ce260b79297416ba67f8d9cd8 Mon Sep 17 00:00:00 2001 From: Mattia Roccoberton Date: Sat, 21 Oct 2023 09:38:43 +0200 Subject: [PATCH 1/2] test: update master branch --- .github/workflows/linters.yml | 4 ++-- .github/workflows/specs_mysql_60.yml | 4 ++-- .github/workflows/specs_mysql_61.yml | 4 ++-- .github/workflows/specs_mysql_70.yml | 4 ++-- .github/workflows/specs_postgres_60.yml | 6 +++--- .github/workflows/specs_postgres_61.yml | 6 +++--- .github/workflows/specs_postgres_70.yml | 6 +++--- 7 files changed, 17 insertions(+), 17 deletions(-) diff --git a/.github/workflows/linters.yml b/.github/workflows/linters.yml index fc7bedf..877eb61 100644 --- a/.github/workflows/linters.yml +++ b/.github/workflows/linters.yml @@ -3,9 +3,9 @@ name: Linters on: pull_request: - branches: [master] + branches: [main] push: - branches: [master] + branches: [main] jobs: reviewdog: diff --git a/.github/workflows/specs_mysql_60.yml b/.github/workflows/specs_mysql_60.yml index f31e792..819b0b0 100644 --- a/.github/workflows/specs_mysql_60.yml +++ b/.github/workflows/specs_mysql_60.yml @@ -3,9 +3,9 @@ name: Specs Rails 6.0 MySQL on: pull_request: - branches: [master] + branches: [main] push: - branches: [master] + branches: [main] jobs: tests: diff --git a/.github/workflows/specs_mysql_61.yml b/.github/workflows/specs_mysql_61.yml index 5a614b2..5a1a5b8 100644 --- a/.github/workflows/specs_mysql_61.yml +++ b/.github/workflows/specs_mysql_61.yml @@ -3,9 +3,9 @@ name: Specs Rails 6.1 MySQL on: pull_request: - branches: [master] + branches: [main] push: - branches: [master] + branches: [main] jobs: tests: diff --git a/.github/workflows/specs_mysql_70.yml b/.github/workflows/specs_mysql_70.yml index fc0c560..6a5249e 100644 --- a/.github/workflows/specs_mysql_70.yml +++ b/.github/workflows/specs_mysql_70.yml @@ -3,9 +3,9 @@ name: Specs Rails 7.0 MySQL on: pull_request: - branches: [master] + branches: [main] push: - branches: [master] + branches: [main] jobs: tests: diff --git a/.github/workflows/specs_postgres_60.yml b/.github/workflows/specs_postgres_60.yml index 5c27d09..ce2bcdd 100644 --- a/.github/workflows/specs_postgres_60.yml +++ b/.github/workflows/specs_postgres_60.yml @@ -3,9 +3,9 @@ name: Specs Rails 6.0 Postgres on: pull_request: - branches: [master] + branches: [main] push: - branches: [master] + branches: [main] jobs: tests: @@ -58,7 +58,7 @@ jobs: run: bundle exec rspec --profile # - name: Upload coverage results - # uses: actions/upload-artifact@master + # uses: actions/upload-artifact@main # if: always() # with: # name: coverage-report diff --git a/.github/workflows/specs_postgres_61.yml b/.github/workflows/specs_postgres_61.yml index 971ffe6..72232cc 100644 --- a/.github/workflows/specs_postgres_61.yml +++ b/.github/workflows/specs_postgres_61.yml @@ -3,9 +3,9 @@ name: Specs Rails 6.1 Postgres on: pull_request: - branches: [master] + branches: [main] push: - branches: [master] + branches: [main] jobs: tests: @@ -58,7 +58,7 @@ jobs: run: bundle exec rspec --profile # - name: Upload coverage results - # uses: actions/upload-artifact@master + # uses: actions/upload-artifact@main # if: always() # with: # name: coverage-report diff --git a/.github/workflows/specs_postgres_70.yml b/.github/workflows/specs_postgres_70.yml index c959a54..932787c 100644 --- a/.github/workflows/specs_postgres_70.yml +++ b/.github/workflows/specs_postgres_70.yml @@ -3,9 +3,9 @@ name: Specs Rails 7.0 Postgres on: pull_request: - branches: [master] + branches: [main] push: - branches: [master] + branches: [main] jobs: tests: @@ -66,7 +66,7 @@ jobs: ${{github.workspace}}/coverage/lcov/active_storage_db.lcov:lcov # - name: Upload coverage results - # uses: actions/upload-artifact@master + # uses: actions/upload-artifact@main # if: always() # with: # name: coverage-report From 9f1d0e577cd039e42db6a1564b0465d92f38d7d6 Mon Sep 17 00:00:00 2001 From: Mattia Roccoberton Date: Sat, 21 Oct 2023 09:33:50 +0200 Subject: [PATCH 2/2] test: update test suite dependencies --- .reviewdog.yml | 3 --- .tool-versions | 1 + Appraisals | 2 -- Gemfile | 1 - bin/code_climate_reek | 29 ------------------------ bin/reek | 29 ------------------------ gemfiles/rails_6_0_mysql.gemfile | 1 - gemfiles/rails_6_0_mysql.gemfile.lock | 15 ++++-------- gemfiles/rails_6_0_postgres.gemfile | 1 - gemfiles/rails_6_0_postgres.gemfile.lock | 11 ++++----- gemfiles/rails_6_1_mysql.gemfile | 1 - gemfiles/rails_6_1_mysql.gemfile.lock | 15 ++++-------- gemfiles/rails_6_1_postgres.gemfile | 1 - gemfiles/rails_6_1_postgres.gemfile.lock | 11 ++++----- gemfiles/rails_7_0_mysql.gemfile | 1 - gemfiles/rails_7_0_mysql.gemfile.lock | 15 ++++-------- gemfiles/rails_7_0_postgres.gemfile | 1 - gemfiles/rails_7_0_postgres.gemfile.lock | 13 ++++------- 18 files changed, 30 insertions(+), 121 deletions(-) create mode 100644 .tool-versions delete mode 100755 bin/code_climate_reek delete mode 100755 bin/reek diff --git a/.reviewdog.yml b/.reviewdog.yml index 342a9d4..5fea210 100644 --- a/.reviewdog.yml +++ b/.reviewdog.yml @@ -5,9 +5,6 @@ runner: fasterer: cmd: bin/fasterer level: info - reek: - cmd: bin/reek - level: info rubocop: cmd: bin/rubocop level: info diff --git a/.tool-versions b/.tool-versions new file mode 100644 index 0000000..ac0b5a2 --- /dev/null +++ b/.tool-versions @@ -0,0 +1 @@ +postgres 14.6 diff --git a/Appraisals b/Appraisals index efbb876..476ff32 100644 --- a/Appraisals +++ b/Appraisals @@ -13,8 +13,6 @@ end appraise 'rails-7_0-postgres' do gem 'pg' gem 'rails', '~> 7.0.0' - - # gem 'net-http' # NOTE: tried to solve a work related to already initialized Net::ProtocRetryError end appraise 'rails-6_0-mysql' do diff --git a/Gemfile b/Gemfile index cf6b15e..6885217 100644 --- a/Gemfile +++ b/Gemfile @@ -20,7 +20,6 @@ group :development, :test do # Linters gem 'brakeman' gem 'fasterer' - gem 'reek' gem 'rubocop' gem 'rubocop-packaging' gem 'rubocop-performance' diff --git a/bin/code_climate_reek b/bin/code_climate_reek deleted file mode 100755 index 9bb9536..0000000 --- a/bin/code_climate_reek +++ /dev/null @@ -1,29 +0,0 @@ -#!/usr/bin/env ruby -# frozen_string_literal: true - -# -# This file was generated by Bundler. -# -# The application 'code_climate_reek' is installed as part of a gem, and -# this file is here to facilitate running it. -# - -require "pathname" -ENV["BUNDLE_GEMFILE"] ||= File.expand_path("../../Gemfile", - Pathname.new(__FILE__).realpath) - -bundle_binstub = File.expand_path("../bundle", __FILE__) - -if File.file?(bundle_binstub) - if File.read(bundle_binstub, 300) =~ /This file was generated by Bundler/ - load(bundle_binstub) - else - abort("Your `bin/bundle` was not generated by Bundler, so this binstub cannot run. -Replace `bin/bundle` by running `bundle binstubs bundler --force`, then run this command again.") - end -end - -require "rubygems" -require "bundler/setup" - -load Gem.bin_path("reek", "code_climate_reek") diff --git a/bin/reek b/bin/reek deleted file mode 100755 index cafe88d..0000000 --- a/bin/reek +++ /dev/null @@ -1,29 +0,0 @@ -#!/usr/bin/env ruby -# frozen_string_literal: true - -# -# This file was generated by Bundler. -# -# The application 'reek' is installed as part of a gem, and -# this file is here to facilitate running it. -# - -require "pathname" -ENV["BUNDLE_GEMFILE"] ||= File.expand_path("../../Gemfile", - Pathname.new(__FILE__).realpath) - -bundle_binstub = File.expand_path("../bundle", __FILE__) - -if File.file?(bundle_binstub) - if File.read(bundle_binstub, 300) =~ /This file was generated by Bundler/ - load(bundle_binstub) - else - abort("Your `bin/bundle` was not generated by Bundler, so this binstub cannot run. -Replace `bin/bundle` by running `bundle binstubs bundler --force`, then run this command again.") - end -end - -require "rubygems" -require "bundler/setup" - -load Gem.bin_path("reek", "reek") diff --git a/gemfiles/rails_6_0_mysql.gemfile b/gemfiles/rails_6_0_mysql.gemfile index 5d809ac..197b97c 100644 --- a/gemfiles/rails_6_0_mysql.gemfile +++ b/gemfiles/rails_6_0_mysql.gemfile @@ -14,7 +14,6 @@ group :development, :test do gem "selenium-webdriver" gem "brakeman" gem "fasterer" - gem "reek" gem "rubocop" gem "rubocop-packaging" gem "rubocop-performance" diff --git a/gemfiles/rails_6_0_mysql.gemfile.lock b/gemfiles/rails_6_0_mysql.gemfile.lock index a06a89f..54d5884 100644 --- a/gemfiles/rails_6_0_mysql.gemfile.lock +++ b/gemfiles/rails_6_0_mysql.gemfile.lock @@ -101,7 +101,6 @@ GEM activesupport (>= 5.0) i18n (1.10.0) concurrent-ruby (~> 1.0) - kwalify (0.7.2) loofah (2.14.0) crass (~> 1.0.2) nokogiri (>= 1.5.9) @@ -111,12 +110,12 @@ GEM matrix (0.4.2) method_source (1.0.0) mini_mime (1.1.2) + mini_portile2 (2.8.4) minitest (5.15.0) - mysql2 (0.5.3) + mysql2 (0.5.5) nio4r (2.5.8) - nokogiri (1.13.3-x86_64-darwin) - racc (~> 1.4) - nokogiri (1.13.3-x86_64-linux) + nokogiri (1.13.3) + mini_portile2 (~> 2.8.0) racc (~> 1.4) parallel (1.21.0) parser (3.1.1.0) @@ -159,10 +158,6 @@ GEM thor (>= 0.20.3, < 2.0) rainbow (3.1.1) rake (13.0.6) - reek (6.1.0) - kwalify (~> 0.7.0) - parser (~> 3.1.0) - rainbow (>= 2.0, < 4.0) regexp_parser (2.2.1) rexml (3.2.5) rspec-core (3.11.0) @@ -242,6 +237,7 @@ GEM zeitwerk (2.5.4) PLATFORMS + arm64-darwin-22 x86_64-darwin-21 x86_64-linux @@ -255,7 +251,6 @@ DEPENDENCIES mysql2 pry-rails rails (~> 6.0.0) - reek rspec-rails rspec_junit_formatter rubocop diff --git a/gemfiles/rails_6_0_postgres.gemfile b/gemfiles/rails_6_0_postgres.gemfile index 1509523..b9a071d 100644 --- a/gemfiles/rails_6_0_postgres.gemfile +++ b/gemfiles/rails_6_0_postgres.gemfile @@ -14,7 +14,6 @@ group :development, :test do gem "selenium-webdriver" gem "brakeman" gem "fasterer" - gem "reek" gem "rubocop" gem "rubocop-packaging" gem "rubocop-performance" diff --git a/gemfiles/rails_6_0_postgres.gemfile.lock b/gemfiles/rails_6_0_postgres.gemfile.lock index 3a73b05..426290a 100644 --- a/gemfiles/rails_6_0_postgres.gemfile.lock +++ b/gemfiles/rails_6_0_postgres.gemfile.lock @@ -101,7 +101,6 @@ GEM activesupport (>= 5.0) i18n (1.10.0) concurrent-ruby (~> 1.0) - kwalify (0.7.2) loofah (2.14.0) crass (~> 1.0.2) nokogiri (>= 1.5.9) @@ -111,8 +110,12 @@ GEM matrix (0.4.2) method_source (1.0.0) mini_mime (1.1.2) + mini_portile2 (2.8.4) minitest (5.15.0) nio4r (2.5.8) + nokogiri (1.13.3) + mini_portile2 (~> 2.8.0) + racc (~> 1.4) nokogiri (1.13.3-x86_64-darwin) racc (~> 1.4) nokogiri (1.13.3-x86_64-linux) @@ -159,10 +162,6 @@ GEM thor (>= 0.20.3, < 2.0) rainbow (3.1.1) rake (13.0.6) - reek (6.1.0) - kwalify (~> 0.7.0) - parser (~> 3.1.0) - rainbow (>= 2.0, < 4.0) regexp_parser (2.2.1) rexml (3.2.5) rspec-core (3.11.0) @@ -242,6 +241,7 @@ GEM zeitwerk (2.5.4) PLATFORMS + arm64-darwin-22 x86_64-darwin-21 x86_64-linux @@ -255,7 +255,6 @@ DEPENDENCIES pg pry-rails rails (~> 6.0.0) - reek rspec-rails rspec_junit_formatter rubocop diff --git a/gemfiles/rails_6_1_mysql.gemfile b/gemfiles/rails_6_1_mysql.gemfile index 7efd08e..556568d 100644 --- a/gemfiles/rails_6_1_mysql.gemfile +++ b/gemfiles/rails_6_1_mysql.gemfile @@ -14,7 +14,6 @@ group :development, :test do gem "selenium-webdriver" gem "brakeman" gem "fasterer" - gem "reek" gem "rubocop" gem "rubocop-packaging" gem "rubocop-performance" diff --git a/gemfiles/rails_6_1_mysql.gemfile.lock b/gemfiles/rails_6_1_mysql.gemfile.lock index 5e510bb..f67f7a6 100644 --- a/gemfiles/rails_6_1_mysql.gemfile.lock +++ b/gemfiles/rails_6_1_mysql.gemfile.lock @@ -105,7 +105,6 @@ GEM activesupport (>= 5.0) i18n (1.10.0) concurrent-ruby (~> 1.0) - kwalify (0.7.2) loofah (2.14.0) crass (~> 1.0.2) nokogiri (>= 1.5.9) @@ -115,12 +114,12 @@ GEM matrix (0.4.2) method_source (1.0.0) mini_mime (1.1.2) + mini_portile2 (2.8.4) minitest (5.15.0) - mysql2 (0.5.3) + mysql2 (0.5.5) nio4r (2.5.8) - nokogiri (1.13.3-x86_64-darwin) - racc (~> 1.4) - nokogiri (1.13.3-x86_64-linux) + nokogiri (1.13.3) + mini_portile2 (~> 2.8.0) racc (~> 1.4) parallel (1.21.0) parser (3.1.1.0) @@ -163,10 +162,6 @@ GEM thor (~> 1.0) rainbow (3.1.1) rake (13.0.6) - reek (6.1.0) - kwalify (~> 0.7.0) - parser (~> 3.1.0) - rainbow (>= 2.0, < 4.0) regexp_parser (2.2.1) rexml (3.2.5) rspec-core (3.11.0) @@ -245,6 +240,7 @@ GEM zeitwerk (2.5.4) PLATFORMS + arm64-darwin-22 x86_64-darwin-21 x86_64-linux @@ -258,7 +254,6 @@ DEPENDENCIES mysql2 pry-rails rails (~> 6.1.0) - reek rspec-rails rspec_junit_formatter rubocop diff --git a/gemfiles/rails_6_1_postgres.gemfile b/gemfiles/rails_6_1_postgres.gemfile index d0bcfb8..00d4388 100644 --- a/gemfiles/rails_6_1_postgres.gemfile +++ b/gemfiles/rails_6_1_postgres.gemfile @@ -14,7 +14,6 @@ group :development, :test do gem "selenium-webdriver" gem "brakeman" gem "fasterer" - gem "reek" gem "rubocop" gem "rubocop-packaging" gem "rubocop-performance" diff --git a/gemfiles/rails_6_1_postgres.gemfile.lock b/gemfiles/rails_6_1_postgres.gemfile.lock index 27b58a9..01716bb 100644 --- a/gemfiles/rails_6_1_postgres.gemfile.lock +++ b/gemfiles/rails_6_1_postgres.gemfile.lock @@ -105,7 +105,6 @@ GEM activesupport (>= 5.0) i18n (1.10.0) concurrent-ruby (~> 1.0) - kwalify (0.7.2) loofah (2.14.0) crass (~> 1.0.2) nokogiri (>= 1.5.9) @@ -115,8 +114,12 @@ GEM matrix (0.4.2) method_source (1.0.0) mini_mime (1.1.2) + mini_portile2 (2.8.4) minitest (5.15.0) nio4r (2.5.8) + nokogiri (1.13.3) + mini_portile2 (~> 2.8.0) + racc (~> 1.4) nokogiri (1.13.3-x86_64-darwin) racc (~> 1.4) nokogiri (1.13.3-x86_64-linux) @@ -163,10 +166,6 @@ GEM thor (~> 1.0) rainbow (3.1.1) rake (13.0.6) - reek (6.1.0) - kwalify (~> 0.7.0) - parser (~> 3.1.0) - rainbow (>= 2.0, < 4.0) regexp_parser (2.2.1) rexml (3.2.5) rspec-core (3.11.0) @@ -245,6 +244,7 @@ GEM zeitwerk (2.5.4) PLATFORMS + arm64-darwin-22 x86_64-darwin-21 x86_64-linux @@ -258,7 +258,6 @@ DEPENDENCIES pg pry-rails rails (~> 6.1.0) - reek rspec-rails rspec_junit_formatter rubocop diff --git a/gemfiles/rails_7_0_mysql.gemfile b/gemfiles/rails_7_0_mysql.gemfile index 82c6e4d..b70d461 100644 --- a/gemfiles/rails_7_0_mysql.gemfile +++ b/gemfiles/rails_7_0_mysql.gemfile @@ -14,7 +14,6 @@ group :development, :test do gem "selenium-webdriver" gem "brakeman" gem "fasterer" - gem "reek" gem "rubocop" gem "rubocop-packaging" gem "rubocop-performance" diff --git a/gemfiles/rails_7_0_mysql.gemfile.lock b/gemfiles/rails_7_0_mysql.gemfile.lock index cb29059..dce30f4 100644 --- a/gemfiles/rails_7_0_mysql.gemfile.lock +++ b/gemfiles/rails_7_0_mysql.gemfile.lock @@ -113,7 +113,6 @@ GEM i18n (1.10.0) concurrent-ruby (~> 1.0) io-wait (0.2.1) - kwalify (0.7.2) loofah (2.14.0) crass (~> 1.0.2) nokogiri (>= 1.5.9) @@ -123,8 +122,9 @@ GEM matrix (0.4.2) method_source (1.0.0) mini_mime (1.1.2) + mini_portile2 (2.8.4) minitest (5.15.0) - mysql2 (0.5.3) + mysql2 (0.5.5) net-imap (0.2.3) digest net-protocol @@ -141,9 +141,8 @@ GEM net-protocol timeout nio4r (2.5.8) - nokogiri (1.13.3-x86_64-darwin) - racc (~> 1.4) - nokogiri (1.13.3-x86_64-linux) + nokogiri (1.13.3) + mini_portile2 (~> 2.8.0) racc (~> 1.4) parallel (1.21.0) parser (3.1.1.0) @@ -186,10 +185,6 @@ GEM zeitwerk (~> 2.5) rainbow (3.1.1) rake (13.0.6) - reek (6.1.0) - kwalify (~> 0.7.0) - parser (~> 3.1.0) - rainbow (>= 2.0, < 4.0) regexp_parser (2.2.1) rexml (3.2.5) rspec-core (3.11.0) @@ -263,6 +258,7 @@ GEM zeitwerk (2.5.4) PLATFORMS + arm64-darwin-22 x86_64-darwin-21 x86_64-linux @@ -276,7 +272,6 @@ DEPENDENCIES mysql2 pry-rails rails (~> 7.0.0) - reek rspec-rails rspec_junit_formatter rubocop diff --git a/gemfiles/rails_7_0_postgres.gemfile b/gemfiles/rails_7_0_postgres.gemfile index 1603e6d..0ec78af 100644 --- a/gemfiles/rails_7_0_postgres.gemfile +++ b/gemfiles/rails_7_0_postgres.gemfile @@ -14,7 +14,6 @@ group :development, :test do gem "selenium-webdriver" gem "brakeman" gem "fasterer" - gem "reek" gem "rubocop" gem "rubocop-packaging" gem "rubocop-performance" diff --git a/gemfiles/rails_7_0_postgres.gemfile.lock b/gemfiles/rails_7_0_postgres.gemfile.lock index 36b24a3..c746e81 100644 --- a/gemfiles/rails_7_0_postgres.gemfile.lock +++ b/gemfiles/rails_7_0_postgres.gemfile.lock @@ -113,7 +113,6 @@ GEM i18n (1.10.0) concurrent-ruby (~> 1.0) io-wait (0.2.1) - kwalify (0.7.2) loofah (2.14.0) crass (~> 1.0.2) nokogiri (>= 1.5.9) @@ -123,6 +122,7 @@ GEM matrix (0.4.2) method_source (1.0.0) mini_mime (1.1.2) + mini_portile2 (2.8.4) minitest (5.15.0) net-imap (0.2.3) digest @@ -140,9 +140,8 @@ GEM net-protocol timeout nio4r (2.5.8) - nokogiri (1.13.3-x86_64-darwin) - racc (~> 1.4) - nokogiri (1.13.3-x86_64-linux) + nokogiri (1.13.3) + mini_portile2 (~> 2.8.0) racc (~> 1.4) parallel (1.21.0) parser (3.1.1.0) @@ -186,10 +185,6 @@ GEM zeitwerk (~> 2.5) rainbow (3.1.1) rake (13.0.6) - reek (6.1.0) - kwalify (~> 0.7.0) - parser (~> 3.1.0) - rainbow (>= 2.0, < 4.0) regexp_parser (2.2.1) rexml (3.2.5) rspec-core (3.11.0) @@ -263,6 +258,7 @@ GEM zeitwerk (2.5.4) PLATFORMS + arm64-darwin-22 x86_64-darwin-21 x86_64-linux @@ -276,7 +272,6 @@ DEPENDENCIES pg pry-rails rails (~> 7.0.0) - reek rspec-rails rspec_junit_formatter rubocop