From 375069bc1e543338004e9744c25d68f6b8affb0f Mon Sep 17 00:00:00 2001 From: Asmita Hase Date: Fri, 31 Jan 2025 00:46:35 +0530 Subject: [PATCH 1/3] chore: upgrading upload and download artifact verions to v4 from v3 (cherry picked from commit e71c2238f6c9c61b3ca9cb135690f76b996cd413) --- .github/workflows/ci.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 2265ab3b0a..9d29bacf91 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -124,7 +124,7 @@ jobs: CAPTURE_COVERAGE: ${{ github.event_name != 'pull_request' }} - name: Upload coverage data - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 if: github.event_name != 'pull_request' with: name: coverage-${{ matrix.container }} @@ -140,7 +140,7 @@ jobs: uses: actions/checkout@v2 - name: Download artifacts - uses: actions/download-artifact@v3 + uses: actions/download-artifact@v4 - name: Upload coverage data uses: codecov/codecov-action@v2 From 51819b7290db5b83c1892ffbfc48ee58868eb53c Mon Sep 17 00:00:00 2001 From: Asmita Hase Date: Sat, 1 Feb 2025 18:55:11 +0530 Subject: [PATCH 2/3] test: fixed failing tests due implicitly set dates while creating salary structure (cherry picked from commit ab02335955c82159ecf01b7cec07afe767244a5f) --- hrms/hr/doctype/leave_encashment/test_leave_encashment.py | 1 + 1 file changed, 1 insertion(+) diff --git a/hrms/hr/doctype/leave_encashment/test_leave_encashment.py b/hrms/hr/doctype/leave_encashment/test_leave_encashment.py index 4adee1f21a..2a232be2f8 100644 --- a/hrms/hr/doctype/leave_encashment/test_leave_encashment.py +++ b/hrms/hr/doctype/leave_encashment/test_leave_encashment.py @@ -236,6 +236,7 @@ def get_encashment_created_after_leave_period(self, employee, is_carry_forward): "Salary Structure for Encashment", "Monthly", employee, + from_date=start_date, other_details={"leave_encashment_amount_per_day": 50}, ) From 81c35f96243bc30da0e7c69387d45def39c03afc Mon Sep 17 00:00:00 2001 From: Asmita Hase Date: Sun, 2 Feb 2025 04:12:36 +0530 Subject: [PATCH 3/3] test: failing assertion value due to missing precision (cherry picked from commit a999c6002304c7aadd0ef3a469610dc24b872dc6) --- hrms/payroll/doctype/salary_slip/test_salary_slip.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/hrms/payroll/doctype/salary_slip/test_salary_slip.py b/hrms/payroll/doctype/salary_slip/test_salary_slip.py index 43b2d0c9fd..c29108db49 100644 --- a/hrms/payroll/doctype/salary_slip/test_salary_slip.py +++ b/hrms/payroll/doctype/salary_slip/test_salary_slip.py @@ -1270,7 +1270,9 @@ def test_statistical_component_based_on_payment_days(self): precision = entry.precision("amount") break - self.assertEqual(amount, flt((1000 * ss.payment_days / ss.total_working_days) * 0.5, precision)) + self.assertEqual( + amount, flt(flt((1000 * ss.payment_days / ss.total_working_days), precision) * 0.5, precision) + ) def make_activity_for_employee(self): activity_type = frappe.get_doc("Activity Type", "_Test Activity Type")