Remove the class_path from the collisions test.
The class_path is often taken already in situations like Admin namespaces etc.
This commit is contained in:
parent
3e9fc279e5
commit
09c1718198
|
@ -2,7 +2,7 @@ class ControllerGenerator < Rails::Generator::NamedBase
|
||||||
def manifest
|
def manifest
|
||||||
record do |m|
|
record do |m|
|
||||||
# Check for class naming collisions.
|
# Check for class naming collisions.
|
||||||
m.class_collisions class_path, "#{class_name}Controller", "#{class_name}ControllerTest", "#{class_name}Helper"
|
m.class_collisions "#{class_name}Controller", "#{class_name}ControllerTest", "#{class_name}Helper"
|
||||||
|
|
||||||
# Controller, helper, views, and test directories.
|
# Controller, helper, views, and test directories.
|
||||||
m.directory File.join('app/controllers', class_path)
|
m.directory File.join('app/controllers', class_path)
|
||||||
|
|
|
@ -4,7 +4,7 @@ class IntegrationTestGenerator < Rails::Generator::NamedBase
|
||||||
def manifest
|
def manifest
|
||||||
record do |m|
|
record do |m|
|
||||||
# Check for class naming collisions.
|
# Check for class naming collisions.
|
||||||
m.class_collisions class_path, class_name, "#{class_name}Test"
|
m.class_collisions class_name, "#{class_name}Test"
|
||||||
|
|
||||||
# integration test directory
|
# integration test directory
|
||||||
m.directory File.join('test/integration', class_path)
|
m.directory File.join('test/integration', class_path)
|
||||||
|
|
|
@ -2,7 +2,7 @@ class MailerGenerator < Rails::Generator::NamedBase
|
||||||
def manifest
|
def manifest
|
||||||
record do |m|
|
record do |m|
|
||||||
# Check for class naming collisions.
|
# Check for class naming collisions.
|
||||||
m.class_collisions class_path, class_name, "#{class_name}Test"
|
m.class_collisions class_name, "#{class_name}Test"
|
||||||
|
|
||||||
# Mailer, view, test, and fixture directories.
|
# Mailer, view, test, and fixture directories.
|
||||||
m.directory File.join('app/models', class_path)
|
m.directory File.join('app/models', class_path)
|
||||||
|
|
|
@ -4,7 +4,7 @@ class ModelGenerator < Rails::Generator::NamedBase
|
||||||
def manifest
|
def manifest
|
||||||
record do |m|
|
record do |m|
|
||||||
# Check for class naming collisions.
|
# Check for class naming collisions.
|
||||||
m.class_collisions class_path, class_name, "#{class_name}Test"
|
m.class_collisions class_name, "#{class_name}Test"
|
||||||
|
|
||||||
# Model, test, and fixture directories.
|
# Model, test, and fixture directories.
|
||||||
m.directory File.join('app/models', class_path)
|
m.directory File.join('app/models', class_path)
|
||||||
|
|
|
@ -2,7 +2,7 @@ class ObserverGenerator < Rails::Generator::NamedBase
|
||||||
def manifest
|
def manifest
|
||||||
record do |m|
|
record do |m|
|
||||||
# Check for class naming collisions.
|
# Check for class naming collisions.
|
||||||
m.class_collisions class_path, "#{class_name}Observer", "#{class_name}ObserverTest"
|
m.class_collisions "#{class_name}Observer", "#{class_name}ObserverTest"
|
||||||
|
|
||||||
# Observer, and test directories.
|
# Observer, and test directories.
|
||||||
m.directory File.join('app/models', class_path)
|
m.directory File.join('app/models', class_path)
|
||||||
|
|
|
@ -4,7 +4,7 @@ class PerformanceTestGenerator < Rails::Generator::NamedBase
|
||||||
def manifest
|
def manifest
|
||||||
record do |m|
|
record do |m|
|
||||||
# Check for class naming collisions.
|
# Check for class naming collisions.
|
||||||
m.class_collisions class_path, class_name, "#{class_name}Test"
|
m.class_collisions class_name, "#{class_name}Test"
|
||||||
|
|
||||||
# performance test directory
|
# performance test directory
|
||||||
m.directory File.join('test/performance', class_path)
|
m.directory File.join('test/performance', class_path)
|
||||||
|
|
|
@ -10,7 +10,7 @@ class PluginGenerator < Rails::Generator::NamedBase
|
||||||
def manifest
|
def manifest
|
||||||
record do |m|
|
record do |m|
|
||||||
# Check for class naming collisions.
|
# Check for class naming collisions.
|
||||||
m.class_collisions class_path, class_name
|
m.class_collisions class_name
|
||||||
|
|
||||||
m.directory "#{plugin_path}/lib"
|
m.directory "#{plugin_path}/lib"
|
||||||
m.directory "#{plugin_path}/tasks"
|
m.directory "#{plugin_path}/tasks"
|
||||||
|
|
|
@ -30,8 +30,8 @@ class ResourceGenerator < Rails::Generator::NamedBase
|
||||||
def manifest
|
def manifest
|
||||||
record do |m|
|
record do |m|
|
||||||
# Check for class naming collisions.
|
# Check for class naming collisions.
|
||||||
m.class_collisions(controller_class_path, "#{controller_class_name}Controller", "#{controller_class_name}Helper")
|
m.class_collisions("#{controller_class_name}Controller", "#{controller_class_name}Helper")
|
||||||
m.class_collisions(class_path, "#{class_name}")
|
m.class_collisions(class_name)
|
||||||
|
|
||||||
# Controller, helper, views, and test directories.
|
# Controller, helper, views, and test directories.
|
||||||
m.directory(File.join('app/models', class_path))
|
m.directory(File.join('app/models', class_path))
|
||||||
|
|
|
@ -36,8 +36,8 @@ class ScaffoldGenerator < Rails::Generator::NamedBase
|
||||||
def manifest
|
def manifest
|
||||||
record do |m|
|
record do |m|
|
||||||
# Check for class naming collisions.
|
# Check for class naming collisions.
|
||||||
m.class_collisions(controller_class_path, "#{controller_class_name}Controller", "#{controller_class_name}Helper")
|
m.class_collisions("#{controller_class_name}Controller", "#{controller_class_name}Helper")
|
||||||
m.class_collisions(class_path, "#{class_name}")
|
m.class_collisions(class_name)
|
||||||
|
|
||||||
# Controller, helper, views, test and stylesheets directories.
|
# Controller, helper, views, test and stylesheets directories.
|
||||||
m.directory(File.join('app/models', class_path))
|
m.directory(File.join('app/models', class_path))
|
||||||
|
|
Loading…
Reference in New Issue