Merge pull request #9401 from sikachu/master-remove-builder-option

Remove `--builder` option from `rails` command

10 files changed, 0 insertions, 169 deletions

diff --git a/railties/test/fixtures/lib/app_builders/empty_builder.rb b/railties/test/fixtures/lib/app_builders/empty_builder.rb
deleted file mode 100644
index babd9c2461..0000000000
--- a/railties/test/fixtures/lib/app_builders/empty_builder.rb
+++ /dev/null
@@ -1,2 +0,0 @@
-class AppBuilder
-end
\ No newline at end of file
diff --git a/railties/test/fixtures/lib/app_builders/simple_builder.rb b/railties/test/fixtures/lib/app_builders/simple_builder.rb
deleted file mode 100644
index 993d3a2aa2..0000000000
--- a/railties/test/fixtures/lib/app_builders/simple_builder.rb
+++ /dev/null
@@ -1,7 +0,0 @@
-class AppBuilder
-  def gitignore
-    create_file ".gitignore", <<-R.strip
-foobar
-    R
-  end
-end
diff --git a/railties/test/fixtures/lib/app_builders/tweak_builder.rb b/railties/test/fixtures/lib/app_builders/tweak_builder.rb
deleted file mode 100644
index cb50be01cb..0000000000
--- a/railties/test/fixtures/lib/app_builders/tweak_builder.rb
+++ /dev/null
@@ -1,7 +0,0 @@
-class AppBuilder < Rails::AppBuilder
-  def gitignore
-    create_file ".gitignore", <<-R.strip
-foobar
-    R
-  end
-end
diff --git a/railties/test/fixtures/lib/plugin_builders/empty_builder.rb b/railties/test/fixtures/lib/plugin_builders/empty_builder.rb
deleted file mode 100644
index 5c5607621c..0000000000
--- a/railties/test/fixtures/lib/plugin_builders/empty_builder.rb
+++ /dev/null
@@ -1,2 +0,0 @@
-class PluginBuilder
-end
diff --git a/railties/test/fixtures/lib/plugin_builders/simple_builder.rb b/railties/test/fixtures/lib/plugin_builders/simple_builder.rb
deleted file mode 100644
index 08f6c5535d..0000000000
--- a/railties/test/fixtures/lib/plugin_builders/simple_builder.rb
+++ /dev/null
@@ -1,7 +0,0 @@
-class PluginBuilder
-  def gitignore
-    create_file ".gitignore", <<-R.strip
-foobar
-    R
-  end
-end
diff --git a/railties/test/fixtures/lib/plugin_builders/spec_builder.rb b/railties/test/fixtures/lib/plugin_builders/spec_builder.rb
deleted file mode 100644
index 2721429599..0000000000
--- a/railties/test/fixtures/lib/plugin_builders/spec_builder.rb
+++ /dev/null
@@ -1,19 +0,0 @@
-class PluginBuilder < Rails::PluginBuilder
-  def test
-    create_file "spec/spec_helper.rb"
-    append_file "Rakefile", <<-EOF
-# spec tasks in rakefile
-
-task default: :spec
-    EOF
-  end
-
-  def generate_test_dummy
-    dummy_path("spec/dummy")
-    super
-  end
-
-  def skip_test_unit?
-    true
-  end
-end
diff --git a/railties/test/fixtures/lib/plugin_builders/tweak_builder.rb b/railties/test/fixtures/lib/plugin_builders/tweak_builder.rb
deleted file mode 100644
index 1e801409a4..0000000000
--- a/railties/test/fixtures/lib/plugin_builders/tweak_builder.rb
+++ /dev/null
@@ -1,7 +0,0 @@
-class PluginBuilder < Rails::PluginBuilder
-  def gitignore
-    create_file ".gitignore", <<-R.strip
-foobar
-    R
-  end
-end
diff --git a/railties/test/generators/app_generator_test.rb b/railties/test/generators/app_generator_test.rb
index 53618e1f4f..0697035871 100644
--- a/railties/test/generators/app_generator_test.rb
+++ b/railties/test/generators/app_generator_test.rb
@@ -357,28 +357,3 @@ protected
     assert_file "Gemfile", /^gem\s+["']#{gem}["']$/
   end
 end
-
-class CustomAppGeneratorTest < Rails::Generators::TestCase
-  include GeneratorsTestHelper
-  tests Rails::Generators::AppGenerator
-
-  arguments [destination_root]
-  include SharedCustomGeneratorTests
-
-protected
-  def default_files
-    ::DEFAULT_APP_FILES
-  end
-
-  def builders_dir
-    "app_builders"
-  end
-
-  def builder_class
-    :AppBuilder
-  end
-
-  def action(*args, &block)
-    silence(:stdout) { generator.send(*args, &block) }
-  end
-end
diff --git a/railties/test/generators/plugin_new_generator_test.rb b/railties/test/generators/plugin_new_generator_test.rb
index 4bf5a2f08b..904c1db57e 100644
--- a/railties/test/generators/plugin_new_generator_test.rb
+++ b/railties/test/generators/plugin_new_generator_test.rb
@@ -371,38 +371,3 @@ protected
     ::DEFAULT_PLUGIN_FILES
   end
 end
-
-class CustomPluginGeneratorTest < Rails::Generators::TestCase
-  include GeneratorsTestHelper
-  tests Rails::Generators::PluginNewGenerator
-
-  destination File.join(Rails.root, "tmp/bukkits")
-  arguments [destination_root]
-  include SharedCustomGeneratorTests
-
-  def test_overriding_test_framework
-    FileUtils.cd(destination_root)
-    run_generator([destination_root, "-b", "#{Rails.root}/lib/plugin_builders/spec_builder.rb"])
-    assert_file 'spec/spec_helper.rb'
-    assert_file 'spec/dummy'
-    assert_file 'Rakefile', /task default: :spec/
-    assert_file 'Rakefile', /# spec tasks in rakefile/
-  end
-
-protected
-  def default_files
-    ::DEFAULT_PLUGIN_FILES
-  end
-
-  def builder_class
-    :PluginBuilder
-  end
-
-  def builders_dir
-    "plugin_builders"
-  end
-
-  def action(*args, &block)
-    silence(:stdout){ generator.send(*args, &block) }
-  end
-end
diff --git a/railties/test/generators/shared_generator_tests.rb b/railties/test/generators/shared_generator_tests.rb
index 2081f4aba8..2724882a23 100644
--- a/railties/test/generators/shared_generator_tests.rb
+++ b/railties/test/generators/shared_generator_tests.rb
@@ -140,61 +140,3 @@ module SharedGeneratorTests
     assert_no_file('app/mailers/.keep')
   end
 end
-
-module SharedCustomGeneratorTests
-  def setup
-    Rails.application = TestApp::Application
-    super
-    Rails::Generators::AppGenerator.instance_variable_set('@desc', nil)
-  end
-
-  def teardown
-    super
-    Rails::Generators::AppGenerator.instance_variable_set('@desc', nil)
-    Object.class_eval do
-      remove_const :AppBuilder if const_defined?(:AppBuilder)
-      remove_const :PluginBuilder if const_defined?(:PluginBuilder)
-    end
-    Rails.application = TestApp::Application.instance
-  end
-
-  def test_builder_option_with_empty_app_builder
-    FileUtils.cd(destination_root)
-    run_generator([destination_root, "-b", "#{Rails.root}/lib/#{builders_dir}/empty_builder.rb"])
-    default_files.each{ |path| assert_no_file path }
-  end
-
-  def test_builder_option_with_simple_plugin_builder
-    FileUtils.cd(destination_root)
-    run_generator([destination_root, "-b", "#{Rails.root}/lib/#{builders_dir}/simple_builder.rb"])
-    (default_files - ['.gitignore']).each{ |path| assert_no_file path }
-    assert_file ".gitignore", "foobar"
-  end
-
-  def test_builder_option_with_relative_path
-    here = File.expand_path(File.dirname(__FILE__))
-    FileUtils.cd(here)
-    run_generator([destination_root, "-b", "../fixtures/lib/#{builders_dir}/simple_builder.rb"])
-    FileUtils.cd(destination_root)
-    (default_files - ['.gitignore']).each{ |path| assert_no_file path }
-    assert_file ".gitignore", "foobar"
-  end
-
-  def test_builder_option_with_tweak_plugin_builder
-    FileUtils.cd(destination_root)
-    run_generator([destination_root, "-b", "#{Rails.root}/lib/#{builders_dir}/tweak_builder.rb"])
-    default_files.each{ |path| assert_file path }
-    assert_file ".gitignore", "foobar"
-  end
-
-  def test_builder_option_with_http
-    url = "https://gist.github.com/josevalim/103208/raw/"
-    template = "class #{builder_class}; end"
-    template.instance_eval "def read; self; end" # Make the string respond to read
-
-    generator([destination_root], builder: url).expects(:open).with(url, 'Accept' => 'application/x-thor-template').returns(template)
-    quietly { generator.invoke_all }
-
-    default_files.each{ |path| assert_no_file(path) }
-  end
-end