Add support for factory_bot's default suffixed pattern (#59)

drwl · web-flow · commit 76ccda9752da · 2023-09-16T12:14:23.000-04:00
From ctran/annotate_models#994. Credit goes to @meric426.
diff --git 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
@@ -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"
         ])

Original file line number	Diff line number	Diff line change
`@@ -142,6 +142,8 @@ def factory_files(root_directory)`
`142`	`142`	`File.join(root_directory, FilePatterns::FACTORY_BOT_SPEC_DIR, "%TABLE_NAME%.rb"), # (new style)`
`143`	`143`	`File.join(root_directory, FilePatterns::FACTORY_BOT_TEST_DIR, "%PLURALIZED_MODEL_NAME%.rb"), # (new style)`
`144`	`144`	`File.join(root_directory, FilePatterns::FACTORY_BOT_SPEC_DIR, "%PLURALIZED_MODEL_NAME%.rb"), # (new style)`
	`145`	`+ File.join(root_directory, FilePatterns::FACTORY_BOT_TEST_DIR, "%PLURALIZED_MODEL_NAME%_factory.rb"), # (new style)`
	`146`	`+ File.join(root_directory, FilePatterns::FACTORY_BOT_SPEC_DIR, "%PLURALIZED_MODEL_NAME%_factory.rb"), # (new style)`
`145`	`147`	`File.join(root_directory, FilePatterns::FABRICATORS_TEST_DIR, "%MODEL_NAME%_fabricator.rb"),`
`146`	`148`	`File.join(root_directory, FilePatterns::FABRICATORS_SPEC_DIR, "%MODEL_NAME%_fabricator.rb")`
`147`	`149`	`]`