diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml index ca4674a..e142e61 100644 --- a/.github/workflows/test.yaml +++ b/.github/workflows/test.yaml @@ -31,15 +31,10 @@ jobs: - name: Setup Ruby uses: ruby/setup-ruby@v1 with: - ruby-version: 3.2 + ruby-version: 3.3 bundler-cache: true - name: Run tests run: | bundle exec rails zeitwerk:check bundle exec rails db:migrate bundle exec rspec - - name: Report coverage - if: ${{ github.event_name == 'pull_request' }} - uses: romeovs/lcov-reporter-action@v0.3.1 - with: - lcov-file: ./coverage/lcov/shiori.lcov diff --git a/.tool-versions b/.tool-versions index f2a971a..1dd1998 100644 --- a/.tool-versions +++ b/.tool-versions @@ -1 +1 @@ -ruby 3.2.2 +ruby 3.3.5 diff --git a/Gemfile b/Gemfile index 297c384..d3a0e7a 100644 --- a/Gemfile +++ b/Gemfile @@ -1,7 +1,6 @@ source "https://rubygems.org" -git_source(:github) { |repo| "https://github.com/#{repo}.git" } -ruby "~> 3.2" +ruby "~> 3.3" # Rails gem "rails", "~> 7.0" @@ -42,8 +41,6 @@ group :development, :test do gem "faker" gem "timecop" gem "simplecov", require: false - # lcov files generated by simplecov-lcov are missing LF and LH fields, which are required by simplecov reporter - gem "simplecov-lcov", require: false, github: 't-mario-y/simplecov-lcov', branch: 'feature/write-LF-LH' end group :development do diff --git a/Gemfile.lock b/Gemfile.lock index ee58482..29d4532 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,87 +1,76 @@ -GIT - remote: https://github.com/t-mario-y/simplecov-lcov.git - revision: 476dafefe58047ff7820882d829e71df200ad573 - branch: feature/write-LF-LH - specs: - simplecov-lcov (0.8.0) - GEM remote: https://rubygems.org/ specs: - actioncable (7.1.2) - actionpack (= 7.1.2) - activesupport (= 7.1.2) + actioncable (7.2.1) + actionpack (= 7.2.1) + activesupport (= 7.2.1) nio4r (~> 2.0) websocket-driver (>= 0.6.1) zeitwerk (~> 2.6) - actionmailbox (7.1.2) - actionpack (= 7.1.2) - activejob (= 7.1.2) - activerecord (= 7.1.2) - activestorage (= 7.1.2) - activesupport (= 7.1.2) - mail (>= 2.7.1) - net-imap - net-pop - net-smtp - actionmailer (7.1.2) - actionpack (= 7.1.2) - actionview (= 7.1.2) - activejob (= 7.1.2) - activesupport (= 7.1.2) - mail (~> 2.5, >= 2.5.4) - net-imap - net-pop - net-smtp + actionmailbox (7.2.1) + actionpack (= 7.2.1) + activejob (= 7.2.1) + activerecord (= 7.2.1) + activestorage (= 7.2.1) + activesupport (= 7.2.1) + mail (>= 2.8.0) + actionmailer (7.2.1) + actionpack (= 7.2.1) + actionview (= 7.2.1) + activejob (= 7.2.1) + activesupport (= 7.2.1) + mail (>= 2.8.0) rails-dom-testing (~> 2.2) - actionpack (7.1.2) - actionview (= 7.1.2) - activesupport (= 7.1.2) + actionpack (7.2.1) + actionview (= 7.2.1) + activesupport (= 7.2.1) nokogiri (>= 1.8.5) racc - rack (>= 2.2.4) + rack (>= 2.2.4, < 3.2) rack-session (>= 1.0.1) rack-test (>= 0.6.3) rails-dom-testing (~> 2.2) rails-html-sanitizer (~> 1.6) - actiontext (7.1.2) - actionpack (= 7.1.2) - activerecord (= 7.1.2) - activestorage (= 7.1.2) - activesupport (= 7.1.2) + useragent (~> 0.16) + actiontext (7.2.1) + actionpack (= 7.2.1) + activerecord (= 7.2.1) + activestorage (= 7.2.1) + activesupport (= 7.2.1) globalid (>= 0.6.0) nokogiri (>= 1.8.5) - actionview (7.1.2) - activesupport (= 7.1.2) + actionview (7.2.1) + activesupport (= 7.2.1) builder (~> 3.1) erubi (~> 1.11) rails-dom-testing (~> 2.2) rails-html-sanitizer (~> 1.6) - activejob (7.1.2) - activesupport (= 7.1.2) + activejob (7.2.1) + activesupport (= 7.2.1) globalid (>= 0.3.6) - activemodel (7.1.2) - activesupport (= 7.1.2) - activerecord (7.1.2) - activemodel (= 7.1.2) - activesupport (= 7.1.2) + activemodel (7.2.1) + activesupport (= 7.2.1) + activerecord (7.2.1) + activemodel (= 7.2.1) + activesupport (= 7.2.1) timeout (>= 0.4.0) - activestorage (7.1.2) - actionpack (= 7.1.2) - activejob (= 7.1.2) - activerecord (= 7.1.2) - activesupport (= 7.1.2) + activestorage (7.2.1) + actionpack (= 7.2.1) + activejob (= 7.2.1) + activerecord (= 7.2.1) + activesupport (= 7.2.1) marcel (~> 1.0) - activesupport (7.1.2) + activesupport (7.2.1) base64 bigdecimal - concurrent-ruby (~> 1.0, >= 1.0.2) + concurrent-ruby (~> 1.0, >= 1.3.1) connection_pool (>= 2.2.5) drb i18n (>= 1.6, < 2) + logger (>= 1.4.2) minitest (>= 5.1) - mutex_m - tzinfo (~> 2.0) + securerandom (>= 0.3) + tzinfo (~> 2.0, >= 2.0.5) android_key_attestation (0.3.0) awrence (1.2.1) base64 (0.2.0) @@ -92,7 +81,7 @@ GEM builder (3.2.4) cbor (0.5.9.6) commonmarker (0.23.10) - concurrent-ruby (1.2.2) + concurrent-ruby (1.3.4) connection_pool (2.4.1) cose (1.3.0) cbor (~> 0.5.9) @@ -107,10 +96,10 @@ GEM drb (2.2.0) ruby2_keywords erubi (1.12.0) - factory_bot (6.2.1) + factory_bot (6.5.0) activesupport (>= 5.0.0) - factory_bot_rails (6.2.0) - factory_bot (~> 6.2.0) + factory_bot_rails (6.4.3) + factory_bot (~> 6.4) railties (>= 5.0.0) faker (3.2.0) i18n (>= 1.8.11, < 2) @@ -128,10 +117,11 @@ GEM i18n (1.14.1) concurrent-ruby (~> 1.0) io-console (0.7.1) - irb (1.11.0) - rdoc - reline (>= 0.3.8) + irb (1.14.0) + rdoc (>= 4.0.0) + reline (>= 0.4.2) jwt (2.7.1) + logger (1.6.1) loofah (2.22.0) crass (~> 1.0.2) nokogiri (>= 1.12.0) @@ -142,9 +132,9 @@ GEM net-smtp marcel (1.0.2) mini_mime (1.1.5) - minitest (5.20.0) + mini_portile2 (2.8.5) + minitest (5.25.1) msgpack (1.7.1) - mutex_m (0.2.0) net-imap (0.4.9) date net-protocol @@ -156,9 +146,8 @@ GEM net-protocol newrelic_rpm (9.3.0) nio4r (2.7.0) - nokogiri (1.15.5-arm64-darwin) - racc (~> 1.4) - nokogiri (1.15.5-x86_64-linux) + nokogiri (1.16.7) + mini_portile2 (~> 2.8.2) racc (~> 1.4) openssl (3.1.0) openssl-signature_algorithm (1.3.0) @@ -166,10 +155,10 @@ GEM pg (1.5.3) psych (5.1.2) stringio - puma (6.4.0) + puma (6.4.2) nio4r (~> 2.0) racc (1.7.3) - rack (3.0.8) + rack (3.1.7) rack-cors (1.1.1) rack (>= 2.0.0) rack-session (2.0.0) @@ -179,20 +168,20 @@ GEM rackup (2.1.0) rack (>= 3) webrick (~> 1.8) - rails (7.1.2) - actioncable (= 7.1.2) - actionmailbox (= 7.1.2) - actionmailer (= 7.1.2) - actionpack (= 7.1.2) - actiontext (= 7.1.2) - actionview (= 7.1.2) - activejob (= 7.1.2) - activemodel (= 7.1.2) - activerecord (= 7.1.2) - activestorage (= 7.1.2) - activesupport (= 7.1.2) + rails (7.2.1) + actioncable (= 7.2.1) + actionmailbox (= 7.2.1) + actionmailer (= 7.2.1) + actionpack (= 7.2.1) + actiontext (= 7.2.1) + actionview (= 7.2.1) + activejob (= 7.2.1) + activemodel (= 7.2.1) + activerecord (= 7.2.1) + activestorage (= 7.2.1) + activesupport (= 7.2.1) bundler (>= 1.15.0) - railties (= 7.1.2) + railties (= 7.2.1) rails-dom-testing (2.2.0) activesupport (>= 5.0.0) minitest @@ -200,10 +189,10 @@ GEM rails-html-sanitizer (1.6.0) loofah (~> 2.21) nokogiri (~> 1.14) - railties (7.1.2) - actionpack (= 7.1.2) - activesupport (= 7.1.2) - irb + railties (7.2.1) + actionpack (= 7.2.1) + activesupport (= 7.2.1) + irb (~> 1.13) rackup (>= 1.0.0) rake (>= 12.2) thor (~> 1.0, >= 1.2.2) @@ -215,7 +204,7 @@ GEM redis-client (>= 0.9.0) redis-client (0.14.1) connection_pool - reline (0.4.1) + reline (0.5.10) io-console (~> 0.5) rspec-core (3.12.2) rspec-support (~> 3.12.0) @@ -237,6 +226,7 @@ GEM ruby2_keywords (0.0.5) safety_net_attestation (0.4.0) jwt (~> 2.0) + securerandom (0.3.1) simplecov (0.22.0) docile (~> 1.1) simplecov-html (~> 0.11) @@ -253,6 +243,7 @@ GEM openssl-signature_algorithm (~> 1.0) tzinfo (2.0.6) concurrent-ruby (~> 1.0) + useragent (0.16.10) webauthn (3.0.0) android_key_attestation (~> 0.3.0) awrence (~> 1.1) @@ -269,8 +260,7 @@ GEM zeitwerk (2.6.12) PLATFORMS - arm64-darwin-22 - x86_64-linux + ruby DEPENDENCIES bootsnap @@ -292,13 +282,12 @@ DEPENDENCIES redis rspec-rails (~> 6.0) simplecov - simplecov-lcov! timecop tzinfo-data webauthn RUBY VERSION - ruby 3.2.2p53 + ruby 3.3.5p100 BUNDLED WITH - 2.4.12 + 2.5.18 diff --git a/db/schema.rb b/db/schema.rb index 8c8ad9d..83b3cd8 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -10,7 +10,7 @@ # # It's strongly recommended that you check this file into your version control system. -ActiveRecord::Schema[7.0].define(version: 2023_10_22_133724) do +ActiveRecord::Schema[7.1].define(version: 2023_10_22_133724) do # These are extensions that must be enabled in order to support this database enable_extension "plpgsql" diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb index 19320c6..10f580d 100644 --- a/spec/spec_helper.rb +++ b/spec/spec_helper.rb @@ -1,13 +1,7 @@ # SimpleCov should be loaded before any of application code require "simplecov" -require "simplecov-lcov" - -SimpleCov::Formatter::LcovFormatter.config.report_with_single_file = true -SimpleCov.formatters = SimpleCov::Formatter::MultiFormatter.new([ - SimpleCov::Formatter::HTMLFormatter, - SimpleCov::Formatter::LcovFormatter, -]) +SimpleCov.formatters = SimpleCov::Formatter::HTMLFormatter SimpleCov.start "rails" do add_filter "/spec/" end