Skip to content

Commit

Permalink
Revert "Merge pull request rails#35211 from y-yagi/fix_broken_associa…
Browse files Browse the repository at this point in the history
…tion_test"

This reverts commit 38f9e41, reversing
changes made to 5e493c3.

Reason: The ajv@6.9.1 was released that fixes issue.
  • Loading branch information
y-yagi committed Feb 10, 2019
1 parent 38f9e41 commit 6823f72
Showing 1 changed file with 0 additions and 16 deletions.
16 changes: 0 additions & 16 deletions railties/test/isolation/abstract_unit.rb
Expand Up @@ -488,22 +488,6 @@ class ActiveSupport::TestCase
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")
Expand Down

0 comments on commit 6823f72

Please sign in to comment.