Skip to content

Commit c359ee4

Browse files
authored
Merge pull request #51 from tf/rails-7
Run specs against Rails 7
2 parents a79ca95 + 6d032e7 commit c359ee4

File tree

6 files changed

+20
-2
lines changed

6 files changed

+20
-2
lines changed

.github/workflows/tests.yml

+2
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,8 @@ jobs:
2525
gemfile: gemfiles/rails_6.x_active_admin_2.x.gemfile
2626
- ruby-version: '3.0'
2727
gemfile: gemfiles/rails_6.x_active_admin_3.x.gemfile
28+
- ruby-version: '3.0'
29+
gemfile: gemfiles/rails_7.x_active_admin_3.x.gemfile
2830

2931
env:
3032
BUNDLE_GEMFILE: ${{ matrix.gemfile }}

.gitignore

+2
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,8 @@ Gemfile.lock
66
/pkg/*
77
/spec/internal/tmp
88
/spec/internal/db/*.sqlite
9+
/spec/internal/db/*.sqlite-shm
10+
/spec/internal/db/*.sqlite-wal
911
/spec/examples.txt
1012
/src
1113
/node_modules

Appraisals

+5
Original file line numberDiff line numberDiff line change
@@ -22,3 +22,8 @@ appraise 'rails-6.x-active-admin-3.x' do
2222
gem 'rails', '~> 6.1'
2323
gem 'activeadmin', '~> 3.0'
2424
end
25+
26+
appraise 'rails-7.x-active-admin-3.x' do
27+
gem 'rails', '~> 7.1'
28+
gem 'activeadmin', '~> 3.0'
29+
end

activeadmin-searchable_select.gemspec

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ Gem::Specification.new do |spec|
2121
spec.add_development_dependency 'appraisal', '~> 2.2'
2222
spec.add_development_dependency 'rspec-rails', '~> 3.6'
2323
spec.add_development_dependency 'combustion', '~> 1.0'
24-
spec.add_development_dependency 'database_cleaner', '~> 1.6'
24+
spec.add_development_dependency 'database_cleaner-active_record', '~> 2.1'
2525
spec.add_development_dependency 'sqlite3', '~> 1.3'
2626

2727
spec.add_development_dependency 'capybara', '~> 3.9'
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
# This file was generated by Appraisal
2+
3+
source "https://rubygems.org"
4+
5+
gem "sass-rails"
6+
gem "rails", "~> 7.1"
7+
gem "activeadmin", "~> 3.0"
8+
9+
gemspec path: "../"

spec/support/models.rb

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
require 'database_cleaner'
1+
require 'database_cleaner-active_record'
22

33
class User < ActiveRecord::Base; end
44

0 commit comments

Comments
 (0)