diff options
| author | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2017-03-27 19:21:49 -0400 |
|---|---|---|
| committer | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2017-03-27 19:21:49 -0400 |
| commit | 01e9692caa5dcf8df484fd4f4bfe3f75e26708bc (patch) | |
| tree | 668f7b0feeeeff80db4d85bb8b29dfcc025e6c2b | |
| parent | 794a6ca71ebdd3794710c503131580e9cb02982c (diff) | |
| parent | 42198064c35ff3b701496309f90df2abc229efbe (diff) | |
| download | rails-01e9692caa5dcf8df484fd4f4bfe3f75e26708bc.tar.gz rails-01e9692caa5dcf8df484fd4f4bfe3f75e26708bc.tar.bz2 rails-01e9692caa5dcf8df484fd4f4bfe3f75e26708bc.zip | |
Merge pull request #28546 from claudiob/drop-j-option
Remove -j (--javascript) option from `rails new`
| -rw-r--r-- | railties/lib/rails/generators/app_base.rb | 8 | ||||
| -rw-r--r-- | railties/test/generators/app_generator_test.rb | 8 |
2 files changed, 0 insertions, 16 deletions
diff --git a/railties/lib/rails/generators/app_base.rb b/railties/lib/rails/generators/app_base.rb index 8c3d74ad80..9109be5e04 100644 --- a/railties/lib/rails/generators/app_base.rb +++ b/railties/lib/rails/generators/app_base.rb @@ -31,9 +31,6 @@ module Rails class_option :database, type: :string, aliases: "-d", default: "sqlite3", desc: "Preconfigure for selected database (options: #{DATABASES.join('/')})" - class_option :javascript, type: :string, aliases: "-j", - desc: "Preconfigure for selected JavaScript library" - class_option :webpack, type: :string, default: nil, desc: "Preconfigure for app-like JavaScript with Webpack (options: #{WEBPACKS.join('/')})" @@ -342,11 +339,6 @@ module Rails gems = [javascript_runtime_gemfile_entry] gems << coffee_gemfile_entry unless options[:skip_coffee] - if options[:javascript] - gems << GemfileEntry.version("#{options[:javascript]}-rails", nil, - "Use #{options[:javascript]} as the JavaScript library") - end - unless options[:skip_turbolinks] gems << GemfileEntry.version("turbolinks", "~> 5", "Turbolinks makes navigating your web application faster. Read more: https://github.com/turbolinks/turbolinks") diff --git a/railties/test/generators/app_generator_test.rb b/railties/test/generators/app_generator_test.rb index 8e18162df7..7965bd68d0 100644 --- a/railties/test/generators/app_generator_test.rb +++ b/railties/test/generators/app_generator_test.rb @@ -476,14 +476,6 @@ class AppGeneratorTest < Rails::Generators::TestCase end end - def test_inclusion_of_javascript_libraries_if_required - run_generator [destination_root, "-j", "jquery"] - assert_file "app/assets/javascripts/application.js" do |contents| - assert_match %r{^//= require jquery}, contents - end - assert_gem "jquery-rails" - end - def test_javascript_is_skipped_if_required run_generator [destination_root, "--skip-javascript"] |