From 9ab83b1cd1323e0ffebbd287c38aff614c18822c Mon Sep 17 00:00:00 2001
From: Joshua Peek <josh@joshpeek.com>
Date: Mon, 13 Oct 2008 21:43:58 -0500
Subject: [PATCH] Don't include the path when checking class collisions [#545
 state:resolved]

---
 railties/lib/rails_generator/commands.rb                    | 1 +
 railties/test/generators/rails_controller_generator_test.rb | 3 +++
 2 files changed, 4 insertions(+)

diff --git a/railties/lib/rails_generator/commands.rb b/railties/lib/rails_generator/commands.rb
index 59af7308fe91f..6b9a63684781f 100644
--- 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
index 8304fb5a0108b..f839ea97e61e8 100644
--- 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