Skip to content
Browse files

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

…olved]
  • Loading branch information...
1 parent c51db4d commit 9ab83b1cd1323e0ffebbd287c38aff614c18822c @josh josh committed Oct 13, 2008
View
1 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
View
3 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

0 comments on commit 9ab83b1

Please sign in to comment.
Something went wrong with that request. Please try again.