Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Test get_elements() more thoroughly #5

Merged
merged 2 commits into from
Dec 20, 2023
Merged

Test get_elements() more thoroughly #5

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
18d9189
Remove flawed if condition
MetRonnie Dec 18, 2023
30315ca
Test `get_elements()` more thoroughly
MetRonnie Dec 18, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 0 additions & 2 deletions cylc/uiserver/schema.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -291,8 +291,6 @@ async def get_elements(root, info, **kwargs):

_, field_ids = process_resolver_info(root, info, kwargs)

if hasattr(kwargs, 'id'):
kwargs['ids'] = [kwargs.get('id')]
ChrisPaulBennett marked this conversation as resolved.
Show resolved Hide resolved
if field_ids:
if isinstance(field_ids, str):
field_ids = [field_ids]
Expand Down
90 changes: 76 additions & 14 deletions cylc/uiserver/tests/test_workflow_retrieval.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -273,7 +273,78 @@ async def test_list_elements(monkeypatch):
'At least one workflow must be provided.'


async def test_get_elements(monkeypatch):
@pytest.mark.parametrize(
'field_ids, kwargs, expected',
[
pytest.param(
[],
{
'ids': ['//1/t/01'],
'workflows': ['~u/w'],
},
[],
id="field_ids = empty list"
),
pytest.param(
None,
{
'ids': ['//1/t/01'],
'exids': ['//1/t/01'],
'workflows': ['~u/w'],
'exworkflows': ['~u2/w']
},
{
'live': False,
'ids': [Tokens('//1/t/01')],
'exids': [Tokens('//1/t/01')],
'workflows': [Tokens('~u/w')],
'exworkflows': [Tokens('~u2/w')]
},
id="field_ids = None"
),
pytest.param(
'//2/t/01',
{
'ids': ['//1/t/01'],
'exids': [],
'workflows': ['~u/w'],
'exworkflows': []
},
{
'live': False,
'ids': [Tokens('//2/t/01')],
'exids': [],
'workflows': [Tokens('~u/w')],
'exworkflows': []
},
id="field_ids = str"
),
pytest.param(
{
'//2/t/01': 'something',
'//2/t/02': 'something else',
},
{
'ids': ['//1/t/01'],
'exids': [],
'workflows': ['~u/w'],
'exworkflows': []
},
{
'live': False,
'ids': [Tokens('//2/t/01'), Tokens('//2/t/02')],
'exids': [],
'workflows': [Tokens('~u/w')],
'exworkflows': []
},
id="field_ids = dict"
)
]
)
async def test_get_elements(
monkeypatch: pytest.MonkeyPatch,
field_ids, kwargs, expected
):

# get_elements takes 2 args, root and info and kwargs.
# Root always seems to be none
Expand All @@ -286,25 +357,16 @@ async def mock_return_list_elements(kwargs):
return kwargs

def mock_process_resolver_info(*args):
return 'unused_var', None
return None, field_ids

monkeypatch.setattr('cylc.uiserver.schema.list_elements',
mock_return_list_elements)
monkeypatch.setattr('cylc.uiserver.schema.process_resolver_info',
mock_process_resolver_info)

return_value = await get_elements(
assert await get_elements(
root,
info,
live=False,
ids=[],
exids=[],
workflows=['~mock_workflow_dir'],
exworkflows=[])

assert return_value['exids'] == []
assert return_value['exworkflows'] == []
assert return_value['ids'] == []
assert return_value['live'] is False
assert isinstance(return_value['workflows'], List)
assert isinstance(return_value['workflows'][0], Tokens)
**kwargs
) == expected