diff options
| author | Yuji Yaginuma <yuuji.yaginuma@gmail.com> | 2019-02-11 09:55:32 +0900 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-02-11 09:55:32 +0900 |
| commit | 9099d66bc38f2e560613258f520d46df624d99c0 (patch) | |
| tree | 612e398a59ed9234bddc4fce5249be963b71822a /railties | |
| parent | 38f9e41f2c4b64377ffb036c53873dbfb51546cf (diff) | |
| download | rails-9099d66bc38f2e560613258f520d46df624d99c0.tar.gz rails-9099d66bc38f2e560613258f520d46df624d99c0.tar.bz2 rails-9099d66bc38f2e560613258f520d46df624d99c0.zip | |
Revert "Merge pull request #35211 from y-yagi/fix_broken_association_test" (#35217)
This reverts commit 38f9e41f2c4b64377ffb036c53873dbfb51546cf, reversing
changes made to 5e493c3b839f10d639f5cce1f1b9ff9292702821.
Reason: The ajv@6.9.1 was released that fixes issue.
Diffstat (limited to 'railties')
| -rw-r--r-- | railties/test/isolation/abstract_unit.rb | 16 |
1 files changed, 0 insertions, 16 deletions
diff --git a/railties/test/isolation/abstract_unit.rb b/railties/test/isolation/abstract_unit.rb index 0ff4c03f4a..ca7601f6fe 100644 --- a/railties/test/isolation/abstract_unit.rb +++ b/railties/test/isolation/abstract_unit.rb @@ -488,22 +488,6 @@ 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") |