From 4e5eaae1faebe5e889a50a3c3cfade397f39863c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jakub=20Ku=C5=BAma?= <qoobaa@gmail.com>
Date: Sat, 26 Nov 2011 19:57:51 +0100
Subject: added tests, replaced classify with constantize - using classify here
 cuts the last 's' in ORM name

---
 railties/lib/rails/generators/resource_helpers.rb |  2 +-
 railties/test/generators/orm_test.rb              | 38 +++++++++++++++++++++++
 2 files changed, 39 insertions(+), 1 deletion(-)
 create mode 100644 railties/test/generators/orm_test.rb

diff --git a/railties/lib/rails/generators/resource_helpers.rb b/railties/lib/rails/generators/resource_helpers.rb
index f2195cb81a..3c5b39fa16 100644
--- a/railties/lib/rails/generators/resource_helpers.rb
+++ b/railties/lib/rails/generators/resource_helpers.rb
@@ -64,7 +64,7 @@ module Rails
             end
 
             begin
-              "#{options[:orm].to_s.classify}::Generators::ActiveModel".constantize
+              "#{options[:orm].to_s.camelize}::Generators::ActiveModel".constantize
             rescue NameError
               Rails::Generators::ActiveModel
             end
diff --git a/railties/test/generators/orm_test.rb b/railties/test/generators/orm_test.rb
new file mode 100644
index 0000000000..9dd3d3e0ec
--- /dev/null
+++ b/railties/test/generators/orm_test.rb
@@ -0,0 +1,38 @@
+require "generators/generators_test_helper"
+require "rails/generators/rails/scaffold_controller/scaffold_controller_generator"
+
+# Mock out two ORMs
+module ORMWithGenerators
+  module Generators
+    class ActiveModel
+      def initialize(name)
+      end
+    end
+  end
+end
+
+module ORMWithoutGenerators
+  # No generators
+end
+
+class OrmTest < Rails::Generators::TestCase
+  include GeneratorsTestHelper
+  tests Rails::Generators::ScaffoldControllerGenerator
+
+  def test_orm_class_returns_custom_generator_if_supported_custom_orm_set
+    g = generator ["Foo"], :orm => "ORMWithGenerators"
+    assert_equal ORMWithGenerators::Generators::ActiveModel, g.send(:orm_class)
+  end
+
+  def test_orm_class_returns_rails_generator_if_unsupported_custom_orm_set
+    g = generator ["Foo"], :orm => "ORMWithoutGenerators"
+    assert_equal Rails::Generators::ActiveModel, g.send(:orm_class)
+  end
+
+  def test_orm_instance_returns_orm_class_instance_with_name
+    g = generator ["Foo"]
+    orm_instance = g.send(:orm_instance)
+    assert g.send(:orm_class) === orm_instance
+    assert_equal "foo", orm_instance.name
+  end
+end
-- 
cgit v1.2.3