mirror of
https://github.com/rails/rails.git
synced 2022-11-09 12:12:34 -05:00
Merge pull request #18705 from mrgilman/skip-test
Update option to skip test in generators
This commit is contained in:
Rafael Mendonça França
commit
4816449898
11 changed files with 26 additions and 22 deletions
|
|
@ -1,3 +1,7 @@
|
|||
* Rename `--skip-test-unit` option to `--skip-test` in app generator
|
||||
|
||||
*Melanie Gilman*
|
||||
|
||||
* Add the `method_source` gem to the default Gemfile for apps
|
||||
|
||||
*Sean Griffin*
|
||||
|
|
|
|||
|
|
@ -69,8 +69,8 @@ module Rails
|
|||
class_option :skip_turbolinks, type: :boolean, default: false,
|
||||
desc: 'Skip turbolinks gem'
|
||||
|
||||
class_option :skip_test_unit, type: :boolean, aliases: '-T', default: false,
|
||||
desc: 'Skip Test::Unit files'
|
||||
class_option :skip_test, type: :boolean, aliases: '-T', default: false,
|
||||
desc: 'Skip test files'
|
||||
|
||||
class_option :rc, type: :string, default: false,
|
||||
desc: "Path to file containing extra configuration options for rails command"
|
||||
|
|
@ -168,7 +168,7 @@ module Rails
|
|||
end
|
||||
|
||||
def include_all_railties?
|
||||
options.values_at(:skip_active_record, :skip_action_mailer, :skip_test_unit, :skip_sprockets).none?
|
||||
options.values_at(:skip_active_record, :skip_action_mailer, :skip_test, :skip_sprockets).none?
|
||||
end
|
||||
|
||||
def comment_if(value)
|
||||
|
|
|
|||
|
|
@ -235,7 +235,7 @@ module Rails
|
|||
end
|
||||
|
||||
def create_test_files
|
||||
build(:test) unless options[:skip_test_unit]
|
||||
build(:test) unless options[:skip_test]
|
||||
end
|
||||
|
||||
def create_tmp_files
|
||||
|
|
|
|||
|
|
@ -12,7 +12,7 @@ require "action_controller/railtie"
|
|||
<%= comment_if :skip_action_mailer %>require "action_mailer/railtie"
|
||||
require "action_view/railtie"
|
||||
<%= comment_if :skip_sprockets %>require "sprockets/railtie"
|
||||
<%= comment_if :skip_test_unit %>require "rails/test_unit/railtie"
|
||||
<%= comment_if :skip_test %>require "rails/test_unit/railtie"
|
||||
<% end -%>
|
||||
|
||||
# Require the gems listed in Gemfile, including any gems
|
||||
|
|
|
|||
|
|
@ -226,7 +226,7 @@ task default: :test
|
|||
end
|
||||
|
||||
def create_test_files
|
||||
build(:test) unless options[:skip_test_unit]
|
||||
build(:test) unless options[:skip_test]
|
||||
end
|
||||
|
||||
def create_test_dummy_files
|
||||
|
|
@ -294,7 +294,7 @@ task default: :test
|
|||
end
|
||||
|
||||
def with_dummy_app?
|
||||
options[:skip_test_unit].blank? || options[:dummy_path] != 'test/dummy'
|
||||
options[:skip_test].blank? || options[:dummy_path] != 'test/dummy'
|
||||
end
|
||||
|
||||
def self.banner
|
||||
|
|
|
|||
|
|
@ -15,7 +15,7 @@ Gem::Specification.new do |s|
|
|||
s.license = "MIT"
|
||||
|
||||
s.files = Dir["{app,config,db,lib}/**/*", "MIT-LICENSE", "Rakefile", "README.rdoc"]
|
||||
<% unless options.skip_test_unit? -%>
|
||||
<% unless options.skip_test? -%>
|
||||
s.test_files = Dir["test/**/*"]
|
||||
<% end -%>
|
||||
|
||||
|
|
|
|||
|
|
@ -1,10 +1,10 @@
|
|||
.bundle/
|
||||
log/*.log
|
||||
pkg/
|
||||
<% unless options[:skip_test_unit] && options[:dummy_path] == 'test/dummy' -%>
|
||||
<% unless options[:skip_test] && options[:dummy_path] == 'test/dummy' -%>
|
||||
<%= dummy_path %>/db/*.sqlite3
|
||||
<%= dummy_path %>/db/*.sqlite3-journal
|
||||
<%= dummy_path %>/log/*.log
|
||||
<%= dummy_path %>/tmp/
|
||||
<%= dummy_path %>/.sass-cache
|
||||
<% end -%>
|
||||
<% end -%>
|
||||
|
|
|
|||
|
|
@ -9,7 +9,7 @@ require "action_controller/railtie"
|
|||
<%= comment_if :skip_action_mailer %>require "action_mailer/railtie"
|
||||
require "action_view/railtie"
|
||||
<%= comment_if :skip_sprockets %>require "sprockets/railtie"
|
||||
<%= comment_if :skip_test_unit %>require "rails/test_unit/railtie"
|
||||
<%= comment_if :skip_test %>require "rails/test_unit/railtie"
|
||||
<% end -%>
|
||||
|
||||
Bundler.require(*Rails.groups)
|
||||
|
|
|
|||
|
|
@ -446,13 +446,13 @@ class AppGeneratorTest < Rails::Generators::TestCase
|
|||
assert_file 'lib/test_file.rb', 'heres test data'
|
||||
end
|
||||
|
||||
def test_test_unit_is_removed_from_frameworks_if_skip_test_unit_is_given
|
||||
run_generator [destination_root, "--skip-test-unit"]
|
||||
def test_tests_are_removed_from_frameworks_if_skip_test_is_given
|
||||
run_generator [destination_root, "--skip-test"]
|
||||
assert_file "config/application.rb", /#\s+require\s+["']rails\/test_unit\/railtie["']/
|
||||
end
|
||||
|
||||
def test_no_active_record_or_test_unit_if_skips_given
|
||||
run_generator [destination_root, "--skip-test-unit", "--skip-active-record"]
|
||||
def test_no_active_record_or_tests_if_skips_given
|
||||
run_generator [destination_root, "--skip-test", "--skip-active-record"]
|
||||
assert_file "config/application.rb", /#\s+require\s+["']rails\/test_unit\/railtie["']/
|
||||
assert_file "config/application.rb", /#\s+require\s+["']active_record\/railtie["']/
|
||||
assert_file "config/application.rb", /\s+require\s+["']active_job\/railtie["']/
|
||||
|
|
|
|||
|
|
@ -112,7 +112,7 @@ class PluginGeneratorTest < Rails::Generators::TestCase
|
|||
|
||||
def test_ensure_that_test_dummy_can_be_generated_from_a_template
|
||||
FileUtils.cd(Rails.root)
|
||||
run_generator([destination_root, "-m", "lib/create_test_dummy_template.rb", "--skip-test-unit"])
|
||||
run_generator([destination_root, "-m", "lib/create_test_dummy_template.rb", "--skip-test"])
|
||||
assert_file "spec/dummy"
|
||||
assert_no_file "test"
|
||||
end
|
||||
|
|
@ -321,7 +321,7 @@ class PluginGeneratorTest < Rails::Generators::TestCase
|
|||
end
|
||||
|
||||
def test_creating_dummy_without_tests_but_with_dummy_path
|
||||
run_generator [destination_root, "--dummy_path", "spec/dummy", "--skip-test-unit"]
|
||||
run_generator [destination_root, "--dummy_path", "spec/dummy", "--skip-test"]
|
||||
assert_file "spec/dummy"
|
||||
assert_file "spec/dummy/config/application.rb"
|
||||
assert_no_file "test"
|
||||
|
|
@ -333,14 +333,14 @@ class PluginGeneratorTest < Rails::Generators::TestCase
|
|||
|
||||
def test_ensure_that_gitignore_can_be_generated_from_a_template_for_dummy_path
|
||||
FileUtils.cd(Rails.root)
|
||||
run_generator([destination_root, "--dummy_path", "spec/dummy", "--skip-test-unit"])
|
||||
run_generator([destination_root, "--dummy_path", "spec/dummy", "--skip-test"])
|
||||
assert_file ".gitignore" do |contents|
|
||||
assert_match(/spec\/dummy/, contents)
|
||||
end
|
||||
end
|
||||
|
||||
def test_skipping_test_unit
|
||||
run_generator [destination_root, "--skip-test-unit"]
|
||||
def test_skipping_test_files
|
||||
run_generator [destination_root, "--skip-test"]
|
||||
assert_no_file "test"
|
||||
assert_file "bukkits.gemspec" do |contents|
|
||||
assert_no_match(/s.test_files = Dir\["test\/\*\*\/\*"\]/, contents)
|
||||
|
|
|
|||
|
|
@ -47,8 +47,8 @@ module SharedGeneratorTests
|
|||
assert_match(/Invalid value for \-\-database option/, content)
|
||||
end
|
||||
|
||||
def test_test_unit_is_skipped_if_required
|
||||
run_generator [destination_root, "--skip-test-unit"]
|
||||
def test_test_files_are_skipped_if_required
|
||||
run_generator [destination_root, "--skip-test"]
|
||||
assert_no_file "test"
|
||||
end
|
||||
|
||||
|
|
|
|||
Loading…
Reference in a new issue