TEST_CODEOWNERS/rails
3
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

Merge pull request #43072 from jmromer/cli-template-from-env-var-path

Browse Source 
Enable passing env var paths to cli -m option
This commit is contained in:
Rafael França 2021-09-20 16:21:40 -04:00 committed by GitHub
commit 03add891e6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 20 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
railties/lib/rails/generators/app_base.rb
View File

@ -148,7 +148,7 @@ def set_default_accessors! # :doc:
when /^https?:\/\//
options[:template]
when String
File.expand_path(options[:template], Dir.pwd)
File.expand_path(`echo #{options[:template]}`.strip)
else
options[:template]
end

19
railties/test/generators/app_generator_test.rb
View File

@ -580,6 +580,25 @@ def test_template_from_dir_pwd
assert_match(/It works from file!/, run_generator([destination_root, "-m", "lib/template.rb"]))
end
def test_template_from_url
url = "https://raw.githubusercontent.com/rails/rails/f95c0b7e96/railties/test/fixtures/lib/template.rb"
FileUtils.cd(Rails.root)
assert_match(/It works from file!/, run_generator([destination_root, "-m", url]))
end
def test_template_from_abs_path
absolute_path = File.expand_path(Rails.root, "fixtures")
FileUtils.cd(Rails.root)
assert_match(/It works from file!/, run_generator([destination_root, "-m", "#{absolute_path}/lib/template.rb"]))
end
def test_template_from_env_var_path
ENV["FIXTURES_HOME"] = File.expand_path(Rails.root, "fixtures")
FileUtils.cd(Rails.root)
assert_match(/It works from file!/, run_generator([destination_root, "-m", "$FIXTURES_HOME/lib/template.rb"]))
ENV.delete("FIXTURES_HOME")
end
def test_usage_read_from_file
assert_called(File, :read, returns: "USAGE FROM FILE") do
assert_equal "USAGE FROM FILE", Rails::Generators::AppGenerator.desc