Merge pull request #1418 from cultuurnet/III-5712-update-uri-regex

III-5712 update uri regex for hashtag
cultuurnet · Jul 25, 2023 · ba1454c · ba1454c
2 parents 4702656 + b4580b7
commit ba1454c
Show file tree

Hide file tree

Showing 8 changed files with 47 additions and 16 deletions.
diff --git a/composer.lock b/composer.lock
diff --git a/features/event/attendance-mode.feature b/features/event/attendance-mode.feature
@@ -454,7 +454,7 @@ Feature: Test event attendanceMode property
     {
       "schemaErrors": [
         {
-          "error": "The string should match pattern: ^http[s]?:\\/\\/\\w",
+          "error": "The string should match pattern: ^https?:\\/\\/[\\w\\-\\.]+\\.\\w{2,}(\\/.*)?$",
           "jsonPointer": "/onlineUrl"
         }
       ],

diff --git a/features/event/booking-info.feature b/features/event/booking-info.feature
@@ -248,7 +248,7 @@ Feature: Test the UDB3 events API
       "status":400,
       "schemaErrors": [
         {
-          "error": "The string should match pattern: ^http[s]?:\\/\\/\\w",
+          "error": "The string should match pattern: ^https?:\\/\\/[\\w\\-\\.]+\\.\\w{2,}(\\/.*)?$",
           "jsonPointer": "/url"
         }
       ]

diff --git a/features/organizer/url.feature b/features/organizer/url.feature
@@ -78,7 +78,7 @@ Feature: Test organizer url property
      "status": 400,
      "schemaErrors": [
         {
-          "error": "The string should match pattern: ^http[s]?:\\/\\/\\w",
+          "error": "The string should match pattern: ^https?:\\/\\/[\\w\\-\\.]+\\.\\w{2,}(\\/.*)?$",
           "jsonPointer": "/url"
         }
       ]

diff --git a/tests/Http/Event/ImportEventRequestHandlerTest.php b/tests/Http/Event/ImportEventRequestHandlerTest.php
@@ -3028,7 +3028,7 @@ public function it_throws_if_onlineUrl_has_wrong_format(): void
         $expectedErrors = [
             new SchemaError(
                 '/onlineUrl',
-                'The string should match pattern: ^http[s]?:\/\/\w'
+                'The string should match pattern: ^https?:\/\/[\w\-\.]+\.\w{2,}(\/.*)?$'
             ),
         ];
 

diff --git a/tests/Http/Event/UpdateOnlineUrlRequestHandlerTest.php b/tests/Http/Event/UpdateOnlineUrlRequestHandlerTest.php
@@ -94,7 +94,7 @@ public function onlineUrlProvider(): array
                 [
                     'onlineUrl' => 'rtp://www.publiq.be/livestream',
                 ],
-                new SchemaError('/onlineUrl', 'The string should match pattern: ^http[s]?:\/\/\w'),
+                new SchemaError('/onlineUrl', 'The string should match pattern: ^https?:\/\/[\w\-\.]+\.\w{2,}(\/.*)?$'),
             ],
         ];
     }

diff --git a/tests/Http/Offer/UpdateBookingInfoRequestHandlerTest.php b/tests/Http/Offer/UpdateBookingInfoRequestHandlerTest.php
@@ -54,6 +54,7 @@ protected function setUp(): void
      */
     public function it_handles_updating_the_booking_info_of_an_offer(
         string $offerType,
+        string $url,
         AbstractUpdateBookingInfo $updateBookingInfo
     ): void {
         $updateBookingInfoRequest = $this->psr7RequestBuilder
@@ -62,7 +63,7 @@ public function it_handles_updating_the_booking_info_of_an_offer(
             ->withJsonBodyFromArray(
                 [
                     'bookingInfo' => [
-                        'url' => 'https://www.publiq.be/',
+                        'url' => $url,
                         'urlLabel' => ['nl' => 'Publiq vzw'],
                         'phone' => '02/1232323',
                         'email' => 'info@publiq.be',
@@ -90,8 +91,20 @@ public function it_handles_updating_the_booking_info_of_an_offer(
 
     public function offerTypeDataProvider(): array
     {
-        $bookingInfo = new BookingInfo(
-            'https://www.publiq.be/',
+        $basicUrl = 'https://www.publiq.be/';
+        $specialCharactersUrl = 'https://publiq-vzw.com/Inschrijven.aspx?ReservatieCat=2#/inschrijven/activiteiten';
+
+        $bookingInfoBasicUrl = new BookingInfo(
+            $basicUrl,
+            new MultilingualString(new Language('nl'), new StringLiteral('Publiq vzw')),
+            '02/1232323',
+            'info@publiq.be',
+            \DateTimeImmutable::createFromFormat(\DATE_ATOM, '2023-01-01T00:00:00+01:00'),
+            \DateTimeImmutable::createFromFormat(\DATE_ATOM, '2028-01-31T23:59:59+01:00')
+        );
+
+        $bookingInfoSpecialCharactersUrl = new BookingInfo(
+            $specialCharactersUrl,
             new MultilingualString(new Language('nl'), new StringLiteral('Publiq vzw')),
             '02/1232323',
             'info@publiq.be',
@@ -102,16 +115,34 @@ public function offerTypeDataProvider(): array
         return [
             [
                 'offerType' => 'events',
+                'url' => $basicUrl,
+                'updateBookingInfo' => new EventUpdateBookingInfo(
+                    self::OFFER_ID,
+                    $bookingInfoBasicUrl
+                ),
+            ],
+            [
+                'offerType' => 'places',
+                'url' => $basicUrl,
+                'updateBookingInfo' => new PlaceUpdateBookingInfo(
+                    self::OFFER_ID,
+                    $bookingInfoBasicUrl
+                ),
+            ],
+            [
+                'offerType' => 'events',
+                'url' => $specialCharactersUrl,
                 'updateBookingInfo' => new EventUpdateBookingInfo(
                     self::OFFER_ID,
-                    $bookingInfo
+                    $bookingInfoSpecialCharactersUrl
                 ),
             ],
             [
                 'offerType' => 'places',
+                'url' => $specialCharactersUrl,
                 'updateBookingInfo' => new PlaceUpdateBookingInfo(
                     self::OFFER_ID,
-                    $bookingInfo
+                    $bookingInfoSpecialCharactersUrl
                 ),
             ],
         ];
@@ -179,7 +210,7 @@ public function provideApiProblemTestData(): Iterator
             'schemaErrors' => [
                 new SchemaError(
                     '/url',
-                    'The string should match pattern: ^http[s]?:\/\/\w'
+                    'The string should match pattern: ^https?:\/\/[\w\-\.]+\.\w{2,}(\/.*)?$'
                 ),
             ],
         ];

diff --git a/tests/Http/Organizer/UpdateContactPointRequestHandlerTest.php b/tests/Http/Organizer/UpdateContactPointRequestHandlerTest.php
@@ -216,7 +216,7 @@ public function it_requires_a_valid_url(): void
 
         $this->assertCallableThrowsApiProblem(
             ApiProblem::bodyInvalidData(
-                new SchemaError('/url/0', 'The string should match pattern: ^http[s]?:\/\/\w')
+                new SchemaError('/url/0', 'The string should match pattern: ^https?:\/\/[\w\-\.]+\.\w{2,}(\/.*)?$')
             ),
             fn () => $this->updateContactPointRequestHandler->handle($updateUrlRequest)
         );