Skip to content

Commit

Permalink
add more details
Browse files Browse the repository at this point in the history
  • Loading branch information
@sastels
sastels committed Oct 4, 2024
1 parent 0c8f1f5 commit 864a4f5
Show file tree
Hide file tree
Showing 2 changed files with 32 additions and 14 deletions.
9 changes: 7 additions & 2 deletions app/templates/views/find-ids/find-ids.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -37,16 +37,21 @@ <h1 class="heading-large">
<nav class="browse-list">
<ul>
<li class="browse-list-item">
{{ record.id }} :
{{ record.id }} : <br>
{% if record.type == "notification" %}
<a href="{{url_for('.service_dashboard', service_id=record.service_id)}}" class="browse-list-link">{{ record.service_name }}</a> /
<a href="{{url_for('.view_template', service_id=record.service_id, template_id=record.template_id)}}" class="browse-list-link">{{ record.template_name }}</a> /
<a href="{{url_for('.view_notification', service_id=record.service_id, notification_id=record.id)}}" class="browse-list-link">notification</a>
{% elif record.type == "template" %}
<a href="{{url_for('.service_dashboard', service_id=record.service_id)}}" class="browse-list-link">{{ record.service_name }}</a> /
<a href="{{url_for('.view_template', service_id=record.service_id, template_id=record.id)}}" class="browse-list-link">{{ record.template_name }}</a>
{% elif record.type == "service" %}
<a href="{{url_for('.service_dashboard', service_id=record.id)}}" class="browse-list-link">{{ record.service_name}} </a>
<a href="{{url_for('.service_dashboard', service_id=record.id)}}" class="browse-list-link">{{ record.service_name }}</a>
{% elif record.type == "user" %}
<a href="{{url_for('.user_information', user_id=record.id)}}" class="browse-list-link">{{ record.user_name }}</a>
{% elif record.type == "job" %}
<a href="{{url_for('.service_dashboard', service_id=record.service_id)}}" class="browse-list-link">{{ record.service_name }}</a> /
<a href="{{url_for('.view_template', service_id=record.service_id, template_id=record.template_id)}}" class="browse-list-link">{{ record.template_name }}</a> /
<a href="{{url_for('.view_job', service_id=record.service_id, job_id=record.id)}}" class="browse-list-link">job</a>
{% else %}
{{ record.type}}
Expand Down
37 changes: 25 additions & 12 deletions tests/app/main/views/test_find_ids.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,34 +27,42 @@ def test_find_ids_displays_notifications_found(client_request, platform_admin_us
client_request.login(platform_admin_user)
get_records = mocker.patch(
"app.support_api_client.find_ids",
return_value=[{"id": "1234", "type": "notification", "service_id": "service_1234"}],
return_value=[{"id": "1234", "type": "notification", "service_id": "service_1234", "service_name": "Test Service", "template_id": "template_1234", "template_name": "Test Template"}],
)
document = client_request.post(
"main.find_ids",
_data={"search": "1234"},
_expected_status=200,
)
get_records.assert_called_once_with("1234")
result = document.find("a", {"class": "browse-list-link"})
assert result.text.strip() == "notification"
assert result.attrs["href"] == "/services/service_1234/notification/1234"
results = document.findAll("a", {"class": "browse-list-link"})
assert len(results) == 3
assert results[0].text.strip() == "Test Service"
assert results[0].attrs["href"] == "/services/service_1234"
assert results[1].text.strip() == "Test Template"
assert results[1].attrs["href"] == "/services/service_1234/templates/template_1234"
assert results[2].text.strip() == "notification"
assert results[2].attrs["href"] == "/services/service_1234/notification/1234"


def test_find_ids_displays_templates_found(client_request, platform_admin_user, mocker):
client_request.login(platform_admin_user)
get_records = mocker.patch(
"app.support_api_client.find_ids",
return_value=[{"id": "1234", "type": "template", "template_name": "Test Template", "service_id": "service_1234"}],
return_value=[{"id": "1234", "type": "template", "template_name": "Test Template", "service_id": "service_1234", "service_name": "Test Service"}],
)
document = client_request.post(
"main.find_ids",
_data={"search": "1234"},
_expected_status=200,
)
get_records.assert_called_once_with("1234")
result = document.find("a", {"class": "browse-list-link"})
assert result.text.strip() == "Test Template"
assert result.attrs["href"] == "/services/service_1234/templates/1234"
results = document.findAll("a", {"class": "browse-list-link"})
assert len(results) == 2
assert results[0].text.strip() == "Test Service"
assert results[0].attrs["href"] == "/services/service_1234"
assert results[1].text.strip() == "Test Template"
assert results[1].attrs["href"] == "/services/service_1234/templates/1234"


def test_find_ids_displays_users_found(client_request, platform_admin_user, mocker):
Expand All @@ -79,17 +87,22 @@ def test_find_ids_displays_jobs_found(client_request, platform_admin_user, mocke
client_request.login(platform_admin_user)
get_records = mocker.patch(
"app.support_api_client.find_ids",
return_value=[{"id": "1234", "type": "job", "service_id": "service_1234"}],
return_value=[{"id": "1234", "type": "job", "service_id": "service_1234", "service_name": "Test Service", "template_id": "template_1234", "template_name": "Test Template"}],
)
document = client_request.post(
"main.find_ids",
_data={"search": "1234"},
_expected_status=200,
)
get_records.assert_called_once_with("1234")
result = document.find("a", {"class": "browse-list-link"})
assert result.text.strip() == "job"
assert result.attrs["href"] == "/services/service_1234/jobs/1234"
results = document.findAll("a", {"class": "browse-list-link"})
assert len(results) == 3
assert results[0].text.strip() == "Test Service"
assert results[0].attrs["href"] == "/services/service_1234"
assert results[1].text.strip() == "Test Template"
assert results[1].attrs["href"] == "/services/service_1234/templates/template_1234"
assert results[2].text.strip() == "job"
assert results[2].attrs["href"] == "/services/service_1234/jobs/1234"


def test_find_ids_display_two_records(client_request, platform_admin_user, mocker):
Expand Down

0 comments on commit 864a4f5

Please sign in to comment.