Skip to content

Commit 2d46c15

Browse files
anjalitrace2-nhsanjalitrace2-nhs
committed
NRL-1948 be able to run unit tests without needing to login to aws - exclude beefy tests closer to E2Es
1 parent 2b35229 commit 2d46c15

File tree

18 files changed

+169
-125
lines changed

18 files changed

+169
-125
lines changed

‎Makefile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,7 @@ publish-ci-image: ## Publish the CI image
105105

106106
test: check-warn ## Run the unit tests
107107
@echo "Running unit tests"
108-
pytest --ignore=tests/smoke $(TEST_ARGS)
108+
PYTHONPATH=. poetry run pytest --ignore tests/smoke -k "not beefy" $(TEST_ARGS)
109109

110110
test-features-integration: check-warn ## Run the BDD feature tests in the integration environment
111111
@echo "Running feature tests in the integration environment ${TF_WORKSPACE_NAME}"

‎api/consumer/readDocumentReference/tests/test_read_document_reference_consumer.py‎

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,9 @@
1616

1717
@mock_aws
1818
@mock_repository
19-
def test_read_document_reference_happy_path(repository: DocumentPointerRepository):
19+
def test_beefy_read_document_reference_happy_path(
20+
repository: DocumentPointerRepository,
21+
):
2022
# Create the document pointer
2123
doc_ref = load_document_reference("Y05868-736253002-Valid")
2224
doc_pointer = DocumentPointer.from_document_reference(doc_ref)
@@ -41,7 +43,7 @@ def test_read_document_reference_happy_path(repository: DocumentPointerRepositor
4143

4244
@mock_aws
4345
@mock_repository
44-
def test_read_document_reference_not_found(repository: DocumentPointerRepository):
46+
def test_beefy_read_document_reference_not_found(repository: DocumentPointerRepository):
4547
event = create_test_api_gateway_event(
4648
headers=create_headers(), path_parameters={"id": "Y05868-99999-99999-999999"}
4749
)
@@ -114,7 +116,7 @@ def test_read_document_reference_missing_id():
114116

115117
@mock_aws
116118
@mock_repository
117-
def test_read_document_reference_unauthorised_for_type(
119+
def test_beefy_read_document_reference_unauthorised_for_type(
118120
repository: DocumentPointerRepository,
119121
):
120122
doc_ref = load_document_reference("RQI-736253002-Valid")
@@ -159,7 +161,7 @@ def test_read_document_reference_unauthorised_for_type(
159161

160162
@mock_aws
161163
@mock_repository
162-
def test_document_reference_invalid_json(repository: DocumentPointerRepository):
164+
def test_beefy_document_reference_invalid_json(repository: DocumentPointerRepository):
163165
doc_ref = load_document_reference("Y05868-736253002-Valid")
164166
doc_pointer = DocumentPointer.from_document_reference(doc_ref)
165167
doc_pointer.document = "invalid json"

‎api/consumer/searchDocumentReference/tests/test_search_document_reference_consumer.py‎

Lines changed: 23 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,9 @@
2424

2525
@mock_aws
2626
@mock_repository
27-
def test_search_document_reference_happy_path(repository: DocumentPointerRepository):
27+
def test_beefy_search_document_reference_happy_path(
28+
repository: DocumentPointerRepository,
29+
):
2830
doc_ref = load_document_reference("Y05868-736253002-Valid")
2931
doc_pointer = DocumentPointer.from_document_reference(doc_ref)
3032
repository.create(doc_pointer)
@@ -63,7 +65,7 @@ def test_search_document_reference_happy_path(repository: DocumentPointerReposit
6365

6466
@mock_aws
6567
@mock_repository
66-
def test_search_document_reference_accession_number_in_pointer(
68+
def test_beefy_search_document_reference_accession_number_in_pointer(
6769
repository: DocumentPointerRepository,
6870
):
6971
doc_ref = load_document_reference("Y05868-736253002-Valid")
@@ -115,7 +117,7 @@ def test_search_document_reference_accession_number_in_pointer(
115117

116118
@mock_aws
117119
@mock_repository
118-
def test_search_document_reference_happy_path_with_custodian(
120+
def test_beefy_search_document_reference_happy_path_with_custodian(
119121
repository: DocumentPointerRepository,
120122
):
121123
doc_ref = load_document_reference("Y05868-736253002-Valid")
@@ -156,7 +158,7 @@ def test_search_document_reference_happy_path_with_custodian(
156158

157159
@mock_aws
158160
@mock_repository
159-
def test_search_document_reference_happy_path_with_type(
161+
def test_beefy_search_document_reference_happy_path_with_type(
160162
repository: DocumentPointerRepository,
161163
):
162164
doc_ref = load_document_reference("Y05868-736253002-Valid")
@@ -197,7 +199,7 @@ def test_search_document_reference_happy_path_with_type(
197199

198200
@mock_aws
199201
@mock_repository
200-
def test_search_document_reference_happy_path_with_category(
202+
def test_beefy_search_document_reference_happy_path_with_category(
201203
repository: DocumentPointerRepository,
202204
):
203205
doc_ref = load_document_reference("Y05868-736253002-Valid")
@@ -250,7 +252,7 @@ def test_search_document_reference_happy_path_with_category(
250252

251253
@mock_aws
252254
@mock_repository
253-
def test_search_document_reference_happy_path_with_category_and_type(
255+
def test_beefy_search_document_reference_happy_path_with_category_and_type(
254256
repository: DocumentPointerRepository,
255257
):
256258
doc_ref = load_document_reference("Y05868-736253002-Valid")
@@ -304,7 +306,7 @@ def test_search_document_reference_happy_path_with_category_and_type(
304306

305307
@mock_aws
306308
@mock_repository
307-
def test_search_document_reference_happy_path_with_category_and_type_no_results(
309+
def test_beefy_search_document_reference_happy_path_with_category_and_type_no_results(
308310
repository: DocumentPointerRepository,
309311
):
310312
doc_ref = load_document_reference("Y05868-736253002-Valid")
@@ -358,7 +360,7 @@ def test_search_document_reference_happy_path_with_category_and_type_no_results(
358360

359361
@mock_aws
360362
@mock_repository
361-
def test_search_document_reference_happy_path_with_multiple_categories_and_type(
363+
def test_beefy_search_document_reference_happy_path_with_multiple_categories_and_type(
362364
repository: DocumentPointerRepository,
363365
):
364366
doc_ref = load_document_reference("Y05868-736253002-Valid")
@@ -412,7 +414,7 @@ def test_search_document_reference_happy_path_with_multiple_categories_and_type(
412414

413415
@mock_aws
414416
@mock_repository
415-
def test_search_document_reference_happy_path_with_multiple_categories(
417+
def test_beefy_search_document_reference_happy_path_with_multiple_categories(
416418
repository: DocumentPointerRepository,
417419
):
418420
doc_ref = load_document_reference("Y05868-736253002-Valid")
@@ -469,7 +471,7 @@ def test_search_document_reference_happy_path_with_multiple_categories(
469471

470472
@mock_aws
471473
@mock_repository
472-
def test_search_document_reference_happy_path_with_nicip_type(
474+
def test_beefy_search_document_reference_happy_path_with_nicip_type(
473475
repository: DocumentPointerRepository,
474476
):
475477
doc_ref = load_document_reference("Y05868-736253002-Valid")
@@ -516,7 +518,9 @@ def test_search_document_reference_happy_path_with_nicip_type(
516518

517519
@mock_aws
518520
@mock_repository
519-
def test_search_document_reference_no_results(repository: DocumentPointerRepository):
521+
def test_beefy_search_document_reference_no_results(
522+
repository: DocumentPointerRepository,
523+
):
520524
event = create_test_api_gateway_event(
521525
headers=create_headers(),
522526
query_string_parameters={
@@ -550,7 +554,7 @@ def test_search_document_reference_no_results(repository: DocumentPointerReposit
550554

551555
@mock_aws
552556
@mock_repository
553-
def test_search_document_reference_missing_nhs_number(
557+
def test_beefy_search_document_reference_missing_nhs_number(
554558
repository: DocumentPointerRepository,
555559
):
556560
event = create_test_api_gateway_event(headers=create_headers())
@@ -589,7 +593,7 @@ def test_search_document_reference_missing_nhs_number(
589593

590594
@mock_aws
591595
@mock_repository
592-
def test_search_document_reference_invalid_nhs_number(
596+
def test_beefy_search_document_reference_invalid_nhs_number(
593597
repository: DocumentPointerRepository,
594598
):
595599
event = create_test_api_gateway_event(
@@ -633,7 +637,9 @@ def test_search_document_reference_invalid_nhs_number(
633637

634638
@mock_aws
635639
@mock_repository
636-
def test_search_document_reference_invalid_type(repository: DocumentPointerRepository):
640+
def test_beefy_search_document_reference_invalid_type(
641+
repository: DocumentPointerRepository,
642+
):
637643
event = create_test_api_gateway_event(
638644
headers=create_headers(),
639645
query_string_parameters={
@@ -676,7 +682,7 @@ def test_search_document_reference_invalid_type(repository: DocumentPointerRepos
676682

677683
@mock_aws
678684
@mock_repository
679-
def test_search_document_reference_invalid_category(
685+
def test_beefy_search_document_reference_invalid_category(
680686
repository: DocumentPointerRepository,
681687
):
682688
event = create_test_api_gateway_event(
@@ -721,7 +727,7 @@ def test_search_document_reference_invalid_category(
721727

722728
@mock_aws
723729
@mock_repository
724-
def test_search_document_reference_filters_by_summary_count(
730+
def test_beefy_search_document_reference_filters_by_summary_count(
725731
repository: DocumentPointerRepository,
726732
):
727733
doc_ref = load_document_reference("Y05868-736253002-Valid")
@@ -762,7 +768,7 @@ def test_search_document_reference_filters_by_summary_count(
762768
@mock_aws
763769
@mock_repository
764770
@patch("api.consumer.searchDocumentReference.search_document_reference.logger")
765-
def test_search_document_reference_invalid_json(
771+
def test_beefy_search_document_reference_invalid_json(
766772
mock_logger, repository: DocumentPointerRepository
767773
):
768774
doc_ref = load_document_reference("Y05868-736253002-Valid")

‎api/consumer/searchPostDocumentReference/tests/test_search_post_document_reference_consumer.py‎

Lines changed: 14 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525

2626
@mock_aws
2727
@mock_repository
28-
def test_search_post_document_reference_happy_path(
28+
def test_beefy_search_post_document_reference_happy_path(
2929
repository: DocumentPointerRepository,
3030
):
3131
doc_ref = load_document_reference("Y05868-736253002-Valid")
@@ -67,7 +67,7 @@ def test_search_post_document_reference_happy_path(
6767

6868
@mock_aws
6969
@mock_repository
70-
def test_search_post_document_reference_happy_path_with_custodian(
70+
def test_beefy_search_post_document_reference_happy_path_with_custodian(
7171
repository: DocumentPointerRepository,
7272
):
7373
doc_ref = load_document_reference("Y05868-736253002-Valid")
@@ -110,7 +110,7 @@ def test_search_post_document_reference_happy_path_with_custodian(
110110

111111
@mock_aws
112112
@mock_repository
113-
def test_search_post_document_reference_happy_path_with_type(
113+
def test_beefy_search_post_document_reference_happy_path_with_type(
114114
repository: DocumentPointerRepository,
115115
):
116116
doc_ref = load_document_reference("Y05868-736253002-Valid")
@@ -153,7 +153,7 @@ def test_search_post_document_reference_happy_path_with_type(
153153

154154
@mock_aws
155155
@mock_repository
156-
def test_search_post_document_reference_happy_path_with_category(
156+
def test_beefy_search_post_document_reference_happy_path_with_category(
157157
repository: DocumentPointerRepository,
158158
):
159159
doc_ref = load_document_reference("Y05868-736253002-Valid")
@@ -209,7 +209,7 @@ def test_search_post_document_reference_happy_path_with_category(
209209

210210
@mock_aws
211211
@mock_repository
212-
def test_search_post_document_reference_happy_path_with_multiple_categories(
212+
def test_beefy_search_post_document_reference_happy_path_with_multiple_categories(
213213
repository: DocumentPointerRepository,
214214
):
215215
doc_ref = load_document_reference("Y05868-736253002-Valid")
@@ -268,7 +268,9 @@ def test_search_post_document_reference_happy_path_with_multiple_categories(
268268

269269
@mock_aws
270270
@mock_repository
271-
def test_search_document_reference_no_results(repository: DocumentPointerRepository):
271+
def test_beefy_search_document_reference_no_results(
272+
repository: DocumentPointerRepository,
273+
):
272274
event = create_test_api_gateway_event(
273275
headers=create_headers(),
274276
body=json.dumps(
@@ -304,7 +306,7 @@ def test_search_document_reference_no_results(repository: DocumentPointerReposit
304306

305307
@mock_aws
306308
@mock_repository
307-
def test_search_post_document_reference_missing_nhs_number(
309+
def test_beefy_search_post_document_reference_missing_nhs_number(
308310
repository: DocumentPointerRepository,
309311
):
310312
event = create_test_api_gateway_event(headers=create_headers(), body="{}")
@@ -343,7 +345,7 @@ def test_search_post_document_reference_missing_nhs_number(
343345

344346
@mock_aws
345347
@mock_repository
346-
def test_search_post_document_reference_invalid_nhs_number(
348+
def test_beefy_search_post_document_reference_invalid_nhs_number(
347349
repository: DocumentPointerRepository,
348350
):
349351
event = create_test_api_gateway_event(
@@ -387,7 +389,7 @@ def test_search_post_document_reference_invalid_nhs_number(
387389

388390
@mock_aws
389391
@mock_repository
390-
def test_search_post_document_reference_invalid_type(
392+
def test_beefy_search_post_document_reference_invalid_type(
391393
repository: DocumentPointerRepository,
392394
):
393395
event = create_test_api_gateway_event(
@@ -434,7 +436,7 @@ def test_search_post_document_reference_invalid_type(
434436

435437
@mock_aws
436438
@mock_repository
437-
def test_search_document_reference_invalid_category(
439+
def test_beefy_search_document_reference_invalid_category(
438440
repository: DocumentPointerRepository,
439441
):
440442
event = create_test_api_gateway_event(
@@ -481,7 +483,7 @@ def test_search_document_reference_invalid_category(
481483

482484
@mock_aws
483485
@mock_repository
484-
def test_search_document_reference_filters_by_summary_count(
486+
def test_beefy_search_document_reference_filters_by_summary_count(
485487
repository: DocumentPointerRepository,
486488
):
487489
doc_ref = load_document_reference("Y05868-736253002-Valid")
@@ -524,7 +526,7 @@ def test_search_document_reference_filters_by_summary_count(
524526
@mock_aws
525527
@mock_repository
526528
@patch("api.consumer.searchPostDocumentReference.search_post_document_reference.logger")
527-
def test_search_post_document_reference_invalid_json_adds_operation_outcome(
529+
def test_beefy_search_post_document_reference_invalid_json_adds_operation_outcome(
528530
mock_logger, repository: DocumentPointerRepository
529531
):
530532
doc_ref = load_document_reference("Y05868-736253002-Valid")

‎api/consumer/status/tests/test_status_consumer.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414

1515
@mock_aws
1616
@mock_repository
17-
def test_status_happy_path(repository):
17+
def test_beefy_status_happy_path(repository):
1818
event = create_test_api_gateway_event(headers=create_headers())
1919

2020
result = handler(event, create_mock_context())
@@ -29,7 +29,7 @@ def test_status_happy_path(repository):
2929

3030
@mock_aws
3131
@mock_repository
32-
def test_status_unhandled_exception(repository):
32+
def test_beefy_status_unhandled_exception(repository):
3333
region = os.environ.pop("AWS_REGION")
3434

3535
event = create_test_api_gateway_event(headers=create_headers())

0 commit comments

Comments
 (0)