hostsharing/hs.hsadmin.ng
6
0
Fork 0
Code Pull Requests 2 Activity

Compare commits

base: hostsharing:829c00152ab845616773ac9adf2ad1eb4fce06cf
Branches Tags
hostsharing:master
hostsharing:feature/add-advanced-scenario-tests-for-coop-assets
hostsharing:office-rbac-revision
hostsharing:feature/introduce-global-agent-for-non-hostmaster-admins
hostsharing:spike/auto-build
hostsharing:java-for-gradlew
hostsharing:TP-202408-cors_webui
hostsharing:TP-202405-filtered_import
hostsharing:idea-bug-refactor-inline
hostsharing:api-vision
hostsharing:rbac-object-scope-to-replace-serial-id
hostsharing:office-related-spec-clarifications-and-amendmends
hostsharing:revert-upgrade-openapiprocessor-spring-back-to-2022-5
hostsharing:upgrade-io.openapiprocessoropenapi-processor-spring-to-2024.2
hostsharing:spike/JSonSerializerDeserializerForDTOs
hostsharing:spike/master-detail-for-customer-and-contacts
..
compare: hostsharing:74c13d94fdba08e0954327c7649a848aec537374
Branches Tags
hostsharing:feature/add-advanced-scenario-tests-for-coop-assets
hostsharing:master
hostsharing:office-rbac-revision
hostsharing:feature/introduce-global-agent-for-non-hostmaster-admins
hostsharing:spike/auto-build
hostsharing:java-for-gradlew
hostsharing:TP-202408-cors_webui
hostsharing:TP-202405-filtered_import
hostsharing:idea-bug-refactor-inline
hostsharing:api-vision
hostsharing:rbac-object-scope-to-replace-serial-id
hostsharing:office-related-spec-clarifications-and-amendmends
hostsharing:revert-upgrade-openapiprocessor-spring-back-to-2022-5
hostsharing:upgrade-io.openapiprocessoropenapi-processor-spring-to-2024.2
hostsharing:spike/JSonSerializerDeserializerForDTOs
hostsharing:spike/master-detail-for-customer-and-contacts

No commits in common. "829c00152ab845616773ac9adf2ad1eb4fce06cf" and "74c13d94fdba08e0954327c7649a848aec537374" have entirely different histories.
829c00152a ... 74c13d94fd

2 changed files with 2 additions and 2 deletions
Show Stats Expand all files Collapse all files

2
src/test/java/net/hostsharing/hsadminng/hs/hosting/asset/HsHostingAssetControllerRestTest.java
View File

@ -110,6 +110,7 @@ public class HsHostingAssetControllerRestTest {
"caption": "some fake cloud-server", "caption": "some fake cloud-server",
"alarmContact": { "alarmContact": {
"caption": "some contact", "caption": "some contact",
"postalAddress": "address of some contact",
"emailAddresses": { "emailAddresses": {
"main": "some-contact@example.com" "main": "some-contact@example.com"
} }
@ -140,6 +141,7 @@ public class HsHostingAssetControllerRestTest {
"caption": "some fake managed-server", "caption": "some fake managed-server",
"alarmContact": { "alarmContact": {
"caption": "some contact", "caption": "some contact",
"postalAddress": "address of some contact",
"emailAddresses": { "emailAddresses": {
"main": "some-contact@example.com" "main": "some-contact@example.com"
} }

2
src/test/java/net/hostsharing/hsadminng/hs/office/contact/HsOfficeContactControllerAcceptanceTest.java
View File

@ -218,7 +218,6 @@ class HsOfficeContactControllerAcceptanceTest extends ContextBasedTestWithCleanu
"main": "patched@example.org" "main": "patched@example.org"
}, },
"postalAddress": { "postalAddress": {
"extra": "Extra Property",
"co": "P. Patcher", "co": "P. Patcher",
"street": "Patchstraße 5" "street": "Patchstraße 5"
}, },
@ -237,7 +236,6 @@ class HsOfficeContactControllerAcceptanceTest extends ContextBasedTestWithCleanu
.body("caption", is("Temp patched contact")) .body("caption", is("Temp patched contact"))
.body("emailAddresses", is(Map.of("main", "patched@example.org"))) .body("emailAddresses", is(Map.of("main", "patched@example.org")))
.body("postalAddress", hasEntry("name", givenContact.getPostalAddress().get("name"))) // unchanged .body("postalAddress", hasEntry("name", givenContact.getPostalAddress().get("name"))) // unchanged
.body("postalAddress", hasEntry("extra", "Extra Property")) // unchanged
.body("postalAddress", hasEntry("co", "P. Patcher")) // patched .body("postalAddress", hasEntry("co", "P. Patcher")) // patched
.body("postalAddress", hasEntry("street", "Patchstraße 5")) // patched .body("postalAddress", hasEntry("street", "Patchstraße 5")) // patched
.body("phoneNumbers", is(Map.of("phone_office", "+01 100 123456"))); .body("phoneNumbers", is(Map.of("phone_office", "+01 100 123456")));