Don't include the path when checking class collisions [#545 state:res…

…olved]
rails · Oct 14, 2008 · 9ab83b1 · 9ab83b1
1 parent c51db4d
commit 9ab83b1
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 0 deletions.
diff --git a/railties/lib/rails_generator/commands.rb b/railties/lib/rails_generator/commands.rb
@@ -169,6 +169,7 @@ class Create < Base
         # Ruby or Rails.  In the future, expand to check other namespaces
         # such as the rest of the user's app.
         def class_collisions(*class_names)
+          path = class_names.shift
           class_names.flatten.each do |class_name|
             # Convert to string to allow symbol arguments.
             class_name = class_name.to_s

diff --git a/railties/test/generators/rails_controller_generator_test.rb b/railties/test/generators/rails_controller_generator_test.rb
@@ -1,5 +1,8 @@
 require 'generators/generator_test_helper'
 
+module Admin
+end
+
 class RailsControllerGeneratorTest < GeneratorTestCase
 
   def test_controller_generates_controller