Skip to content

Commit

Permalink
Merge pull request #57 from solidusio/kennyadsl/lock-sprockets
Browse files Browse the repository at this point in the history
Fix project' specs
  • Loading branch information
kennyadsl authored Jan 19, 2021
2 parents 66074b4 + 894808c commit a39c8e8
Show file tree
Hide file tree
Showing 3 changed files with 13 additions and 1 deletion.
12 changes: 12 additions & 0 deletions Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -16,3 +16,15 @@ else
end

gemspec

# There is an issue with Sprockets 4 not accepting a custom path for
# the assets manifest, which doesn't play well with in-memory dummy
# apps such as the one we use in this gem.

# A fix was provided for sprockets-rails[1] but it was not accepted
# yet.

# [1]: rails/sprockets-rails#446
#
# Please do not remove this line until we have a solution.
gem 'sprockets', '~> 3'
1 change: 1 addition & 0 deletions solidus_support.gemspec
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ Gem::Specification.new do |s|
s.executables = s.files.grep(%r{^exe/}) { |f| File.basename(f) }
s.require_paths = ["lib"]

s.add_development_dependency 'rails'
s.add_development_dependency 'bundler'
s.add_development_dependency 'rake'
s.add_development_dependency 'rspec-rails'
Expand Down
1 change: 0 additions & 1 deletion spec/support/dummy_app.rb
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@ module DummyApp
class Application < ::Rails::Application
config.eager_load = false
config.paths['config/database'] = File.expand_path('dummy_app/database.yml', __dir__)
config.active_record.sqlite3.represent_boolean_as_integer = true unless Gem::Version.new(Rails.version) < Gem::Version.new('5.2')
end
end

Expand Down

0 comments on commit a39c8e8

Please sign in to comment.