diff options
| author | David Heinemeier Hansson <david@loudthinking.com> | 2017-08-01 16:59:37 -0500 |
|---|---|---|
| committer | David Heinemeier Hansson <david@loudthinking.com> | 2017-08-01 16:59:37 -0500 |
| commit | e473946d58cfdab0b16cf91cdad6bef23fcfafc3 (patch) | |
| tree | 8381b3ddd0fca7ef6e9cb7f79aa53a768ecbf376 /railties/test | |
| parent | 3d3ec20a485a109bb772cb37382040e25f5d0ded (diff) | |
| parent | f9a43f28c087f8ffd35ff7c33a60c938b60f2be2 (diff) | |
| download | rails-e473946d58cfdab0b16cf91cdad6bef23fcfafc3.tar.gz rails-e473946d58cfdab0b16cf91cdad6bef23fcfafc3.tar.bz2 rails-e473946d58cfdab0b16cf91cdad6bef23fcfafc3.zip | |
Merge branch 'master' into active-storage-import
Diffstat (limited to 'railties/test')
| -rw-r--r-- | railties/test/generators/app_generator_test.rb | 2 | ||||
| -rw-r--r-- | railties/test/generators/plugin_generator_test.rb | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/railties/test/generators/app_generator_test.rb b/railties/test/generators/app_generator_test.rb index fe5d302f3c..44c4688aa4 100644 --- a/railties/test/generators/app_generator_test.rb +++ b/railties/test/generators/app_generator_test.rb @@ -523,6 +523,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 diff --git a/railties/test/generators/plugin_generator_test.rb b/railties/test/generators/plugin_generator_test.rb index e8372dea47..1fa40f74b9 100644 --- a/railties/test/generators/plugin_generator_test.rb +++ b/railties/test/generators/plugin_generator_test.rb @@ -491,7 +491,6 @@ class PluginGeneratorTest < Rails::Generators::TestCase assert_no_file "test/dummy/public/robots.txt" assert_no_file "test/dummy/README.md" assert_no_directory "test/dummy/lib/tasks" - assert_no_directory "test/dummy/doc" assert_no_directory "test/dummy/test" assert_no_directory "test/dummy/vendor" assert_no_directory "test/dummy/.git" |