Skip to content
Open
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
2 changes: 1 addition & 1 deletion .github/workflows/lint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ jobs:
- name: Set up Ruby
uses: ruby/setup-ruby@0dafeac902942906541bc140009cdbf32665b601 # ruby/setup-ruby@v1 see https://github.com/ruby/setup-ruby/tree/v1
with:
ruby-version: '3.3'
ruby-version: '4.0'
- name: Install dependencies
run: bundle install
- name: Run RuboCop against BASE..HEAD changes
Expand Down
3 changes: 2 additions & 1 deletion .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,13 +8,14 @@ jobs:
fail-fast: false
matrix:
ruby-version:
- '3.2'
- '3.3'
- '3.4'
- '4.0'
gemfile:
- gemfiles/Gemfile.rails71
- gemfiles/Gemfile.rails72
- gemfiles/Gemfile.rails80
- gemfiles/Gemfile.rails81
exclude:
# rails 8.0 requires ruby >= 3.2
# https://www.fastruby.io/blog/ruby/rails/versions/compatibility-table.html
Expand Down
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
## [Unreleased]
### Fixed
* Support Ruby 3.4. Drop support for Rails 7.0, Ruby 3.1
* Support Ruby 4.0, Rails 8.1. Drop support for Ruby 3.2

## 0.4.3 / 2024-11-19
### Added
Expand Down
6 changes: 6 additions & 0 deletions gemfiles/Gemfile.rails81
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
source 'https://rubygems.org'

gemspec path: '..'

gem 'activerecord', '~> 8.1.0'
gem 'activesupport', '~> 8.1.0'
4 changes: 2 additions & 2 deletions ndr_browser_timings.gemspec
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,9 @@ Gem::Specification.new do |spec|
spec.files = `git ls-files -z`.split("\x0").
select { |f| gem_files.include?(f.split('/')[0]) }

spec.add_dependency 'rails', '>= 7.1', '< 8.1'
spec.add_dependency 'rails', '>= 7.1', '< 8.2'

spec.required_ruby_version = '>= 3.2.0'
spec.required_ruby_version = '>= 3.3'

spec.add_development_dependency 'mocha'
spec.add_development_dependency 'ndr_dev_support', '>= 6.0'
Expand Down
11 changes: 5 additions & 6 deletions test/test_helper.rb
Original file line number Diff line number Diff line change
Expand Up @@ -17,12 +17,11 @@
Minitest.backtrace_filter = Minitest::BacktraceFilter.new

# Load fixtures from the engine
if ActiveSupport::TestCase.respond_to?(:fixture_path=)
ActiveSupport::TestCase.fixture_path = File.expand_path('fixtures', __dir__)
ActionDispatch::IntegrationTest.fixture_path = ActiveSupport::TestCase.fixture_path
ActiveSupport::TestCase.file_fixture_path = ActiveSupport::TestCase.fixture_path + '/files'
ActiveSupport::TestCase.fixtures :all
end
fixtures_dir = File.expand_path('fixtures', __dir__)
ActiveSupport::TestCase.fixture_paths << fixtures_dir # Rails >= 7.1
ActionDispatch::IntegrationTest.fixture_paths << fixtures_dir
ActiveSupport::TestCase.file_fixture_path = "#{fixtures_dir}/files"
ActiveSupport::TestCase.fixtures :all

ActiveSupport::TestCase.class_eval do
def capture_recordings
Expand Down