diff --git a/jeeves/core/actions/base.py b/jeeves/core/actions/base.py index 0fca8c2..430e032 100644 --- a/jeeves/core/actions/base.py +++ b/jeeves/core/actions/base.py @@ -16,4 +16,7 @@ class Action: @abstractmethod def execute(self, workspace, **kwargs): + """ + Main method to override that handles the work for the defining action. + """ pass diff --git a/jeeves/core/actions/tests/__init__.py b/jeeves/core/actions/tests/__init__.py new file mode 100644 index 0000000..e69de29 diff --git a/jeeves/core/tests/test_actions.py b/jeeves/core/actions/tests/test_base.py similarity index 100% rename from jeeves/core/tests/test_actions.py rename to jeeves/core/actions/tests/test_base.py diff --git a/jeeves/core/tests/factories.py b/jeeves/core/tests/factories.py index d266062..cf49d9c 100644 --- a/jeeves/core/tests/factories.py +++ b/jeeves/core/tests/factories.py @@ -1,13 +1,12 @@ import factory from jeeves.core.objects import Flow, Task -from jeeves.core.registry import ActionRegistry class TaskFactory(factory.Factory): name = factory.Faker("name") - type = factory.Iterator(ActionRegistry.actions) - parameters = {"script": "#!/bin/bash\necho test"} + type = "jeeves.core.actions.stub:StubSuccessAction" + parameters = {} class Meta: model = Task diff --git a/jeeves/core/tests/test_parsers.py b/jeeves/core/tests/test_parsers.py index 431bee3..af272a5 100644 --- a/jeeves/core/tests/test_parsers.py +++ b/jeeves/core/tests/test_parsers.py @@ -24,7 +24,7 @@ EXPORTED_FLOW = { def test_parser_object_to_dict_ok(): obj: Flow = FlowFactory() result = FlowParser.to_dict(obj) - assert set(obj.fields).issubset(set(result)) + assert set(obj.dict()).issuperset(set(result)) def test_parser_dict_to_object_ok(): @@ -53,7 +53,7 @@ def test_parser_json_file_to_object_ok(): def test_parser_obj_to_json_ok(): obj: Flow = FlowFactory() result = FlowParser.to_json(obj) - assert set(obj.fields).issubset(set(json.loads(result))) + assert set(obj.dict()).issuperset(set(json.loads(result))) ######## @@ -77,4 +77,4 @@ def test_parser_toml_file_to_object_ok(): def test_parser_obj_to_toml_ok(): obj: Flow = FlowFactory() result = FlowParser.to_toml(obj) - assert set(obj.fields).issubset(set(toml.loads(result))) + assert set(obj.dict()).issuperset(set(toml.loads(result)))