From c22c63d91ae9a35c6240c920ff71e096661d53dc Mon Sep 17 00:00:00 2001 From: Ralf Haferkamp Date: Wed, 16 Jul 2025 18:04:32 +0200 Subject: [PATCH] tests: Avoid static dates when creating shares The expirationDate for new shares needs to be in the future. Using static dates in the tests means we need to update them every now an then. This adjusts the helpers to allow relative date formats like "+3 days" and "tomorrow" when creating shares. --- .../acceptance/bootstrap/SharingNgContext.php | 6 +++-- .../updateShareInvitations.feature | 24 +++++++++---------- 2 files changed, 16 insertions(+), 14 deletions(-) diff --git a/tests/acceptance/bootstrap/SharingNgContext.php b/tests/acceptance/bootstrap/SharingNgContext.php index d84c4bc122..2dd0873a35 100644 --- a/tests/acceptance/bootstrap/SharingNgContext.php +++ b/tests/acceptance/bootstrap/SharingNgContext.php @@ -352,7 +352,8 @@ class SharingNgContext implements Context { $permissionsRole = $shareInfo['permissionsRole'] ?? null; $permissionsAction = $shareInfo['permissionsAction'] ?? null; - $expirationDateTime = $shareInfo["expirationDateTime"] ?? null; + $expirationDateTime = (\array_key_exists('expirationDateTime', $shareInfo)) + ? \date(DATE_RFC3339, \strtotime($shareInfo['expirationDateTime'])) : null; $response = GraphHelper::sendSharingInvitation( $this->featureContext->getBaseUrl(), @@ -425,7 +426,8 @@ class SharingNgContext implements Context { $permissionsRole = $rows['permissionsRole'] ?? null; $permissionsAction = $rows['permissionsAction'] ?? null; - $expirationDateTime = $rows["expirationDateTime"] ?? null; + $expirationDateTime = (\array_key_exists('expirationDateTime', $rows)) + ? \date(DATE_RFC3339, \strtotime($rows['expirationDateTime'])) : null; return GraphHelper::sendSharingInvitationForDrive( $this->featureContext->getBaseUrl(), diff --git a/tests/acceptance/features/apiSharingNgShareInvitation/updateShareInvitations.feature b/tests/acceptance/features/apiSharingNgShareInvitation/updateShareInvitations.feature index f87337ec39..e8addc6a84 100644 --- a/tests/acceptance/features/apiSharingNgShareInvitation/updateShareInvitations.feature +++ b/tests/acceptance/features/apiSharingNgShareInvitation/updateShareInvitations.feature @@ -19,7 +19,7 @@ Feature: Update permission of a share | sharee | Brian | | shareType | user | | permissionsRole | Viewer | - | expirationDateTime | 2025-07-15T14:00:00Z | + | expirationDateTime | tomorrow | When user "Alice" updates the last resource share with the following properties using the Graph API: | space | Personal | | resource | testfile.txt | @@ -91,7 +91,7 @@ Feature: Update permission of a share | sharee | Brian | | shareType | user | | permissionsRole | Viewer | - | expirationDateTime | 2025-07-15T14:00:00Z | + | expirationDateTime | tomorrow | When user "Alice" updates the last resource share with the following properties using the Graph API: | space | Personal | | resource | | @@ -394,7 +394,7 @@ Feature: Update permission of a share | sharee | grp1 | | shareType | group | | permissionsRole | | - | expirationDateTime | 2025-07-15T14:00:00Z | + | expirationDateTime | tomorrow | When user "Alice" updates the last drive share with the following using root endpoint of the Graph API: | permissionsRole | | | space | NewSpace | @@ -474,7 +474,7 @@ Feature: Update permission of a share | sharee | grp1 | | shareType | group | | permissionsRole | | - | expirationDateTime | 2025-07-15T14:00:00Z | + | expirationDateTime | tomorrow | When user "Alice" updates the last drive share with the following using root endpoint of the Graph API: | expirationDateTime | | | space | NewSpace | @@ -554,7 +554,7 @@ Feature: Update permission of a share | sharee | grp1 | | shareType | group | | permissionsRole | | - | expirationDateTime | 2025-07-15T14:00:00Z | + | expirationDateTime | tomorrow | When user "Alice" updates the last drive share with the following using root endpoint of the Graph API: | expirationDateTime | 2200-07-15T14:00:00Z | | space | NewSpace | @@ -636,7 +636,7 @@ Feature: Update permission of a share | sharee | grp1 | | shareType | group | | permissionsRole | | - | expirationDateTime | 2025-07-15T14:00:00Z | + | expirationDateTime | tomorrow | When user "Alice" updates the last drive share with the following using root endpoint of the Graph API: | expirationDateTime | | | permissionsRole | | @@ -717,7 +717,7 @@ Feature: Update permission of a share | sharee | grp1 | | shareType | group | | permissionsRole | | - | expirationDateTime | 2025-07-15T14:00:00Z | + | expirationDateTime | tomorrow | When user "Alice" updates the last drive share with the following using root endpoint of the Graph API: | expirationDateTime | 2200-07-15T14:00:00Z | | permissionsRole | | @@ -799,7 +799,7 @@ Feature: Update permission of a share | sharee | Brian | | shareType | user | | permissionsRole | | - | expirationDateTime | 2025-07-15T14:00:00Z | + | expirationDateTime | tomorrow | When user "Alice" updates the last drive share with the following using root endpoint of the Graph API: | permissionsRole | | | space | NewSpace | @@ -875,7 +875,7 @@ Feature: Update permission of a share | sharee | Brian | | shareType | user | | permissionsRole | | - | expirationDateTime | 2025-07-15T14:00:00Z | + | expirationDateTime | tomorrow | When user "Alice" updates the last drive share with the following using root endpoint of the Graph API: | expirationDateTime | | | space | NewSpace | @@ -951,7 +951,7 @@ Feature: Update permission of a share | sharee | Brian | | shareType | user | | permissionsRole | | - | expirationDateTime | 2025-07-15T14:00:00Z | + | expirationDateTime | tomorrow | When user "Alice" updates the last drive share with the following using root endpoint of the Graph API: | expirationDateTime | 2200-07-15T14:00:00Z | | permissionsRole | | @@ -1033,7 +1033,7 @@ Feature: Update permission of a share | sharee | Brian | | shareType | user | | permissionsRole | | - | expirationDateTime | 2025-07-15T14:00:00Z | + | expirationDateTime | tomorrow | When user "Alice" updates the last drive share with the following using root endpoint of the Graph API: | expirationDateTime | | | permissionsRole | | @@ -1110,7 +1110,7 @@ Feature: Update permission of a share | sharee | Brian | | shareType | user | | permissionsRole | | - | expirationDateTime | 2025-07-15T14:00:00Z | + | expirationDateTime | tomorrow | When user "Alice" updates the last drive share with the following using root endpoint of the Graph API: | expirationDateTime | 2200-07-15T14:00:00Z | | permissionsRole | |