From 924a8607d2a7378fd2c4b994347e5b9ce673502d Mon Sep 17 00:00:00 2001 From: Kilian Schuettler Date: Wed, 13 Nov 2024 11:04:47 +0100 Subject: [PATCH] RED-9139: move document to its own module, add TableOfContents and TableOfContentsItem * update LayoutEngine package --- .gitlab-ci.yml | 2 ++ .../redaction/v1/server/RedactionIntegrationTest.java | 6 ------ 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index fde7a09d..9a4e6075 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -20,6 +20,8 @@ deploy dependencies: dotenv: variables.env rules: - if: $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH + - if: $CI_COMMIT_BRANCH =~ /^release/ + - if: $CI_COMMIT_BRANCH =~ /^feature/ - if: $CI_COMMIT_TAG generate JavaDoc: diff --git a/redaction-service-v1/redaction-service-server-v1/src/test/java/com/iqser/red/service/redaction/v1/server/RedactionIntegrationTest.java b/redaction-service-v1/redaction-service-server-v1/src/test/java/com/iqser/red/service/redaction/v1/server/RedactionIntegrationTest.java index ce08fcaf..729d527d 100644 --- a/redaction-service-v1/redaction-service-server-v1/src/test/java/com/iqser/red/service/redaction/v1/server/RedactionIntegrationTest.java +++ b/redaction-service-v1/redaction-service-server-v1/src/test/java/com/iqser/red/service/redaction/v1/server/RedactionIntegrationTest.java @@ -1876,9 +1876,6 @@ public class RedactionIntegrationTest extends RulesIntegrationTest { .get(0).getType(), ChangeType.ADDED); assertEquals(inLibraryOutlook.getChanges() .get(1).getType(), ChangeType.RESIZED); - assertEquals(inLibraryOutlook.getChanges() - .get(1).getPropertyChanges() - .get("reason"), "Found by Email Regex -> Found by Email Regex, resized by manual override"); assertEquals(inLibraryOutlook.getChanges() .get(1).getPropertyChanges() .get("startOffset"), "3793 -> 3790"); @@ -2094,9 +2091,6 @@ public class RedactionIntegrationTest extends RulesIntegrationTest { .get(0).getType(), ChangeType.ADDED); assertEquals(responseDavidKsenia.getChanges() .get(1).getType(), ChangeType.FORCE_REDACT); - assertEquals(responseDavidKsenia.getChanges() - .get(1).getPropertyChanges() - .get("reason"), "No vertebrate found -> No vertebrate found, forced by manual override"); assertEquals(responseDavidKsenia.getChanges() .get(1).getPropertyChanges() .get("legalBasis"), " -> new legal basis");