Merge commit 'rails/master'

Conflicts:
	activerecord/lib/active_record/associations.rb

1 files changed, 23 insertions, 0 deletions

diff --git a/railties/test/generators/metal_generator_test.rb b/railties/test/generators/metal_generator_test.rb
new file mode 100644
index 0000000000..97e892cefb
--- /dev/null
+++ b/railties/test/generators/metal_generator_test.rb
@@ -0,0 +1,23 @@
+require 'abstract_unit'
+require 'generators/generators_test_helper'
+require 'generators/rails/metal/metal_generator'
+
+class MetalGeneratorTest < GeneratorsTestCase
+
+  def test_metal_skeleton_is_created
+    run_generator
+    assert_file "app/metal/foo.rb", /class Foo/
+  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
+
+  protected
+
+    def run_generator(args=["foo"])
+      silence(:stdout) { Rails::Generators::MetalGenerator.start args, :destination_root => destination_root }
+    end
+
+end