Skip to content

Commit c0a88c3

Browse files
committed
Fix tests
1 parent 00e09fd commit c0a88c3

File tree

3 files changed

+7
-2
lines changed

3 files changed

+7
-2
lines changed

jsonapi-rails.gemspec

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ Gem::Specification.new do |spec|
1818
spec.add_dependency 'jsonapi-parser', '~> 0.1.0'
1919

2020
spec.add_development_dependency 'rails', '~> 5.0'
21-
spec.add_development_dependency 'sqlite3'
21+
spec.add_development_dependency 'sqlite3', '~> 1.3.6'
2222
spec.add_development_dependency 'rake', '~> 11.3'
2323
spec.add_development_dependency 'rspec-rails', '~> 3.5'
2424
spec.add_development_dependency 'with_model', '~> 2.0'

spec/dummy/config/initializers/new_framework_defaults.rb

+3-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,9 @@
1818
Rails.application.config.active_record.belongs_to_required_by_default = true
1919

2020
# Do not halt callback chains when a callback returns false. Previous versions had true.
21-
ActiveSupport.halt_callback_chains_on_return_false = false
21+
if Rails.version < '5.2'
22+
ActiveSupport.halt_callback_chains_on_return_false = false
23+
end
2224

2325
# Configure SSL options to enable HSTS with subdomains. Previous versions had false.
2426
Rails.application.config.ssl_options = { hsts: { subdomains: true } }
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
if Rails.version >= '5.1.0' && Rails.application.config.active_record.sqlite3.present?
2+
Rails.application.config.active_record.sqlite3.represent_boolean_as_integer = true
3+
end

0 commit comments

Comments
 (0)