Skip to content

Commit

Permalink
Fix: CI.
Browse files Browse the repository at this point in the history
  • Loading branch information
dblock committed Feb 20, 2025
1 parent a069ea7 commit ccab953
Show file tree
Hide file tree
Showing 10 changed files with 142 additions and 154 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/rubocop.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,6 @@ jobs:
- name: Set up Ruby
uses: ruby/setup-ruby@v1
with:
ruby-version: "2.7"
ruby-version: "3.4"
bundler-cache: true
- run: bundle exec rubocop
6 changes: 2 additions & 4 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,8 @@ jobs:
fail-fast: false
matrix:
ruby:
- "2.7"
- "3.0"
- "3.1"
- "3.2"
- "3.4"
steps:
- uses: actions/checkout@v3
- name: Set up Ruby
Expand All @@ -23,7 +21,7 @@ jobs:
geckodriver-version: "0.32.2"
- uses: browser-actions/setup-firefox@v1
with:
firefox-version: "111.0.1"
firefox-version: "134.0.1"
- uses: coactions/setup-xvfb@v1
with:
run: |
Expand Down
6 changes: 4 additions & 2 deletions .rubocop.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,10 @@ Style/FrozenStringLiteralComment:

inherit_from: .rubocop_todo.yml

require:
- rubocop-capybara
plugins:
- rubocop-rake
- rubocop-rspec

require:
- rubocop-capybara

40 changes: 3 additions & 37 deletions .rubocop_todo.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# This configuration was generated by
# `rubocop --auto-gen-config`
# on 2023-11-08 18:43:53 UTC using RuboCop version 1.57.2.
# on 2025-02-20 14:43:43 UTC using RuboCop version 1.72.2.
# The point is for the user to remove these configuration records
# one by one as the offenses are removed from the code base.
# Note that changes in the inspected code, or installation of new
Expand All @@ -12,7 +12,7 @@ RSpec/BeEql:
Exclude:
- 'spec/api/documentation_spec.rb'

# Offense count: 14
# Offense count: 15
# Configuration parameters: Prefixes, AllowedPatterns.
# Prefixes: when, with, without
RSpec/ContextWording:
Expand All @@ -26,6 +26,7 @@ RSpec/ContextWording:

# Offense count: 1
# This cop supports unsafe autocorrection (--autocorrect-all).
# Configuration parameters: AutoCorrect.
RSpec/EmptyExampleGroup:
Exclude:
- 'spec/api/documentation_spec.rb'
Expand All @@ -40,27 +41,6 @@ RSpec/ExpectInHook:
Exclude:
- 'spec/api/documentation_spec.rb'

# Offense count: 15
# Configuration parameters: Include, CustomTransform, IgnoreMethods, SpecSuffixOnly.
# Include: **/*_spec*rb*, **/spec/**/*
RSpec/FilePath:
Exclude:
- 'spec/api/content_type_spec.rb'
- 'spec/api/cors_spec.rb'
- 'spec/api/documentation_spec.rb'
- 'spec/api/entities_spec.rb'
- 'spec/api/get_json_spec.rb'
- 'spec/api/header_versioning_spec.rb'
- 'spec/api/headers_spec.rb'
- 'spec/api/path_versioning_spec.rb'
- 'spec/api/ping_spec.rb'
- 'spec/api/post_json_spec.rb'
- 'spec/api/post_put_spec.rb'
- 'spec/api/rescue_from_spec.rb'
- 'spec/api/stream_data_spec.rb'
- 'spec/api/upload_file_spec.rb'
- 'spec/api/wrap_response_spec.rb'

# Offense count: 9
# Configuration parameters: AssignmentOnly.
RSpec/InstanceVariable:
Expand Down Expand Up @@ -106,14 +86,6 @@ Rake/Desc:
Exclude:
- 'Rakefile'

# Offense count: 1
# This cop supports safe autocorrection (--autocorrect).
# Configuration parameters: EnforcedStyle.
# SupportedStyles: line_count_dependent, lambda, literal
Style/Lambda:
Exclude:
- 'app/acme_app.rb'

# Offense count: 1
# This cop supports unsafe autocorrection (--autocorrect-all).
Style/MapToHash:
Expand All @@ -125,12 +97,6 @@ Style/OpenStructUse:
Exclude:
- 'api/entities.rb'

# Offense count: 1
# This cop supports safe autocorrection (--autocorrect).
Style/RescueModifier:
Exclude:
- 'api/get_json.rb'

# Offense count: 1
# This cop supports unsafe autocorrection (--autocorrect-all).
# Configuration parameters: Mode.
Expand Down
2 changes: 2 additions & 0 deletions Gemfile
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
source 'http://rubygems.org'

gem 'builder'
gem 'grape'
gem 'grape-entity'
gem 'grape-swagger'
Expand All @@ -8,6 +9,7 @@ gem 'json'
gem 'mime-types'
gem 'newrelic_rpm'
gem 'nokogiri'
gem 'ostruct'
gem 'puma'
gem 'rack'
gem 'rack-cors'
Expand Down
Loading

0 comments on commit ccab953

Please sign in to comment.