@@ -1879,8 +1879,8 @@ def test_report_bulk_automatic_unreject(
18791879 (True , True , False , status .HTTP_403_FORBIDDEN ),
18801880 (True , False , False , status .HTTP_403_FORBIDDEN ),
18811881 (False , True , False , status .HTTP_200_OK ),
1882- (False , False , False , status .HTTP_400_BAD_REQUEST ),
1883- (False , False , True , status .HTTP_400_BAD_REQUEST ),
1882+ (False , False , False , status .HTTP_200_OK ),
1883+ (False , False , True , status .HTTP_200_OK ),
18841884 (False , True , True , status .HTTP_200_OK ),
18851885 ],
18861886)
@@ -1921,19 +1921,12 @@ def test_report_set_remaining_effort(
19211921 assert response .status_code == expected
19221922
19231923
1924- @pytest .mark .parametrize (
1925- ("remaining_effort_active" , "expected" ),
1926- [
1927- (True , status .HTTP_201_CREATED ),
1928- (False , status .HTTP_400_BAD_REQUEST ),
1929- ],
1930- )
1924+ @pytest .mark .parametrize (("remaining_effort_active" ), [True , False ])
19311925def test_report_create_remaining_effort (
19321926 internal_employee_client ,
19331927 project_factory ,
19341928 task_factory ,
19351929 remaining_effort_active ,
1936- expected ,
19371930):
19381931 user = internal_employee_client .user
19391932 project = project_factory .create (
@@ -1960,16 +1953,20 @@ def test_report_create_remaining_effort(
19601953 url = reverse ("report-list" )
19611954
19621955 response = internal_employee_client .post (url , data )
1963- assert response .status_code == expected
1956+ assert response .status_code == status . HTTP_201_CREATED
19641957
1965- if expected == status .HTTP_201_CREATED :
1966- json = response .json ()
1967- assert json ["data" ]["relationships" ]["user" ]["data" ]["id" ] == str (user .id )
1968- assert json ["data" ]["relationships" ]["task" ]["data" ]["id" ] == str (task .id )
1958+ json = response .json ()
1959+ assert json ["data" ]["relationships" ]["user" ]["data" ]["id" ] == str (user .id )
1960+ assert json ["data" ]["relationships" ]["task" ]["data" ]["id" ] == str (task .id )
1961+
1962+ task .refresh_from_db ()
19691963
1970- task . refresh_from_db ()
1964+ if remaining_effort_active :
19711965 assert task .most_recent_remaining_effort == timedelta (hours = 1 )
19721966 assert task .project .total_remaining_effort == timedelta (hours = 1 )
1967+ else :
1968+ assert task .most_recent_remaining_effort is None
1969+ assert task .project .total_remaining_effort == timedelta (0 )
19731970
19741971
19751972def test_report_remaining_effort_total (
0 commit comments