Merge commit 'mainstream/master'

Conflicts:
	railties/guides/source/active_support_overview.textile

1 files changed, 56 insertions, 0 deletions

diff --git a/railties/test/generators/plugin_generator_test.rb b/railties/test/generators/plugin_generator_test.rb
new file mode 100644
index 0000000000..3982586bc3
--- /dev/null
+++ b/railties/test/generators/plugin_generator_test.rb
@@ -0,0 +1,56 @@
+require 'abstract_unit'
+require 'generators/generators_test_helper'
+require 'generators/rails/plugin/plugin_generator'
+
+class PluginGeneratorTest < GeneratorsTestCase
+
+  def test_plugin_skeleton_is_created
+    run_generator
+
+    %w(
+      vendor/plugins
+      vendor/plugins/plugin_fu
+      vendor/plugins/plugin_fu/lib
+    ).each{ |path| assert_file path }
+  end
+
+  def test_check_class_collision
+    content = capture(:stderr){ run_generator ["object"] }
+    assert_match /The name 'Object' is either already used in your application or reserved/, content
+  end
+
+  def test_invokes_default_test_framework
+    run_generator
+    assert_file "vendor/plugins/plugin_fu/test/plugin_fu_test.rb", /class PluginFuTest < ActiveSupport::TestCase/
+    assert_file "vendor/plugins/plugin_fu/test/test_helper.rb"
+  end
+
+  def test_logs_if_the_test_framework_cannot_be_found
+    content = run_generator ["plugin_fu", "--test-framework=rspec"]
+    assert_match /rspec \[not found\]/, content
+  end
+
+  def test_creates_tasks_if_required
+    run_generator ["plugin_fu", "--tasks"]
+    assert_file "vendor/plugins/plugin_fu/tasks/plugin_fu_tasks.rake"
+  end
+
+  def test_creates_generator_if_required
+    run_generator ["plugin_fu", "--generator"]
+    assert_file "vendor/plugins/plugin_fu/lib/generators/templates"
+    assert_file "vendor/plugins/plugin_fu/lib/generators/plugin_fu_generator.rb",
+                /class PluginFuGenerator < Rails::Generators::NamedBase/
+  end
+
+  def test_plugin_generator_on_revoke
+    run_generator
+    run_generator ["plugin_fu"], :behavior => :revoke
+  end
+
+  protected
+
+    def run_generator(args=["plugin_fu"], config={})
+      silence(:stdout) { Rails::Generators::PluginGenerator.start args, config.merge(:destination_root => destination_root) }
+    end
+
+end