From 496edc6d16b88874347eac35364e67ea3d29386d Mon Sep 17 00:00:00 2001 From: "Andrew W. Lee" Date: Sun, 3 Sep 2023 15:52:14 -0700 Subject: [PATCH] Add support for factory_bot's default suffixed pattern --- lib/annotate_rb/model_annotator/pattern_getter.rb | 2 ++ spec/lib/annotate_rb/model_annotator/pattern_getter_spec.rb | 2 ++ 2 files changed, 4 insertions(+) diff --git a/lib/annotate_rb/model_annotator/pattern_getter.rb b/lib/annotate_rb/model_annotator/pattern_getter.rb index c49fa9ee..293f14e1 100644 --- a/lib/annotate_rb/model_annotator/pattern_getter.rb +++ b/lib/annotate_rb/model_annotator/pattern_getter.rb @@ -142,6 +142,8 @@ def factory_files(root_directory) File.join(root_directory, FilePatterns::FACTORY_BOT_SPEC_DIR, "%TABLE_NAME%.rb"), # (new style) File.join(root_directory, FilePatterns::FACTORY_BOT_TEST_DIR, "%PLURALIZED_MODEL_NAME%.rb"), # (new style) File.join(root_directory, FilePatterns::FACTORY_BOT_SPEC_DIR, "%PLURALIZED_MODEL_NAME%.rb"), # (new style) + File.join(root_directory, FilePatterns::FACTORY_BOT_TEST_DIR, "%PLURALIZED_MODEL_NAME%_factory.rb"), # (new style) + File.join(root_directory, FilePatterns::FACTORY_BOT_SPEC_DIR, "%PLURALIZED_MODEL_NAME%_factory.rb"), # (new style) File.join(root_directory, FilePatterns::FABRICATORS_TEST_DIR, "%MODEL_NAME%_fabricator.rb"), File.join(root_directory, FilePatterns::FABRICATORS_SPEC_DIR, "%MODEL_NAME%_fabricator.rb") ] diff --git a/spec/lib/annotate_rb/model_annotator/pattern_getter_spec.rb b/spec/lib/annotate_rb/model_annotator/pattern_getter_spec.rb index c47666c5..57f0ae12 100644 --- a/spec/lib/annotate_rb/model_annotator/pattern_getter_spec.rb +++ b/spec/lib/annotate_rb/model_annotator/pattern_getter_spec.rb @@ -88,6 +88,8 @@ "spec/factories/%TABLE_NAME%.rb", "test/factories/%PLURALIZED_MODEL_NAME%.rb", "spec/factories/%PLURALIZED_MODEL_NAME%.rb", + "test/factories/%PLURALIZED_MODEL_NAME%_factory.rb", + "spec/factories/%PLURALIZED_MODEL_NAME%_factory.rb", "test/fabricators/%MODEL_NAME%_fabricator.rb", "spec/fabricators/%MODEL_NAME%_fabricator.rb" ])