aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGuillermo Iguaran <guilleiguaran@gmail.com>2017-02-20 13:57:42 +0900
committerGitHub <noreply@github.com>2017-02-20 13:57:42 +0900
commita2234c5f68edebe7f842873f0c0d7c53b439861c (patch)
tree4e66afc70b6167f704c99a779ddd8bbbc65df97b
parent084ddba6837a6799fc3ee79fd48e09695b16d469 (diff)
parent38c2373b5bc4bc66cc424c5e0d6cce5d4ad94df0 (diff)
downloadrails-a2234c5f68edebe7f842873f0c0d7c53b439861c.tar.gz
rails-a2234c5f68edebe7f842873f0c0d7c53b439861c.tar.bz2
rails-a2234c5f68edebe7f842873f0c0d7c53b439861c.zip
Merge pull request #28059 from y-yagi/do_not_run_git_init_inside_test_dummy
Do not run `git init` in dummy application
-rw-r--r--railties/lib/rails/generators/rails/plugin/plugin_generator.rb2
-rw-r--r--railties/test/generators/plugin_generator_test.rb1
2 files changed, 2 insertions, 1 deletions
diff --git a/railties/lib/rails/generators/rails/plugin/plugin_generator.rb b/railties/lib/rails/generators/rails/plugin/plugin_generator.rb
index 49259f32c8..be211e016d 100644
--- a/railties/lib/rails/generators/rails/plugin/plugin_generator.rb
+++ b/railties/lib/rails/generators/rails/plugin/plugin_generator.rb
@@ -91,6 +91,7 @@ task default: :test
opts[:skip_bundle] = true
opts[:api] = options.api?
opts[:skip_listen] = true
+ opts[:skip_git] = true
invoke Rails::Generators::AppGenerator,
[ File.expand_path(dummy_path, destination_root) ], opts
@@ -112,7 +113,6 @@ task default: :test
def test_dummy_clean
inside dummy_path do
- remove_file ".gitignore"
remove_file "db/seeds.rb"
remove_file "doc"
remove_file "Gemfile"
diff --git a/railties/test/generators/plugin_generator_test.rb b/railties/test/generators/plugin_generator_test.rb
index ddfbc1a698..eaf1199601 100644
--- a/railties/test/generators/plugin_generator_test.rb
+++ b/railties/test/generators/plugin_generator_test.rb
@@ -491,6 +491,7 @@ class PluginGeneratorTest < Rails::Generators::TestCase
assert_no_directory "test/dummy/doc"
assert_no_directory "test/dummy/test"
assert_no_directory "test/dummy/vendor"
+ assert_no_directory "test/dummy/.git"
end
def test_skipping_test_files