Commit 513b837f by Marcos Piccinini

merge peterpunk fork

parents 79353d47 978c3405
...@@ -8,10 +8,11 @@ module AnnotateModels ...@@ -8,10 +8,11 @@ module AnnotateModels
# I dont use windows, can`t test # I dont use windows, can`t test
UNIT_TEST_DIR = File.join("test", "unit" ) UNIT_TEST_DIR = File.join("test", "unit" )
SPEC_MODEL_DIR = File.join("spec", "models") SPEC_MODEL_DIR = File.join("spec", "models")
EXEMPLARS_TEST_DIR = File.join("test", "exemplars")
# Object Daddy http://github.com/flogic/object_daddy/tree/master # Object Daddy http://github.com/flogic/object_daddy/tree/master
EXEMPLARS_DIR = File.join("spec", "exemplars") EXEMPLARS_SPEC_DIR = File.join("spec", "exemplars")
# Machinist http://github.com/notahat/machinist # Machinist http://github.com/notahat/machinist
BLUEPRINT = File.join("spec", "blueprint") BLUEPRINTS_DIR = File.join("test", "blueprints")
def model_dir def model_dir
@model_dir || "app/models" @model_dir || "app/models"
...@@ -154,7 +155,9 @@ module AnnotateModels ...@@ -154,7 +155,9 @@ module AnnotateModels
[ [
File.join(UNIT_TEST_DIR, "#{model_name}_test.rb"), # test File.join(UNIT_TEST_DIR, "#{model_name}_test.rb"), # test
File.join(SPEC_MODEL_DIR, "#{model_name}_spec.rb"), # spec File.join(SPEC_MODEL_DIR, "#{model_name}_spec.rb"), # spec
File.join(EXEMPLARS_DIR, "#{model_name}_exemplar.rb"), # Object Daddy File.join(EXEMPLARS_TEST_DIR, "#{model_name}_exemplar.rb"), # Object Daddy
File.join(EXEMPLARS_SPEC_DIR, "#{model_name}_exemplar.rb"), # Object Daddy
File.join(BLUEPRINTS_DIR, "#{model_name}_blueprint.rb"), # Machinist Blueprints
].each { |file| annotate_one_file(file, info) } ].each { |file| annotate_one_file(file, info) }
FIXTURE_DIRS.each do |dir| FIXTURE_DIRS.each do |dir|
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment