diff options
| author | Yuji Yaginuma <yuuji.yaginuma@gmail.com> | 2019-02-10 16:23:03 +0900 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-02-10 16:23:03 +0900 |
| commit | 38f9e41f2c4b64377ffb036c53873dbfb51546cf (patch) | |
| tree | db6812071023441ad9fbdd6acd6dc86923f2e78d | |
| parent | 5e493c3b839f10d639f5cce1f1b9ff9292702821 (diff) | |
| parent | 7942d675b8e63de154cfcd67cde2db5fcba880c7 (diff) | |
| download | rails-38f9e41f2c4b64377ffb036c53873dbfb51546cf.tar.gz rails-38f9e41f2c4b64377ffb036c53873dbfb51546cf.tar.bz2 rails-38f9e41f2c4b64377ffb036c53873dbfb51546cf.zip | |
Merge pull request #35211 from y-yagi/fix_broken_association_test
Avoid ajv@6.9.0 for now
| -rw-r--r-- | railties/test/isolation/abstract_unit.rb | 16 |
1 files changed, 16 insertions, 0 deletions
diff --git a/railties/test/isolation/abstract_unit.rb b/railties/test/isolation/abstract_unit.rb index ca7601f6fe..0ff4c03f4a 100644 --- a/railties/test/isolation/abstract_unit.rb +++ b/railties/test/isolation/abstract_unit.rb @@ -488,6 +488,22 @@ Module.new do Dir.chdir(app_template_path) { `yarn add webpack@4.17.1 --tilde` } Dir.chdir(app_template_path) { `yarn add webpack-cli` } + # FIXME: Temporary fix for webpack + ajv@6.9.0 compatible issue. + # See https://github.com/epoberezkin/ajv/issues/941 + Dir.chdir(app_template_path) do + package = File.read("package.json") + resolutions = <<~EOS + , + "resolutions": { + "ajv": "6.8.1" + } + } + EOS + if package =~ /\n}\n\z/ + File.open("package.json", "w") { |f| f.puts $` + resolutions + $' } + end + end + # Fake 'Bundler.require' -- we run using the repo's Gemfile, not an # app-specific one: we don't want to require every gem that lists. contents = File.read("#{app_template_path}/config/application.rb") |