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
3 changes: 3 additions & 0 deletions gemfiles/Gemfile.rails61
Original file line number Diff line number Diff line change
Expand Up @@ -7,3 +7,6 @@ gem 'rails', '~> 6.1.0'
# Rails 6.1 does not support sqlite3 2.x; it specifies gem "sqlite3", "~> 1.4"
# in lib/active_record/connection_adapters/sqlite3_adapter.rb
gem 'sqlite3', '~> 1.7'

# Latest concurrent-ruby breaks Rails < 7.1. See https://github.com/rails/rails/issues/54260
gem 'concurrent-ruby', '1.3.4'
3 changes: 3 additions & 0 deletions gemfiles/Gemfile.rails70
Original file line number Diff line number Diff line change
Expand Up @@ -7,3 +7,6 @@ gem 'rails', '~> 7.0.0'
# Rails 7.0 does not support sqlite3 2.x; it specifies gem "sqlite3", "~> 1.4"
# in lib/active_record/connection_adapters/sqlite3_adapter.rb
gem 'sqlite3', '~> 1.7'

# Latest concurrent-ruby breaks Rails < 7.1. See https://github.com/rails/rails/issues/54260
gem 'concurrent-ruby', '1.3.4'
12 changes: 10 additions & 2 deletions ndr_error.gemspec
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,9 @@ $LOAD_PATH.push File.expand_path('lib', __dir__)
# Maintain your gem's version:
require 'ndr_error/version'

# Describe your gem and declare its dependencies:
# We list development dependencies for all Rails versions here.
# Rails version-specific dependencies can go in the relevant Gemfile.
# rubocop:disable Gemspec/DevelopmentDependencies
Gem::Specification.new do |s|
s.name = 'ndr_error'
s.version = NdrError::VERSION
Expand All @@ -28,7 +30,7 @@ Gem::Specification.new do |s|

s.add_dependency 'will_paginate'

s.add_dependency 'ndr_ui'
s.add_dependency 'ndr_ui', '< 5.0'

s.add_development_dependency 'pry'
s.add_development_dependency 'puma'
Expand All @@ -38,10 +40,16 @@ Gem::Specification.new do |s|
# cf. gemfiles/Gemfile.rails70
s.add_development_dependency 'sqlite3'

# Workaround build issue on GitHub Actions with ruby <= 3.1 when installing sass-embedded
# gem version 1.81.0: NoMethodError: undefined method `parse' for #<Psych::Parser...>
# https://bugs.ruby-lang.org/issues/19371
s.add_development_dependency 'psych', '< 5'

s.add_development_dependency 'mocha'
s.add_development_dependency 'test-unit', '~> 3.0'

s.add_development_dependency 'database_cleaner'
s.add_development_dependency 'ndr_dev_support', '>= 5.10'
s.add_development_dependency 'simplecov'
end
# rubocop:enable Gemspec/DevelopmentDependencies
17 changes: 17 additions & 0 deletions test/test_helper.rb
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,23 @@
# Instead, insert fixtures afresh between each test:
setup { DatabaseCleaner.start }
teardown { DatabaseCleaner.clean }

# assert_current_path is brittle with Chrome 132 on capybara 3.40.0
# Retry up to 3 times on error
def assert_current_path(path, **options, &optional_filter_block)
failures = 0
begin
super
rescue Selenium::WebDriver::Error::WebDriverError => e
failures += 1
if e.message.start_with?('aborted by navigation: loader has changed ' \
"while resolving nodes\n") && failures <= 3
# puts "Retrying after failure #{failures}: #{e.class} #{e.message}"
retry
end
raise
end
end
end

# Include all capybara + poltergeist config
Expand Down