Merge branch 'develop' of https://github.com/informatici/openhospital…

…-api into OP-1311_move_settings_to_db
informatici · Oct 30, 2024 · e2c6663 · e2c6663
2 parents 987c8bd + f4fe33b
commit e2c6663
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml
@@ -37,7 +37,7 @@ jobs:
           # Determine FORK_REPO with fallback logic
           if [[ -n "${GITHUB_HEAD_REPOSITORY}" ]]; then
             echo "FORK_REPO=${GITHUB_HEAD_REPOSITORY}" >> $GITHUB_ENV
-          elif curl -s --head https://github.com/${GITHUB_ACTOR}/openhospital-core/tree/${{ env.BRANCH_NAME }} | grep "HTTP/[12].* 2[0-9][0-9]" > /dev/null; then
+          elif curl -s -o /dev/null -w "%{http_code}" "https://github.com/${GITHUB_ACTOR}/tree/$BRANCH_NAME" | grep -q "200"; then
             echo "FORK_REPO=${GITHUB_ACTOR}/openhospital-core" >> $GITHUB_ENV
           else
             echo "FORK_REPO=informatici/openhospital-core" >> $GITHUB_ENV

diff --git a/src/test/java/org/isf/exam/rest/ExamControllerTest.java b/src/test/java/org/isf/exam/rest/ExamControllerTest.java
@@ -203,7 +203,7 @@ void shouldFailToUpdateExamWhenCodeInBodyDoesntMatch() throws Exception {
 
 		@Test
 		@DisplayName("Should fail to update exam when user doesn't have required permissions")
-		@WithMockUser(username = "admin", authorities = { "examrows.create", "examrows.delete" })
+		@WithMockUser(username = "admin", authorities = { "exams.create", "examrows.create", "examrows.delete" })
 		void shouldFailToUpdateExamWhenInsufficientPermissions() throws Exception {
 			var result = mvc.perform(
 					put("/exams/hd").contentType(MediaType.APPLICATION_JSON).content(objectMapper.writeValueAsString(ExamHelper.generateExamWithRowsDTO())))