Skip to content

Commit 38fdf9b

Browse files
Jobziscastillo-jp
authored andcommitted
test: TT-404 fix get all time entries test
1 parent 06dab38 commit 38fdf9b

File tree

2 files changed

+12
-16
lines changed

2 files changed

+12
-16
lines changed

V2/tests/api/azure/time_entry_azure_endpoints_test.py

Lines changed: 8 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -80,32 +80,28 @@ def test__delete_time_entries_azure_endpoint__returns_a_status_code_400__when_ti
8080

8181

8282
def test__time_entry_azure_endpoint__returns_all_time_entries(
83-
create_fake_database, time_entry_factory, insert_time_entry, activity_factory, insert_activity
83+
test_db, time_entry_factory, insert_time_entry, activity_factory, insert_activity
8484
):
85-
fake_database = create_fake_database
86-
inserted_activity = insert_activity(activity_factory(), fake_database)
85+
inserted_activity = insert_activity(activity_factory(), test_db)
8786
existent_time_entries = time_entry_factory(activity_id=inserted_activity.id, technologies="[jira,sql]")
88-
inserted_time_entries = [insert_time_entry(existent_time_entries, fake_database)]
87+
inserted_time_entries = insert_time_entry(existent_time_entries, test_db)
8988

90-
azure_time_entries._get_time_entries.DATABASE = fake_database
9189
req = func.HttpRequest(method="GET", body=None, url=TIME_ENTRY_URL)
9290

9391
response = azure_time_entries.get_time_entries(req)
9492
time_entries_json_data = response.get_body().decode("utf-8")
93+
time_entry_list = json.loads(time_entries_json_data)
9594

9695
assert response.status_code == 200
97-
assert time_entries_json_data == json.dumps(inserted_time_entries)
96+
assert time_entry_list.pop() == inserted_time_entries
9897

9998

10099
def test__time_entry_azure_endpoint__returns_an_time_entry__when_time_entry_matches_its_id(
101-
create_fake_database, time_entry_factory, insert_time_entry, activity_factory, insert_activity
100+
test_db, time_entry_factory, insert_time_entry, activity_factory, insert_activity
102101
):
103-
fake_database = create_fake_database
104-
inserted_activity = insert_activity(activity_factory(), fake_database)
102+
inserted_activity = insert_activity(activity_factory(), test_db)
105103
existent_time_entries = time_entry_factory(activity_id=inserted_activity.id, technologies="[jira,sql]")
106-
inserted_time_entries = insert_time_entry(existent_time_entries, fake_database)
107-
108-
azure_time_entries._get_time_entries.DATABASE = fake_database
104+
inserted_time_entries = insert_time_entry(existent_time_entries, test_db)
109105

110106
req = func.HttpRequest(
111107
method="GET",

V2/time_tracker/time_entries/_application/_time_entries/_get_time_entries.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,6 @@
55
import azure.functions as func
66
import json
77

8-
DATABASE = DB()
9-
108

119
def get_time_entries(req: func.HttpRequest) -> func.HttpResponse:
1210

@@ -30,17 +28,19 @@ def get_time_entries(req: func.HttpRequest) -> func.HttpResponse:
3028

3129

3230
def _get_by_id(id: int) -> str:
31+
database = DB()
3332
time_entry_use_case = _use_cases.GetTimeEntryUseCase(
34-
_create_time_entry_service(DATABASE)
33+
_create_time_entry_service(database)
3534
)
3635
time_entry = time_entry_use_case.get_time_entry_by_id(id)
3736

3837
return json.dumps(time_entry.__dict__) if time_entry else b'Not Found'
3938

4039

4140
def _get_all() -> str:
41+
database = DB()
4242
time_entries_use_case = _use_cases.GetTimeEntriesUseCase(
43-
_create_time_entry_service(DATABASE)
43+
_create_time_entry_service(database)
4444
)
4545
return json.dumps(
4646
[

0 commit comments

Comments
 (0)