Skip to content

Add Ruby 3.3 to CI matrix - Drop Travis gem, ruby_dep gem, files gem #1007

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 3 commits into
base: develop
Choose a base branch
from
Open
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
2 changes: 1 addition & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
@@ -14,7 +14,7 @@ jobs:
strategy:
fail-fast: false
matrix:
ruby: ['2.7']
ruby: ['2.7', '3.3']

steps:
- name: Checkout
1 change: 1 addition & 0 deletions .rubocop.yml
Original file line number Diff line number Diff line change
@@ -11,6 +11,7 @@ AllCops:
- 'spec/fixtures/**/*'
- 'tmp/**/*'
- 'spec/integration/**/*'
- 'Guardfile'
NewCops: enable

Metrics/BlockLength:
3 changes: 0 additions & 3 deletions Gemfile
Original file line number Diff line number Diff line change
@@ -8,7 +8,6 @@ gem 'rake', require: false
group :development do
gem 'bump'
gem 'mg', require: false
gem 'travis', require: false
platforms :mri, :mingw do
gem 'yard', require: false
end
@@ -29,7 +28,6 @@ group :development, :test do
gem 'coveralls'

gem 'overcommit'
gem 'ruby_dep', '1.5.0'

platforms :mri, :mingw do
gem 'pry', require: false
@@ -38,6 +36,5 @@ group :development, :test do
end

group :test do
gem 'files', require: false
gem 'git', require: false
end
24 changes: 11 additions & 13 deletions spec/lib/annotate/annotate_models_spec.rb
Original file line number Diff line number Diff line change
@@ -3,7 +3,7 @@
require 'annotate/annotate_models'
require 'annotate/active_record_patch'
require 'active_support/core_ext/string'
require 'files'
require 'pathname'
require 'tmpdir'

describe AnnotateModels do
@@ -2014,18 +2014,16 @@ def mock_column(name, type, options = {})

context 'when `model_dir` is valid' do
let(:model_dir) do
Files do
file 'foo.rb'
dir 'bar' do
file 'baz.rb'
dir 'qux' do
file 'quux.rb'
end
end
dir 'concerns' do
file 'corge.rb'
end
end
dir = Pathname(Dir.mktmpdir('annotate_models'))
dir.join('bar').mkdir
dir.join('bar', 'qux').mkdir
dir.join('concerns').mkdir

dir.join('foo.rb').write('')
dir.join('bar', 'baz.rb').write('')
dir.join('bar', 'qux', 'quux.rb').write('')
dir.join('concerns', 'corge.rb').write('')
dir
end

context 'when the model files are not specified' do