diff options
| author | Eileen M. Uchitelle <eileencodes@users.noreply.github.com> | 2017-03-27 08:25:53 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-03-27 08:25:53 -0400 |
| commit | 255ef67d5cd9acb823bce687c85b73e7f15accc8 (patch) | |
| tree | 39415dfbdb3339859ff1970691e0e46ae0e3a781 /railties/lib/rails | |
| parent | 40ba03adaa743e2c67c82220794c9f11fae97d12 (diff) | |
| parent | 72b4265766400a752dae27a3d7d94ccd86df00cb (diff) | |
| download | rails-255ef67d5cd9acb823bce687c85b73e7f15accc8.tar.gz rails-255ef67d5cd9acb823bce687c85b73e7f15accc8.tar.bz2 rails-255ef67d5cd9acb823bce687c85b73e7f15accc8.zip | |
Merge pull request #28541 from ota42y/fix/gemfile_generator_fix
ignore system test gems on Gemfile when execute with --skip-test option
Diffstat (limited to 'railties/lib/rails')
| -rw-r--r-- | railties/lib/rails/generators/app_base.rb | 4 | ||||
| -rw-r--r-- | railties/lib/rails/generators/rails/app/app_generator.rb | 2 | ||||
| -rw-r--r-- | railties/lib/rails/generators/rails/app/templates/Gemfile | 2 |
3 files changed, 6 insertions, 2 deletions
diff --git a/railties/lib/rails/generators/app_base.rb b/railties/lib/rails/generators/app_base.rb index fbb6b5039c..8c3d74ad80 100644 --- a/railties/lib/rails/generators/app_base.rb +++ b/railties/lib/rails/generators/app_base.rb @@ -413,6 +413,10 @@ module Rails !options[:skip_spring] && !options.dev? && Process.respond_to?(:fork) && !RUBY_PLATFORM.include?("cygwin") end + def depends_on_system_test? + !(options[:skip_system_test] || options[:skip_test] || options[:api]) + end + def depend_on_listen? !options[:skip_listen] && os_supports_listen_out_of_the_box? end diff --git a/railties/lib/rails/generators/rails/app/app_generator.rb b/railties/lib/rails/generators/rails/app/app_generator.rb index b32878cf0b..66e72f8cdc 100644 --- a/railties/lib/rails/generators/rails/app/app_generator.rb +++ b/railties/lib/rails/generators/rails/app/app_generator.rb @@ -275,7 +275,7 @@ module Rails end def create_system_test_files - build(:system_test) unless options[:skip_system_test] || options[:skip_test] || options[:api] + build(:system_test) if depends_on_system_test? end def create_tmp_files diff --git a/railties/lib/rails/generators/rails/app/templates/Gemfile b/railties/lib/rails/generators/rails/app/templates/Gemfile index ab4aa04fff..06f0dd6d6d 100644 --- a/railties/lib/rails/generators/rails/app/templates/Gemfile +++ b/railties/lib/rails/generators/rails/app/templates/Gemfile @@ -32,7 +32,7 @@ end group :development, :test do # Call 'byebug' anywhere in the code to stop execution and get a debugger console gem 'byebug', platforms: [:mri, :mingw, :x64_mingw] - <%- unless options.skip_system_test? || options.api? -%> + <%- if depends_on_system_test? -%> # Adds support for Capybara system testing and selenium driver gem 'capybara', '~> 2.13.0' gem 'selenium-webdriver' |