diff options
author | Guillermo Iguaran <guilleiguaran@gmail.com> | 2017-08-01 14:54:42 -0500 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-08-01 14:54:42 -0500 |
commit | f9a43f28c087f8ffd35ff7c33a60c938b60f2be2 (patch) | |
tree | 7d319abdb62afc4eafe9dca993bbfc545c68ea5f | |
parent | 38a79124424da5c34a2275cfd45c828ac4a089b2 (diff) | |
parent | dd439bfbda2a39b305b13f00c40d07c6a8c46d8c (diff) | |
download | rails-f9a43f28c087f8ffd35ff7c33a60c938b60f2be2.tar.gz rails-f9a43f28c087f8ffd35ff7c33a60c938b60f2be2.tar.bz2 rails-f9a43f28c087f8ffd35ff7c33a60c938b60f2be2.zip |
Merge pull request #30015 from larskanis/use-duktake-on-mingw
Use duktape gem as default JS engine on Windows-MINGW
-rw-r--r-- | railties/lib/rails/generators/app_base.rb | 2 | ||||
-rw-r--r-- | railties/test/generators/app_generator_test.rb | 2 |
2 files changed, 4 insertions, 0 deletions
diff --git a/railties/lib/rails/generators/app_base.rb b/railties/lib/rails/generators/app_base.rb index 760cb2f81e..4899a63917 100644 --- a/railties/lib/rails/generators/app_base.rb +++ b/railties/lib/rails/generators/app_base.rb @@ -348,6 +348,8 @@ module Rails comment = "See https://github.com/rails/execjs#readme for more supported runtimes" if defined?(JRUBY_VERSION) GemfileEntry.version "therubyrhino", nil, comment + elsif RUBY_PLATFORM =~ /mingw|mswin/ + GemfileEntry.version "duktape", nil, comment else GemfileEntry.new "mini_racer", nil, comment, { platforms: :ruby }, true end diff --git a/railties/test/generators/app_generator_test.rb b/railties/test/generators/app_generator_test.rb index aec73b6955..f243da5815 100644 --- a/railties/test/generators/app_generator_test.rb +++ b/railties/test/generators/app_generator_test.rb @@ -522,6 +522,8 @@ class AppGeneratorTest < Rails::Generators::TestCase run_generator if defined?(JRUBY_VERSION) assert_gem "therubyrhino" + elsif RUBY_PLATFORM =~ /mingw|mswin/ + assert_gem "duktape" else assert_file "Gemfile", /# gem 'mini_racer', platforms: :ruby/ end |