Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 7 additions & 10 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,18 +6,15 @@ jobs:
env:
RAILS_ENV: test
DATABASE_URL: postgres://test:password@127.0.0.1:5432/grape_on_rails_test
BUNDLE_GEMFILE: ${{ github.workspace }}/gemfiles/${{ matrix.gemfile.file }}.gemfile
BUNDLE_GEMFILE: ${{ github.workspace }}/gemfiles/${{ matrix.entry.gemfile }}.gemfile
strategy:
fail-fast: false
matrix:
gemfile:
- { ruby: '2.7', file: rails_6 }
- { ruby: '3.0', file: rails_6_1 }
- { ruby: '3.1', file: rails_7 }
- { ruby: '3.2', file: rails_7 }
- { ruby: '3.3', file: rails_7 }
- { ruby: '3.4', file: rails_7 }
# - { ruby: '3.2' ,file: rails_edge }
entry:
- { ruby: '3.0', gemfile: rails_6_1 }
- { ruby: '3.2', gemfile: rails_7 }
- { ruby: '3.4', gemfile: rails_8 }
# - { ruby: '3.2', gemfile: rails_edge }
steps:
- uses: actions/checkout@v3
- name: Set up Ruby
Expand All @@ -36,7 +33,7 @@ jobs:
run: cp config/database.gha.yml config/database.yml
- uses: harmon758/postgresql-action@v1
with:
postgresql version: "14"
postgresql version: "17"
postgresql db: grape_on_rails_test
postgresql user: test
postgresql password: password
Expand Down
1 change: 1 addition & 0 deletions .rspec
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
--require spec_helper
--color
--format=documentation

2 changes: 1 addition & 1 deletion .rubocop.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ Style/FrozenStringLiteralComment:
Layout/LineLength:
Enabled: false

require:
plugins:
- rubocop-capybara
- rubocop-rails
- rubocop-rspec_rails
Expand Down
6 changes: 2 additions & 4 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 2025-02-20 15:23:50 UTC using RuboCop version 1.62.1.
# on 2025-09-26 12:55:58 UTC using RuboCop version 1.81.0.
# 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 @@ -14,7 +14,6 @@ Lint/EmptyBlock:

# Offense count: 1
# This cop supports unsafe autocorrection (--autocorrect-all).
# Configuration parameters: AutoCorrect.
RSpec/EmptyExampleGroup:
Exclude:
- 'spec/helpers/welcome_helper_spec.rb'
Expand All @@ -34,8 +33,7 @@ RSpec/RepeatedExample:
- 'spec/api/headers_spec.rb'

# Offense count: 5
# Configuration parameters: Include, CustomTransform, IgnoreMethods, IgnoreMetadata.
# Include: **/*_spec.rb
# Configuration parameters: CustomTransform, IgnoreMethods, IgnoreMetadata.
RSpec/SpecFilePathFormat:
Exclude:
- 'spec/api/headers_spec.rb'
Expand Down
1 change: 0 additions & 1 deletion .ruby-version

This file was deleted.

8 changes: 4 additions & 4 deletions Appraisals
Original file line number Diff line number Diff line change
@@ -1,9 +1,5 @@
# frozen_string_literal: true

appraise 'rails-6' do
gem 'rails', '~> 6.0'
end

appraise 'rails-6-1' do
gem 'rails', '~> 6.1'
end
Expand All @@ -12,6 +8,10 @@ appraise 'rails-7' do
gem 'rails', '~> 7.0'
end

appraise 'rails-8' do
gem 'rails', '~> 8.0'
end

appraise 'rails-edge' do
gem 'rails', github: 'rails/rails'
end
14 changes: 7 additions & 7 deletions Gemfile
Original file line number Diff line number Diff line change
@@ -1,17 +1,16 @@
source 'https://rubygems.org'
git_source(:github) { |repo| "https://github.com/#{repo}.git" }

# https://stackoverflow.com/questions/79360526/uninitialized-constant-activesupportloggerthreadsafelevellogger-nameerror
gem 'concurrent-ruby', '1.3.4'
gem 'concurrent-ruby'

# Bundle edge Rails instead: gem "rails", github: "rails/rails", branch: "main"
gem 'rails', '~> 7.0.8'
gem 'rails', '~> 8.0.3'

# The original asset pipeline for Rails [https://github.com/rails/sprockets-rails]
gem 'sprockets-rails'

# Use postgresql as the database for Active Record
gem 'pg', '~> 1.1'
gem 'pg'

# Use the Puma web server [https://github.com/puma/puma]
gem 'puma'
Expand Down Expand Up @@ -49,7 +48,7 @@ gem 'bootsnap', require: false
# Use Active Storage variants [https://guides.rubyonrails.org/active_storage_overview.html#transforming-images]
# gem "image_processing", "~> 1.2"

gem 'grape', '~> 2.1'
gem 'grape', '~> 2.4'
gem 'grape-swagger'

group :development, :test do
Expand All @@ -73,13 +72,14 @@ end
group :test do
# Use system testing [https://guides.rubyonrails.org/testing.html#system-testing]
gem 'capybara'
gem 'mutex_m'
gem 'rspec'
gem 'rspec-rails'
gem 'rubocop', '1.62.1'
gem 'rubocop'
gem 'rubocop-capybara'
gem 'rubocop-rails'
gem 'rubocop-rake'
gem 'rubocop-rspec'
gem 'rubocop-rspec_rails'
gem 'selenium-webdriver', '4.20'
gem 'selenium-webdriver'
end
Loading