Make all factories fixtures (#612)

* Make all factories fixtures explicitly

* Add Actions factory

* Replace actions_example fixture with actions_factory

* Move fixtures in conftest to modules

- if a fixture is only used in one module, move it to that module
- where possible, avoid patching attributes of "fixture objects" and use
  factories to generate new objects instead

Author: grahamalama

tests/conftest.py

@@ -12,15 +12,9 @@
 from jbi.app import app
 from jbi.configuration import get_actions
 from jbi.environment import Settings
-from jbi.models import (
-    Action,
-    ActionContext,
-    Actions,
-    BugzillaWebhookComment,
-    BugzillaWebhookRequest,
-)
+from jbi.models import ActionContext, BugzillaWebhookComment, BugzillaWebhookRequest
 from jbi.services import bugzilla, jira
-from tests.fixtures import factories
+from tests.fixtures.factories import *
 
 
 class FilteredLogCaptureFixture(pytest.LogCaptureFixture):
@@ -107,160 +101,43 @@ def mocked_responses():
 
 
 @pytest.fixture
-def context_create_example() -> ActionContext:
-    return factories.action_context_factory(
+def context_create_example(action_context_factory) -> ActionContext:
+    return action_context_factory(
         operation=Operation.CREATE,
     )
 
 
 @pytest.fixture
-def context_update_example() -> ActionContext:
-    bug = factories.bug_factory(
-        see_also=["https://mozilla.atlassian.net/browse/JBI-234"]
-    )
-    context = factories.action_context_factory(
-        operation=Operation.UPDATE,
-        bug=bug,
-        jira=factories.jira_context_factory(issue=bug.extract_from_see_also()),
-    )
-    return context
-
-
-@pytest.fixture
-def context_update_status_assignee() -> ActionContext:
-    bug = factories.bug_factory(
-        see_also=["https://mozilla.atlassian.net/browse/JBI-234"]
-    )
-    changes = [
-        {
-            "field": "status",
-            "removed": "OPEN",
-            "added": "FIXED",
-        },
-        {
-            "field": "assignee",
-            "removed": "[email protected]",
-            "added": "[email protected]",
-        },
-    ]
-    event = factories.webhook_event_factory(routing_key="bug.modify", changes=changes)
-    context = factories.action_context_factory(
-        operation=Operation.UPDATE,
-        bug=bug,
-        event=event,
-        jira=factories.jira_context_factory(issue=bug.extract_from_see_also()),
-    )
-    return context
-
-
-@pytest.fixture
-def context_comment_example() -> ActionContext:
-    user = factories.webhook_user_factory(login="[email protected]")
+def context_comment_example(
+    webhook_user_factory,
+    bug_factory,
+    webhook_event_factory,
+    action_context_factory,
+    jira_context_factory,
+) -> ActionContext:
+    user = webhook_user_factory(login="[email protected]")
     comment = BugzillaWebhookComment.parse_obj({"number": 2, "body": "hello"})
-    bug = factories.bug_factory(
+    bug = bug_factory(
         see_also=["https://mozilla.atlassian.net/browse/JBI-234"],
         comment=comment,
     )
-    event = factories.webhook_event_factory(target="comment", user=user)
-    context = factories.action_context_factory(
+    event = webhook_event_factory(target="comment", user=user)
+    context = action_context_factory(
         operation=Operation.COMMENT,
         bug=bug,
         event=event,
-        jira=factories.jira_context_factory(issue=bug.extract_from_see_also()),
-    )
-    return context
-
-
-@pytest.fixture
-def context_update_resolution_example() -> ActionContext:
-    bug = factories.bug_factory(
-        see_also=["https://mozilla.atlassian.net/browse/JBI-234"]
-    )
-    event = factories.webhook_event_factory(
-        action="modify",
-        changes=[
-            factories.webhook_event_change_factory(
-                field="resolution", removed="OPEN", added="FIXED"
-            ),
-        ],
-    )
-    context = factories.action_context_factory(
-        operation=Operation.UPDATE,
-        bug=bug,
-        event=event,
-        jira=factories.jira_context_factory(issue=bug.extract_from_see_also()),
+        jira=jira_context_factory(issue=bug.extract_from_see_also()),
     )
     return context
 
 
 @pytest.fixture
-def webhook_create_example() -> BugzillaWebhookRequest:
-    webhook_payload = factories.webhook_factory()
+def webhook_create_example(webhook_factory) -> BugzillaWebhookRequest:
+    webhook_payload = webhook_factory()
 
     return webhook_payload
 
 
-@pytest.fixture
-def webhook_comment_example() -> BugzillaWebhookRequest:
-    user = factories.webhook_user_factory(login="[email protected]")
-    comment = BugzillaWebhookComment.parse_obj({"number": 2, "body": "hello"})
-    bug = factories.bug_factory(
-        see_also=["https://mozilla.atlassian.net/browse/JBI-234"],
-        comment=comment,
-    )
-    event = factories.webhook_event_factory(target="comment", user=user)
-    webhook_payload = factories.webhook_factory(bug=bug, event=event)
-
-    return webhook_payload
-
-
-@pytest.fixture
-def webhook_private_comment_example() -> BugzillaWebhookRequest:
-    user = factories.webhook_user_factory(login="[email protected]")
-    event = factories.webhook_event_factory(target="comment", user=user)
-    bug = factories.bug_factory(
-        comment={"id": 344, "number": 2, "is_private": True},
-        see_also=["https://mozilla.atlassian.net/browse/JBI-234"],
-    )
-    webhook_payload = factories.webhook_factory(bug=bug, event=event)
-    return webhook_payload
-
-
-@pytest.fixture
-def webhook_change_status_assignee():
-    changes = [
-        factories.webhook_event_change_factory(
-            field="status", removed="OPEN", added="FIXED"
-        ),
-        factories.webhook_event_change_factory(
-            field="assignee", removed="[email protected]", added="[email protected]"
-        ),
-    ]
-    event = factories.webhook_event_factory(routing_key="bug.modify", changes=changes)
-    webhook_payload = factories.webhook_factory(event=event)
-    return webhook_payload
-
-
-@pytest.fixture
-def action_params_factory():
-    return factories.action_params_factory
-
-
-@pytest.fixture
-def action_factory():
-    return factories.action_factory
-
-
-@pytest.fixture
-def action_example() -> Action:
-    return factories.action_factory()
-
-
-@pytest.fixture
-def actions_example(action_example) -> Actions:
-    return Actions.parse_obj([action_example])
-
-
 @pytest.fixture(autouse=True)
 def sleepless(monkeypatch):
     # https://stackoverflow.com/a/54829577